diff --git a/router/java/src/org/cybergarage/http/HTTPPacket.java b/router/java/src/org/cybergarage/http/HTTPPacket.java
index 9a7575f32d5eba598d297fd97bd9532569fcfcd7..e90c9fd4b0134a602c9b76c653fba122bdd86164 100644
--- a/router/java/src/org/cybergarage/http/HTTPPacket.java
+++ b/router/java/src/org/cybergarage/http/HTTPPacket.java
@@ -367,7 +367,7 @@ public class HTTPPacket
 	//	Header
 	////////////////////////////////////////////////
 
-	private Vector httpHeaderList = new Vector();
+	private Vector<HTTPHeader> httpHeaderList = new Vector<HTTPHeader>();
 	
 	public int getNHeaders()
 	{
@@ -405,7 +405,7 @@ public class HTTPPacket
 	public void clearHeaders()
 	{
 		httpHeaderList.clear();
-		httpHeaderList = new Vector();
+		httpHeaderList = new Vector<HTTPHeader>();
 	}
 	
 	public boolean hasHeader(String name)
diff --git a/router/java/src/org/cybergarage/http/HTTPServerList.java b/router/java/src/org/cybergarage/http/HTTPServerList.java
index fb85ad8f5f16d364ed72f4e25f10d450160213eb..07acedec07894c2ce2e755b7963b1898f1a4a35e 100644
--- a/router/java/src/org/cybergarage/http/HTTPServerList.java
+++ b/router/java/src/org/cybergarage/http/HTTPServerList.java
@@ -23,7 +23,7 @@ import java.util.Vector;
 import org.cybergarage.net.HostInterface;
 import org.cybergarage.upnp.Device;
 
-public class HTTPServerList extends Vector 
+public class HTTPServerList extends Vector<HTTPServer> 
 {
 	////////////////////////////////////////////////
 	//	Constructor
diff --git a/router/java/src/org/cybergarage/http/ParameterList.java b/router/java/src/org/cybergarage/http/ParameterList.java
index 9f395be6ad52f49f1e597653813bd0c8cd0c1dd4..b629c11ebd4bb5a15f643582a8fea8d8485b2d02 100644
--- a/router/java/src/org/cybergarage/http/ParameterList.java
+++ b/router/java/src/org/cybergarage/http/ParameterList.java
@@ -17,7 +17,7 @@ package org.cybergarage.http;
 
 import java.util.Vector;
 
-public class ParameterList extends Vector 
+public class ParameterList extends Vector<Parameter> 
 {
 	public ParameterList() 
 	{
diff --git a/router/java/src/org/cybergarage/upnp/event/PropertyList.java b/router/java/src/org/cybergarage/upnp/event/PropertyList.java
index f2d8a22a7599ffb52c635506d01ac73c0b6239f1..7b11a9b324f53963414c8fa6220d65abf9b8cee2 100644
--- a/router/java/src/org/cybergarage/upnp/event/PropertyList.java
+++ b/router/java/src/org/cybergarage/upnp/event/PropertyList.java
@@ -17,7 +17,7 @@ package org.cybergarage.upnp.event;
 
 import java.util.*;
 
-public class PropertyList extends Vector 
+public class PropertyList extends Vector<Property> 
 {
 	////////////////////////////////////////////////
 	//	Constants