diff --git a/ixml/inc/ixml.h b/ixml/inc/ixml.h
index b77f088..26f942b 100644
--- a/ixml/inc/ixml.h
+++ b/ixml/inc/ixml.h
@@ -43,32 +43,9 @@
  */
 
 
-#ifdef WIN32
-	#ifndef UPNP_STATIC_LIB
-		#ifdef LIBUPNP_EXPORTS
-			/* set up declspec for dll export to make functions visible to library users */
-			#define EXPORT_SPEC __declspec(dllexport)
-		#else /* LIBUPNP_EXPORTS */
-			#define EXPORT_SPEC __declspec(dllimport)
-		#endif /* LIBUPNP_EXPORTS */
-	#else /* UPNP_STATIC_LIB */
-		#define EXPORT_SPEC
-	#endif /* UPNP_STATIC_LIB */
+#include "UpnpGlobal.h" /* For EXPORT_SPEC */
 
 
-	#ifdef UPNP_USE_MSVCPP
-		/* define some things the M$ VC++ doesn't know */
-		#define IXML_INLINE
-	#endif /* UPNP_USE_MSVCPP */
-	#ifdef UPNP_USE_BCBPP
-		/* define some things Borland Builder doesn't know */
-		#define IXML_INLINE inline
-	#endif /* UPNP_USE_BCBPP */
-#else /* WIN32 */
-	#define EXPORT_SPEC
-	#define IXML_INLINE inline
-#endif /* WIN32 */
-
 typedef int BOOL;
 
 
diff --git a/ixml/inc/ixmldebug.h b/ixml/inc/ixmldebug.h
index f6a9608..ffe076d 100644
--- a/ixml/inc/ixmldebug.h
+++ b/ixml/inc/ixmldebug.h
@@ -29,7 +29,7 @@ void IxmlPrintf(
 #endif
 ;
 #else /* DEBUG */
-static IXML_INLINE void IxmlPrintf(
+static UPNP_INLINE void IxmlPrintf(
 	const char* FmtStr,
 	...) {}
 #endif /* DEBUG */
diff --git a/threadutil/inc/ithread.h b/threadutil/inc/ithread.h
index 0cade93..33a6200 100644
--- a/threadutil/inc/ithread.h
+++ b/threadutil/inc/ithread.h
@@ -29,8 +29,14 @@
  *
  ******************************************************************************/
 
+
 #ifndef ITHREADH
 #define ITHREADH
+
+
+#include "UpnpGlobal.h" /* For EXPORT_SPEC */
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -745,22 +751,6 @@ typedef pthread_rwlock_t ithread_rwlock_t;
 #endif
 
 
-#ifdef WIN32
-	#ifndef UPNP_STATIC_LIB
-		#ifdef LIBUPNP_EXPORTS
-			/* set up declspec for dll export to make functions visible to library users */
-			#define EXPORT_SPEC __declspec(dllexport)
-		#else
-			#define EXPORT_SPEC __declspec(dllimport)
-		#endif
-	#else
-		#define EXPORT_SPEC
-	#endif
-#else
-	#define EXPORT_SPEC
-#endif
-
-
 #ifndef PTHREAD_MUTEX_RECURSIVE
 /* NK: Added for satisfying the gcc compiler */
 EXPORT_SPEC int pthread_mutexattr_setkind_np(pthread_mutexattr_t *attr, int kind);