diff --git a/networkstatus/Makefile.am b/networkstatus/Makefile.am
index c59aa55c6..525ad6a7e 100644
--- a/networkstatus/Makefile.am
+++ b/networkstatus/Makefile.am
@@ -2,6 +2,8 @@
 
 METASOURCES = AUTO
 
+INCLUDES = -I$(top_srcdir)/kded -I$(top_srcdir) $(all_includes)
+
 kde_module_LTLIBRARIES = kded_networkstatus.la 
 lib_LTLIBRARIES = libnetworkstatus.la libconnectionmanager.la
 
diff --git a/networkstatus/networkstatus.cpp b/networkstatus/networkstatus.cpp
index 092f2b392..21e34d978 100644
--- a/networkstatus/networkstatus.cpp
+++ b/networkstatus/networkstatus.cpp
@@ -32,7 +32,19 @@
 #include "clientifaceimpl.h"
 #include "serviceifaceimpl.h"
 #include "network.h"
-#include <kdepimmacros.h>
+
+#include <kdeversion.h>
+#include <kdemacros.h>
+
+#if KDE_IS_VERSION( 3,3,90 )
+/* life is great */
+#else
+/* workaround typo that breaks compilation with newer gcc */
+#undef KDE_EXPORT
+#define KDE_EXPORT
+#undef KDE_NO_EXPORT
+#define KDE_NO_EXPORT
+#endif
 
 extern "C" {
 	KDE_EXPORT KDEDModule* create_networkstatus( const TQCString& obj )