diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp
index 2ac32836..572c593c 100644
--- a/kbabel/catalogmanager/catalogmanager.cpp
+++ b/kbabel/catalogmanager/catalogmanager.cpp
@@ -70,7 +70,7 @@
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
 #include <ktoolbar.h>
-#include <kwin.h>
+#include <twin.h>
 
 #include <tqfileinfo.h>
 #include <tqdir.h>
diff --git a/kbabel/catalogmanager/catalogmanagerapp.h b/kbabel/catalogmanager/catalogmanagerapp.h
index 8e5bee23..3f7c0fa8 100644
--- a/kbabel/catalogmanager/catalogmanagerapp.h
+++ b/kbabel/catalogmanager/catalogmanagerapp.h
@@ -41,7 +41,7 @@
 #include "version.h"
 
 #include <kapplication.h>
-#include <kwin.h>
+#include <twin.h>
 
 class CatalogManagerInterface : public CatalogManagerIface
 {
diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp
index f6a96ff5..73c2debd 100644
--- a/kbabel/catalogmanager/catalogmanagerview.cpp
+++ b/kbabel/catalogmanager/catalogmanagerview.cpp
@@ -69,7 +69,7 @@
 #include <kfiledialog.h>
 #include <kio/netaccess.h>
 #include <kprogress.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kdeversion.h>
 #include <ktempfile.h>
 
diff --git a/kbabel/catalogmanager/main.cpp b/kbabel/catalogmanager/main.cpp
index 31030dd5..cf435b12 100644
--- a/kbabel/catalogmanager/main.cpp
+++ b/kbabel/catalogmanager/main.cpp
@@ -50,7 +50,7 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kmainwindow.h>
 
 #include <tqfile.h>
diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp
index b91f26e4..50f8fb0c 100644
--- a/kbabel/kbabel/kbabel.cpp
+++ b/kbabel/kbabel/kbabel.cpp
@@ -76,7 +76,7 @@
 #include <kprogress.h>
 #include <kpushbutton.h>
 #include <kmessagebox.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kaction.h>
 #include <kstdaction.h>
 #include <kspelldlg.h>
diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp
index 47ea0612..213a4e1a 100644
--- a/kbabel/kbabel/kbabelview.cpp
+++ b/kbabel/kbabel/kbabelview.cpp
@@ -74,7 +74,7 @@
 #include <knotifyclient.h>
 #include <ktempfile.h>
 #include <kspell.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kstdaccel.h>
 #include <kurldrag.h>
 #include <kglobalsettings.h>
diff --git a/kbabel/kbabel/main.cpp b/kbabel/kbabel/main.cpp
index 5d771fdc..f36a0b94 100644
--- a/kbabel/kbabel/main.cpp
+++ b/kbabel/kbabel/main.cpp
@@ -47,7 +47,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kuniqueapplication.h>
-#include <kwin.h>
+#include <twin.h>
 
 #include <tqfile.h>
 #include <tqfileinfo.h>
diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp
index 684ff409..de0f747f 100644
--- a/kbabel/kbabeldict/kbabeldictbox.cpp
+++ b/kbabel/kbabeldict/kbabeldictbox.cpp
@@ -56,7 +56,7 @@
 #include <kglobal.h>
 #include <kdebug.h>
 #include <ktrader.h>
-#include <kwin.h>
+#include <twin.h>
 
 #include <tqclipboard.h>
 #include <tqdir.h>
diff --git a/kbabel/kbabeldict/main.cpp b/kbabel/kbabeldict/main.cpp
index a436eae3..293a95bb 100644
--- a/kbabel/kbabeldict/main.cpp
+++ b/kbabel/kbabeldict/main.cpp
@@ -39,7 +39,7 @@
 #include <kcursor.h>
 #include <klocale.h>
 #include <kapplication.h>
-#include <kwin.h>
+#include <twin.h>
 
 #include <tqtimer.h>
 
diff --git a/kioslave/svn/svnhelper/kio_svn_helper.h b/kioslave/svn/svnhelper/kio_svn_helper.h
index c7f5007b..4560988b 100644
--- a/kioslave/svn/svnhelper/kio_svn_helper.h
+++ b/kioslave/svn/svnhelper/kio_svn_helper.h
@@ -22,7 +22,7 @@
 
 #include <kapplication.h>
 #include <kio/job.h>
-#include <kwinmodule.h>
+#include <twinmodule.h>
 #include <tqstringlist.h>
 
 class SvnHelper:public KApplication {
diff --git a/kuiviewer/kuiviewer.cpp b/kuiviewer/kuiviewer.cpp
index b710ce95..d1a60360 100644
--- a/kuiviewer/kuiviewer.cpp
+++ b/kuiviewer/kuiviewer.cpp
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 
 #include <tqobjectlist.h>
-#include <tqdockwindow.h>
+#include <tqdoctwindow.h>
 #include <tqpixmap.h>
 
 #include <kurl.h>
diff --git a/umbrello/umbrello/docgenerators/main.cpp b/umbrello/umbrello/docgenerators/main.cpp
index ea994daf..2deea27b 100644
--- a/umbrello/umbrello/docgenerators/main.cpp
+++ b/umbrello/umbrello/docgenerators/main.cpp
@@ -31,7 +31,7 @@
 #include <klocale.h>
 #include <ktip.h>
 #include <kdebug.h>
-#include <kwin.h>
+#include <twin.h>
 
 #include "version.h"
 
diff --git a/umbrello/umbrello/main.cpp b/umbrello/umbrello/main.cpp
index 5d104d4f..a38e13f4 100644
--- a/umbrello/umbrello/main.cpp
+++ b/umbrello/umbrello/main.cpp
@@ -19,7 +19,7 @@
 #include <klocale.h>
 #include <ktip.h>
 #include <kdebug.h>
-#include <kwin.h>
+#include <twin.h>
 
 // app includes
 #include "uml.h"