diff --git a/source/net/sbbi/upnp/Discovery.java b/source/net/sbbi/upnp/Discovery.java
index ec5cd92ab..83b53512a 100644
--- a/source/net/sbbi/upnp/Discovery.java
+++ b/source/net/sbbi/upnp/Discovery.java
@@ -75,7 +75,7 @@ import org.apache.commons.logging.LogFactory;
  * @author <a href="mailto:superbonbon@sbbi.net">SuperBonBon</a>
  * @version 1.0
  */
-
+@SuppressWarnings("unchecked")
 public class Discovery {
 
   private final static Log log = LogFactory.getLog( Discovery.class );
diff --git a/source/net/sbbi/upnp/DiscoveryAdvertisement.java b/source/net/sbbi/upnp/DiscoveryAdvertisement.java
index a88678c46..5986440f4 100644
--- a/source/net/sbbi/upnp/DiscoveryAdvertisement.java
+++ b/source/net/sbbi/upnp/DiscoveryAdvertisement.java
@@ -71,7 +71,7 @@ import org.apache.commons.logging.LogFactory;
  * @author <a href="mailto:superbonbon@sbbi.net">SuperBonBon</a>
  * @version 1.0
  */
-
+@SuppressWarnings("unchecked")
 public class DiscoveryAdvertisement implements Runnable {
   
   private final static Log log = LogFactory.getLog( DiscoveryAdvertisement.class );
diff --git a/source/net/sbbi/upnp/DiscoveryListener.java b/source/net/sbbi/upnp/DiscoveryListener.java
index 5924070d4..f62daed5f 100644
--- a/source/net/sbbi/upnp/DiscoveryListener.java
+++ b/source/net/sbbi/upnp/DiscoveryListener.java
@@ -68,7 +68,7 @@ import org.apache.commons.logging.LogFactory;
  * @author <a href="mailto:superbonbon@sbbi.net">SuperBonBon</a>
  * @version 1.0
  */
-
+@SuppressWarnings("unchecked")
 public class DiscoveryListener implements Runnable {
   
   private final static Log log = LogFactory.getLog( DiscoveryListener.class );
diff --git a/source/net/sbbi/upnp/HttpResponse.java b/source/net/sbbi/upnp/HttpResponse.java
index 183d79d03..9fb6ee34b 100644
--- a/source/net/sbbi/upnp/HttpResponse.java
+++ b/source/net/sbbi/upnp/HttpResponse.java
@@ -56,7 +56,7 @@ import java.util.StringTokenizer;
  * @author <a href="mailto:superbonbon@sbbi.net">SuperBonBon</a>
  * @version 1.0
  */
-
+@SuppressWarnings("unchecked")
 public class HttpResponse {
   
   private String header;
diff --git a/source/net/sbbi/upnp/ServiceEventMessageParser.java b/source/net/sbbi/upnp/ServiceEventMessageParser.java
index 36b000cd6..51d4de707 100644
--- a/source/net/sbbi/upnp/ServiceEventMessageParser.java
+++ b/source/net/sbbi/upnp/ServiceEventMessageParser.java
@@ -57,7 +57,7 @@ import org.xml.sax.Attributes;
  * @author <a href="mailto:superbonbon@sbbi.net">SuperBonBon</a>
  * @version 1.0
  */
-
+@SuppressWarnings("unchecked")
 public class ServiceEventMessageParser extends org.xml.sax.helpers.DefaultHandler {
 
   private boolean readPropertyName = false;
diff --git a/source/net/sbbi/upnp/ServicesEventing.java b/source/net/sbbi/upnp/ServicesEventing.java
index 8778192e0..f3b7f4612 100644
--- a/source/net/sbbi/upnp/ServicesEventing.java
+++ b/source/net/sbbi/upnp/ServicesEventing.java
@@ -76,7 +76,7 @@ import org.xml.sax.InputSource;
  * @author <a href="mailto:superbonbon@sbbi.net">SuperBonBon</a>
  * @version 1.0
  */
-
+@SuppressWarnings("unchecked")
 public class ServicesEventing implements Runnable {
 
   private final static Log log = LogFactory.getLog( ServicesEventing.class );
diff --git a/source/net/sbbi/upnp/devices/UPNPDevice.java b/source/net/sbbi/upnp/devices/UPNPDevice.java
index c9f9e7450..aea65115c 100644
--- a/source/net/sbbi/upnp/devices/UPNPDevice.java
+++ b/source/net/sbbi/upnp/devices/UPNPDevice.java
@@ -61,7 +61,7 @@ import org.apache.commons.logging.LogFactory;
  * @author <a href="mailto:superbonbon@sbbi.net">SuperBonBon</a>
  * @version 1.0
  */
-
+@SuppressWarnings("unchecked")
 public class UPNPDevice {
 
   private final static Log log = LogFactory.getLog( UPNPDevice.class );
diff --git a/source/net/sbbi/upnp/devices/UPNPRootDevice.java b/source/net/sbbi/upnp/devices/UPNPRootDevice.java
index f11a31e0e..d7ece9eaf 100644
--- a/source/net/sbbi/upnp/devices/UPNPRootDevice.java
+++ b/source/net/sbbi/upnp/devices/UPNPRootDevice.java
@@ -66,7 +66,7 @@ import net.sbbi.upnp.services.*;
  * @author <a href="mailto:superbonbon@sbbi.net">SuperBonBon</a>
  * @version 1.0
  */
-
+@SuppressWarnings("unchecked")
 public class UPNPRootDevice extends UPNPDevice {
 
   private final static Log log = LogFactory.getLog( UPNPRootDevice.class );
diff --git a/source/net/sbbi/upnp/impls/InternetGatewayDevice.java b/source/net/sbbi/upnp/impls/InternetGatewayDevice.java
index a82b2ac3c..ee607439a 100644
--- a/source/net/sbbi/upnp/impls/InternetGatewayDevice.java
+++ b/source/net/sbbi/upnp/impls/InternetGatewayDevice.java
@@ -77,6 +77,7 @@ import net.sbbi.upnp.services.UPNPService;
  * @author <a href="mailto:superbonbon@sbbi.net">SuperBonBon</a>
  * @version 1.0
  */
+@SuppressWarnings("unchecked")
 public class InternetGatewayDevice {
   
   private final static Log log = LogFactory.getLog( InternetGatewayDevice.class );
@@ -226,6 +227,7 @@ public class InternetGatewayDevice {
    * @deprecated use generic {@link #getDevices(int)} or {@link #getDevices(int, int, int, NetworkInterface)} methods since this one is not
    *             usable with all IGD devices ( will only work with devices implementing the urn:schemas-upnp-org:service:WANIPConnection:1 service )
    */
+  @Deprecated
   public static InternetGatewayDevice[] getIPDevices( int timeout ) throws IOException {
     return lookupDeviceDevices( timeout, Discovery.DEFAULT_TTL, Discovery.DEFAULT_MX, true, false, null );
   }
@@ -238,6 +240,7 @@ public class InternetGatewayDevice {
    * @deprecated use generic {@link #getDevices(int)} or {@link #getDevices(int, int, int, NetworkInterface)} methods since this one is not
    *             usable with all IGD devices ( will only work with devices implementing the urn:schemas-upnp-org:service:WANPPPConnection:1 service )
    */
+  @Deprecated
   public static InternetGatewayDevice[] getPPPDevices( int timeout ) throws IOException {
     return lookupDeviceDevices( timeout, Discovery.DEFAULT_TTL, Discovery.DEFAULT_MX, false, true, null );
   }
diff --git a/source/net/sbbi/upnp/messages/ActionMessage.java b/source/net/sbbi/upnp/messages/ActionMessage.java
index f10eb3fef..df576f85e 100644
--- a/source/net/sbbi/upnp/messages/ActionMessage.java
+++ b/source/net/sbbi/upnp/messages/ActionMessage.java
@@ -66,6 +66,7 @@ import javax.xml.parsers.*;
  * @author <a href="mailto:superbonbon@sbbi.net">SuperBonBon</a>
  * @version 1.0
  */
+@SuppressWarnings("unchecked")
 public class ActionMessage {
   
   private final static Log log = LogFactory.getLog( ActionMessage.class );
diff --git a/source/net/sbbi/upnp/messages/ActionResponse.java b/source/net/sbbi/upnp/messages/ActionResponse.java
index bc67aa9e4..570f01646 100644
--- a/source/net/sbbi/upnp/messages/ActionResponse.java
+++ b/source/net/sbbi/upnp/messages/ActionResponse.java
@@ -56,6 +56,7 @@ import java.util.*;
  * @author <a href="mailto:superbonbon@sbbi.net">SuperBonBon</a>
  * @version 1.0
  */
+@SuppressWarnings("unchecked")
 public class ActionResponse {
 
   private Map outArguments = new HashMap();
diff --git a/source/net/sbbi/upnp/services/ServiceAction.java b/source/net/sbbi/upnp/services/ServiceAction.java
index b994ffc16..de9d386d8 100644
--- a/source/net/sbbi/upnp/services/ServiceAction.java
+++ b/source/net/sbbi/upnp/services/ServiceAction.java
@@ -54,6 +54,7 @@ import java.util.*;
  * @author <a href="mailto:superbonbon@sbbi.net">SuperBonBon</a>
  * @version 1.0
  */
+@SuppressWarnings("unchecked")
 public class ServiceAction {
   
   protected String name;
diff --git a/source/net/sbbi/upnp/services/ServiceStateVariable.java b/source/net/sbbi/upnp/services/ServiceStateVariable.java
index 0ae5e3437..b3e01a4eb 100644
--- a/source/net/sbbi/upnp/services/ServiceStateVariable.java
+++ b/source/net/sbbi/upnp/services/ServiceStateVariable.java
@@ -61,7 +61,7 @@ import net.sbbi.upnp.messages.UPNPResponseException;
  * @author <a href="mailto:superbonbon@sbbi.net">SuperBonBon</a>
  * @version 1.0
  */
-
+@SuppressWarnings("unchecked")
 public class ServiceStateVariable implements ServiceStateVariableTypes {
   
   private StateVariableMessage stateVarMsg = null;
diff --git a/source/net/sbbi/upnp/services/UPNPService.java b/source/net/sbbi/upnp/services/UPNPService.java
index 4c3bf2d90..543a9b6a6 100644
--- a/source/net/sbbi/upnp/services/UPNPService.java
+++ b/source/net/sbbi/upnp/services/UPNPService.java
@@ -62,6 +62,7 @@ import net.sbbi.upnp.devices.*;
  * @author <a href="mailto:superbonbon@sbbi.net">SuperBonBon</a>
  * @version 1.0
  */
+@SuppressWarnings("unchecked")
 public class UPNPService {
   
   protected String serviceType;