diff --git a/certmanager/conf/appearanceconfigpage.h b/certmanager/conf/appearanceconfigpage.h
index 9425e1e6..6b6848c4 100644
--- a/certmanager/conf/appearanceconfigpage.h
+++ b/certmanager/conf/appearanceconfigpage.h
@@ -32,7 +32,7 @@
 #ifndef _APPEARANCE_CONFIGURE_PAGE_H_
 #define _APPEARANCE_CONFIGURE_PAGE_H_
 
-#include <kcmodule.h>
+#include <tdecmodule.h>
 
 namespace Kleo {
   class AppearanceConfigWidget;
diff --git a/certmanager/conf/dirservconfigpage.h b/certmanager/conf/dirservconfigpage.h
index 536cf76e..f6a32301 100644
--- a/certmanager/conf/dirservconfigpage.h
+++ b/certmanager/conf/dirservconfigpage.h
@@ -32,7 +32,7 @@
 #ifndef DIRSERVCONFIGPAGE_H
 #define DIRSERVCONFIGPAGE_H
 
-#include <kcmodule.h>
+#include <tdecmodule.h>
 #include <kleo/cryptoconfig.h>
 #include <tdepimmacros.h>
 
diff --git a/certmanager/conf/dnorderconfigpage.h b/certmanager/conf/dnorderconfigpage.h
index b183b1f2..0830acbc 100644
--- a/certmanager/conf/dnorderconfigpage.h
+++ b/certmanager/conf/dnorderconfigpage.h
@@ -32,7 +32,7 @@
 #ifndef __KLEOPATRA_CONF_DNORDERCONFIGPAGE_H__
 #define __KLEOPATRA_CONF_DNORDERCONFIGPAGE_H__
 
-#include <kcmodule.h>
+#include <tdecmodule.h>
 
 namespace Kleo {
   class DNAttributeOrderConfigWidget;
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.h b/kaddressbook/kcmconfigs/kcmkabconfig.h
index c920d409..b4b18b0e 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.h
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.h
@@ -24,7 +24,7 @@
 #ifndef KCMKABCONFIG_H
 #define KCMKABCONFIG_H
 
-#include <kcmodule.h>
+#include <tdecmodule.h>
 
 class KABConfigWidget;
 
diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.h b/kaddressbook/kcmconfigs/kcmkabldapconfig.h
index 8539c515..2e823814 100644
--- a/kaddressbook/kcmconfigs/kcmkabldapconfig.h
+++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.h
@@ -24,7 +24,7 @@
 #ifndef KCMKABLDAPCONFIG_H
 #define KCMKABLDAPCONFIG_H
 
-#include <kcmodule.h>
+#include <tdecmodule.h>
 
 #include <tqwidget.h>
 
diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h
index 7b05ddb3..71f04420 100644
--- a/kmail/configuredialog_p.h
+++ b/kmail/configuredialog_p.h
@@ -16,7 +16,7 @@
 
 #include <kdialogbase.h>
 #include <klistview.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
 #include <klocale.h>
 #include <tdepimmacros.h>
 
diff --git a/kmail/kcm_kmail.cpp b/kmail/kcm_kmail.cpp
index eaea2b50..fa0e2fed 100644
--- a/kmail/kcm_kmail.cpp
+++ b/kmail/kcm_kmail.cpp
@@ -24,7 +24,7 @@
 #include <config.h>
 #include "configuredialog.h"
 #include "configuredialog_p.h"
-#include <kcmodule.h>
+#include <tdecmodule.h>
 
 //----------------------------
 // KCM stuff
diff --git a/knode/knconfigpages.cpp b/knode/knconfigpages.cpp
index a76b17ef..9fa15394 100644
--- a/knode/knconfigpages.cpp
+++ b/knode/knconfigpages.cpp
@@ -13,7 +13,7 @@
 
 #include <tqlayout.h>
 
-#include <kcmodule.h>
+#include <tdecmodule.h>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/knode/knconfigpages.h b/knode/knconfigpages.h
index 762845d7..9bcaf1d4 100644
--- a/knode/knconfigpages.h
+++ b/knode/knconfigpages.h
@@ -17,7 +17,7 @@
 #define KNCONFIGPAGES_H
 
 
-#include <kcmodule.h>
+#include <tdecmodule.h>
 
 class BaseWidget;
 class IdentityWidget;
diff --git a/knode/knconfigwidgets.h b/knode/knconfigwidgets.h
index afed1ffc..1c9fbeab 100644
--- a/knode/knconfigwidgets.h
+++ b/knode/knconfigwidgets.h
@@ -16,7 +16,7 @@
 #define KNCONFIGWIDGETS_H
 
 #include <kdialogbase.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
 
 #include "knwidgets.h"
 #include "smtpaccountwidget_base.h"
diff --git a/knode/smtpaccountwidget_base.ui b/knode/smtpaccountwidget_base.ui
index 5ae7862c..b55c0ee1 100644
--- a/knode/smtpaccountwidget_base.ui
+++ b/knode/smtpaccountwidget_base.ui
@@ -225,10 +225,10 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
-    <include location="global" impldecl="in declaration">kcmodule.h</include>
+    <include location="global" impldecl="in declaration">tdecmodule.h</include>
 </includes>
 <includehints>
-    <includehint>kcmodule.h</includehint>
+    <includehint>tdecmodule.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>knuminput.h</includehint>
 </includehints>
diff --git a/kontact/plugins/kmail/kcmkmailsummary.h b/kontact/plugins/kmail/kcmkmailsummary.h
index 4e810ea3..3b6a8f53 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.h
+++ b/kontact/plugins/kmail/kcmkmailsummary.h
@@ -26,7 +26,7 @@
 
 #include <tqvaluelist.h>
 
-#include <kcmodule.h>
+#include <tdecmodule.h>
 
 class KListView;
 
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.h b/kontact/plugins/korganizer/kcmkorgsummary.h
index 216e89d1..18db1df7 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.h
+++ b/kontact/plugins/korganizer/kcmkorgsummary.h
@@ -24,7 +24,7 @@
 #ifndef KCMKORGSUMMARY_H
 #define KCMKORGSUMMARY_H
 
-#include <kcmodule.h>
+#include <tdecmodule.h>
 
 class TQSpinxBox;
 class TQButtonGroup;
diff --git a/kontact/plugins/newsticker/kcmkontactknt.h b/kontact/plugins/newsticker/kcmkontactknt.h
index 2eedb0a7..cd3cbf0e 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.h
+++ b/kontact/plugins/newsticker/kcmkontactknt.h
@@ -24,7 +24,7 @@
 #ifndef KCMKONTACTKNT_H
 #define KCMKONTACTKNT_H
 
-#include <kcmodule.h>
+#include <tdecmodule.h>
 
 class TQListViewItem;
 class TQSpinxBox;
diff --git a/kontact/plugins/specialdates/kcmsdsummary.h b/kontact/plugins/specialdates/kcmsdsummary.h
index b0dbbae9..c0095dfa 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.h
+++ b/kontact/plugins/specialdates/kcmsdsummary.h
@@ -25,7 +25,7 @@
 #ifndef KCMSDSUMMARY_H
 #define KCMSDSUMMARY_H
 
-#include <kcmodule.h>
+#include <tdecmodule.h>
 
 class TQButtonGroup;
 class TQCheckBox;
diff --git a/kontact/plugins/summary/kcmkontactsummary.h b/kontact/plugins/summary/kcmkontactsummary.h
index 6129f46a..3e624798 100644
--- a/kontact/plugins/summary/kcmkontactsummary.h
+++ b/kontact/plugins/summary/kcmkontactsummary.h
@@ -25,7 +25,7 @@
 #ifndef KCMKONTACTSUMMARY_H
 #define KCMKONTACTSUMMARY_H
 
-#include <kcmodule.h>
+#include <tdecmodule.h>
 #include <klistview.h>
 
 class KPluginInfo;
diff --git a/libtdepim/kcmdesignerfields.h b/libtdepim/kcmdesignerfields.h
index aeb196a3..d1f749a5 100644
--- a/libtdepim/kcmdesignerfields.h
+++ b/libtdepim/kcmdesignerfields.h
@@ -22,7 +22,7 @@
 #ifndef KPIM_KCMDESIGNERFIELDS_H
 #define KPIM_KCMDESIGNERFIELDS_H
 
-#include <kcmodule.h>
+#include <tdecmodule.h>
 #include <tdepimmacros.h>
 
 class KListView;
diff --git a/libtdepim/kprefsdialog.h b/libtdepim/kprefsdialog.h
index eebdb939..6774d96d 100644
--- a/libtdepim/kprefsdialog.h
+++ b/libtdepim/kprefsdialog.h
@@ -29,7 +29,7 @@
 #include <tqdatetimeedit.h>
 
 #include <kdialogbase.h>
-#include <kcmodule.h>
+#include <tdecmodule.h>
 #include <kconfigskeleton.h>
 #include <kfile.h>
 #include <tdepimmacros.h>