diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
index 6912bb49..7f08aa29 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
@@ -55,6 +55,7 @@
 #include <algorithm>
 
 #include <assert.h>
+#include <stdlib.h>
 #include <string.h>
 
 namespace {
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp
index 032514cd..eda519b1 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp
@@ -49,6 +49,7 @@
 #include <tdelocale.h>
 
 #include <assert.h>
+#include <stdlib.h>
 
 Kleo::QGpgMESignJob::QGpgMESignJob( GpgME::Context * context )
   : SignJob( QGpgME::EventLoopInteractor::instance(), "Kleo::QGpgMESignJob" ),
diff --git a/kitchensync/src/configguildap.h b/kitchensync/src/configguildap.h
index 15741c13..81b8857b 100644
--- a/kitchensync/src/configguildap.h
+++ b/kitchensync/src/configguildap.h
@@ -29,7 +29,9 @@ class TQCheckBox;
 class TQLabel;
 class TQSpinBox;
 
-class TDEABC::LdapConfigWidget;
+namespace TDEABC {
+    class LdapConfigWidget;
+}
 class KComboBox;
 class KLineEdit;
 
diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h
index 2d239d96..3a4c4bff 100644
--- a/kmail/imapaccountbase.h
+++ b/kmail/imapaccountbase.h
@@ -32,7 +32,9 @@
 #include <tqguardedptr.h>
 #include <tdeio/global.h>
 
-class AccountManager;
+namespace KMail {
+    class AccountManager;
+}
 class KMFolder;
 class TDEConfig/*Base*/;
 class KMMessagePart;
diff --git a/kmail/networkaccount.h b/kmail/networkaccount.h
index 503a312d..1c5dde6e 100644
--- a/kmail/networkaccount.h
+++ b/kmail/networkaccount.h
@@ -33,7 +33,9 @@
 
 #include <tqstring.h>
 
-class AccountManager;
+namespace KMail {
+    class AccountManager;
+}
 class TDEConfig/*Base*/;
 class KURL;
 namespace TDEIO {
diff --git a/libkpimidentities/identity.h b/libkpimidentities/identity.h
index 4d6eeed0..c1af97e1 100644
--- a/libkpimidentities/identity.h
+++ b/libkpimidentities/identity.h
@@ -26,6 +26,12 @@ class TQDataStream;
 
 namespace KPIM {
 
+KDE_EXPORT TQDataStream & operator<<( TQDataStream & stream, const KPIM::Signature & sig );
+KDE_EXPORT TQDataStream & operator>>( TQDataStream & stream, KPIM::Signature & sig );
+
+KDE_EXPORT TQDataStream & operator<<( TQDataStream & stream, const KPIM::Identity & ident );
+KDE_EXPORT TQDataStream & operator>>( TQDataStream & stream, KPIM::Identity & ident );
+
 /**
  * @short abstraction of a signature (aka "footer").
  * @author Marc Mutz <mutz@kde.org>
@@ -320,12 +326,6 @@ protected:
   Kleo::CryptoMessageFormat mPreferredCryptoMessageFormat;
 };
 
-KDE_EXPORT TQDataStream & operator<<( TQDataStream & stream, const KPIM::Signature & sig );
-KDE_EXPORT TQDataStream & operator>>( TQDataStream & stream, KPIM::Signature & sig );
-
-KDE_EXPORT TQDataStream & operator<<( TQDataStream & stream, const KPIM::Identity & ident );
-KDE_EXPORT TQDataStream & operator>>( TQDataStream & stream, KPIM::Identity & ident );
-
 } // namespace KPIM
 
 #endif /*kpim_identity_h*/