diff --git a/amor/amor.cpp b/amor/amor.cpp
index 15454c0..cbbfd54 100644
--- a/amor/amor.cpp
+++ b/amor/amor.cpp
@@ -30,7 +30,7 @@
 
 #include <kdebug.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqtimer.h>
 #include <tqcursor.h>
 #include <tqvaluelist.h>
diff --git a/kmoon/kmoondlg.cpp b/kmoon/kmoondlg.cpp
index 25390ac..603173f 100644
--- a/kmoon/kmoondlg.cpp
+++ b/kmoon/kmoondlg.cpp
@@ -71,11 +71,11 @@ KMoonDlg::KMoonDlg(int a, bool n, bool m, TQWidget *parent, const char *name)
 
         connect(hemitoggle, TQT_SIGNAL(clicked()), TQT_SLOT(toggleHemi()));
 
-        masktoggle = new TQPushButton(hbox2);
-	masktoggle->setText(mask ? i18n("Switch Masking Off") :
+        mastdetoggle = new TQPushButton(hbox2);
+	mastdetoggle->setText(mask ? i18n("Switch Masking Off") :
 			    i18n("Switch Masking On"));
 
-        connect(masktoggle, TQT_SIGNAL(clicked()), TQT_SLOT(toggleMask()));
+        connect(mastdetoggle, TQT_SIGNAL(clicked()), TQT_SLOT(toggleMask()));
         topLayout->addWidget(vbox);
 
 	moon = new MoonWidget(page, "preview");
@@ -107,7 +107,7 @@ void KMoonDlg::toggleHemi() {
 void KMoonDlg::toggleMask() {
     moon->setMask(!moon->mask());
     mask = moon->mask();
-    masktoggle->setText(mask ? i18n("Switch Masking Off") :
+    mastdetoggle->setText(mask ? i18n("Switch Masking Off") :
 			i18n("Switch Masking On"));
 }
 
diff --git a/kmoon/kmoondlg.h b/kmoon/kmoondlg.h
index 9cddb77..3a5e26c 100644
--- a/kmoon/kmoondlg.h
+++ b/kmoon/kmoondlg.h
@@ -44,7 +44,7 @@ class KMoonDlg : public KDialogBase {
   bool north;
   bool mask;
   TQPushButton *hemitoggle;
-  TQPushButton *masktoggle;
+  TQPushButton *mastdetoggle;
   
  private slots:
   void help();
diff --git a/kodo/kodometer.h b/kodo/kodometer.h
index 968ddca..e5d8269 100644
--- a/kodo/kodometer.h
+++ b/kodo/kodometer.h
@@ -44,9 +44,9 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <twin.h>
 
 #include <X11/Xlib.h>
diff --git a/kteatime/toplevel.cpp b/kteatime/toplevel.cpp
index f73209f..d9fcd9b 100644
--- a/kteatime/toplevel.cpp
+++ b/kteatime/toplevel.cpp
@@ -47,9 +47,9 @@
 #include <knotifyclient.h>
 #include <knuminput.h>
 #include <kseparator.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdialogbase.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <knotifydialog.h>
 
 #include "tealist.h"
diff --git a/kweather/kweather.cpp b/kweather/kweather.cpp
index e7d2fcd..120fdf2 100644
--- a/kweather/kweather.cpp
+++ b/kweather/kweather.cpp
@@ -23,7 +23,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeconfig.h>
 #include <ksettings/dialog.h>
 #include <ksettings/dispatcher.h>
diff --git a/kweather/serviceconfigdata.ui b/kweather/serviceconfigdata.ui
index dfed656..e6ee7f3 100644
--- a/kweather/serviceconfigdata.ui
+++ b/kweather/serviceconfigdata.ui
@@ -255,7 +255,7 @@
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
-    <includehint>klistview.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kweather/serviceconfigwidget.cpp b/kweather/serviceconfigwidget.cpp
index a4fb2f7..3671be4 100644
--- a/kweather/serviceconfigwidget.cpp
+++ b/kweather/serviceconfigwidget.cpp
@@ -26,7 +26,7 @@
 #include <tdeconfig.h>
 #include <kdialog.h>
 #include <kglobal.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
diff --git a/kworldwatch/main.h b/kworldwatch/main.h
index 8ac11f1..ba7e233 100644
--- a/kworldwatch/main.h
+++ b/kworldwatch/main.h
@@ -30,7 +30,7 @@
 ** Bug reports and questions can be sent to kde-devel@kde.org
 */
 #include <kuniqueapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 
 class MapWidget;