diff --git a/ChangeLog b/ChangeLog
index b50a28e..edf3233 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 Version 1.6.7
 *******************************************************************************
 
+2010-08-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* The scope of the macro NUM_HANDLE is now restricted to upnpapi.c.
+
 2010-08-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
 	* InitHandleList() has never been implemented, I guess no one has ever
 	called it, so remove it.
diff --git a/upnp/inc/upnp.h b/upnp/inc/upnp.h
index f33bafd..324853b 100644
--- a/upnp/inc/upnp.h
+++ b/upnp/inc/upnp.h
@@ -85,7 +85,6 @@
 #endif
 
 
-#define NUM_HANDLE 200
 #define LINE_SIZE  180
 #define NAME_SIZE  256
 #define MNFT_NAME_SIZE  64
diff --git a/upnp/src/api/upnpapi.c b/upnp/src/api/upnpapi.c
index fd9f006..01be2fb 100644
--- a/upnp/src/api/upnpapi.c
+++ b/upnp/src/api/upnpapi.c
@@ -165,7 +165,8 @@ unsigned short LOCAL_PORT_V4;
 unsigned short LOCAL_PORT_V6;
 
 /*! UPnP device and control point handle table  */
-void *HandleTable[NUM_HANDLE];
+#define NUM_HANDLE 200
+static void *HandleTable[NUM_HANDLE];
 
 /*! a local dir which serves as webserver root */
 extern membuffer gDocumentRootDir;
diff --git a/upnp/src/inc/upnpapi.h b/upnp/src/inc/upnpapi.h
index 06486f5..4b81cb0 100644
--- a/upnp/src/inc/upnpapi.h
+++ b/upnp/src/inc/upnpapi.h
@@ -50,8 +50,6 @@
 
 #define DEV_LIMIT 200
 
-#define NUM_HANDLE 200
-
 #define DEFAULT_MX 5
 
 #define DEFAULT_MAXAGE 1800