--- qt-x11-free-3.3.8b.old/include/qcstring.h
+++ qt-x11-free-3.3.8b/include/qcstring.h
@@ -82,6 +82,10 @@
 Q_EXPORT int qstrnicmp( const char *, const char *, uint len );
 
 #ifndef QT_CLEAN_NAMESPACE
+#define QT_CLEAN_NAMESPACE 1
+#endif
+
+#ifndef QT_CLEAN_NAMESPACE
 Q_EXPORT inline uint cstrlen( const char *str )
 { return (uint)strlen(str); }
 
--- qt-x11-free-3.3.8b.old/include/qcursor.h
+++ qt-x11-free-3.3.8b/include/qcursor.h
@@ -121,6 +121,9 @@
 #endif
 };
 
+#ifndef QT_CLEAN_NAMESPACE
+#define QT_CLEAN_NAMESPACE 1
+#endif
 
 #if !defined(QT_CLEAN_NAMESPACE)
 // CursorShape is defined in X11/X.h
--- qt-x11-free-3.3.8b.old/include/qglobal.h
+++ qt-x11-free-3.3.8b/include/qglobal.h
@@ -700,6 +700,10 @@
 // Size-dependent types (architechture-dependent byte order)
 //
 
+#ifndef QT_CLEAN_NAMESPACE 
+#define QT_CLEAN_NAMESPACE 1
+#endif
+
 #if !defined(QT_CLEAN_NAMESPACE)
 // source compatibility with Qt 1.x
 typedef signed char		INT8;		// 8 bit signed
--- qt-x11-free-3.3.8b.old/include/qobjectdefs.h
+++ qt-x11-free-3.3.8b/include/qobjectdefs.h
@@ -143,6 +143,10 @@
 #endif
 
 #ifndef QT_CLEAN_NAMESPACE
+#define QT_CLEAN_NAMESPACE 1
+#endif
+
+#ifndef QT_CLEAN_NAMESPACE
 #define METHOD_CODE	0			// member type codes
 #define SLOT_CODE	1
 #define SIGNAL_CODE	2
--- qt-x11-free-3.3.8b.old/include/qwindowdefs.h
+++ qt-x11-free-3.3.8b/include/qwindowdefs.h
@@ -188,6 +188,10 @@
 Q_EXPORT void qAddPostRoutine( QtCleanUpFunction );
 Q_EXPORT void qRemovePostRoutine( QtCleanUpFunction );
 
+#ifndef QT_CLEAN_NAMESPACE
+#define QT_CLEAN_NAMESPACE 1
+#endif
+
 #if !defined(QT_CLEAN_NAMESPACE)
 // source compatibility with Qt 2.x
 typedef QtCleanUpFunction Q_CleanUpFunction;
--- qt-x11-free-3.3.8b.old/src/kernel/qcursor.h
+++ qt-x11-free-3.3.8b/src/kernel/qcursor.h
@@ -121,6 +121,9 @@
 #endif
 };
 
+#ifndef QT_CLEAN_NAMESPACE
+#define QT_CLEAN_NAMESPACE 1
+#endif
 
 #if !defined(QT_CLEAN_NAMESPACE)
 // CursorShape is defined in X11/X.h
--- qt-x11-free-3.3.8b.old/src/kernel/qobjectdefs.h
+++ qt-x11-free-3.3.8b/src/kernel/qobjectdefs.h
@@ -143,6 +143,10 @@
 #endif
 
 #ifndef QT_CLEAN_NAMESPACE
+#define QT_CLEAN_NAMESPACE 1
+#endif
+
+#ifndef QT_CLEAN_NAMESPACE
 #define METHOD_CODE	0			// member type codes
 #define SLOT_CODE	1
 #define SIGNAL_CODE	2
--- qt-x11-free-3.3.8b.old/src/kernel/qwindowdefs.h
+++ qt-x11-free-3.3.8b/src/kernel/qwindowdefs.h
@@ -188,6 +188,10 @@
 Q_EXPORT void qAddPostRoutine( QtCleanUpFunction );
 Q_EXPORT void qRemovePostRoutine( QtCleanUpFunction );
 
+#ifndef QT_CLEAN_NAMESPACE
+#define QT_CLEAN_NAMESPACE 1
+#endif
+
 #if !defined(QT_CLEAN_NAMESPACE)
 // source compatibility with Qt 2.x
 typedef QtCleanUpFunction Q_CleanUpFunction;
--- qt-x11-free-3.3.8b.old/src/tools/qcstring.h
+++ qt-x11-free-3.3.8b/src/tools/qcstring.h
@@ -82,6 +82,10 @@
 Q_EXPORT int qstrnicmp( const char *, const char *, uint len );
 
 #ifndef QT_CLEAN_NAMESPACE
+#define QT_CLEAN_NAMESPACE 1
+#endif
+
+#ifndef QT_CLEAN_NAMESPACE
 Q_EXPORT inline uint cstrlen( const char *str )
 { return (uint)strlen(str); }
 
--- qt-x11-free-3.3.8b.old/src/tools/qglobal.h
+++ qt-x11-free-3.3.8b/src/tools/qglobal.h
@@ -700,6 +700,10 @@
 // Size-dependent types (architechture-dependent byte order)
 //
 
+#ifndef QT_CLEAN_NAMESPACE 
+#define QT_CLEAN_NAMESPACE 1
+#endif
+
 #if !defined(QT_CLEAN_NAMESPACE)
 // source compatibility with Qt 1.x
 typedef signed char		INT8;		// 8 bit signed