diff --git a/kuickshow/ChangeLog b/kuickshow/ChangeLog
index 33767a5..ae15e9a 100644
--- a/kuickshow/ChangeLog
+++ b/kuickshow/ChangeLog
@@ -312,7 +312,7 @@ Sun Mar  4 13:57:52 2001  Carsten Pfeiffer  <pfeiffer@kde.org>
 	hack around QWidget::move() resizing us -> we just ignore that 
 	resizeEvent. Gives less flicker when switching into window-mode.
 
-	* initial fullscreen mode works again as well (hacking around a kwin
+	* initial fullscreen mode works again as well (hacking around a twin
 	"limitation")
 
 Sun Mar  4 10:50:23 2001  Carsten Pfeiffer  <pfeiffer@kde.org>
@@ -387,7 +387,7 @@ Wed Jan 10 23:39:14 2001  Carsten Pfeiffer  <pfeiffer@kde.org>
 Fri Nov  3 14:32:53 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 	* src/imagewindow.cpp (setFullscreen): 
-	cool, no need to workaround kwin's auto-maximization needed,
+	cool, no need to workaround twin's auto-maximization needed,
 	setMinimumSize() does it! Thanks Matthias Ettrich!
 
 Fri Nov  3 13:23:41 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
@@ -400,7 +400,7 @@ Fri Nov  3 13:23:41 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 Fri Nov  3 01:49:57 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 	* src/*: some more work on the KDE2 port/integration. Workarounds for
-	kwin's auto-maximization added. Fullscreen works. Moving images inside
+	twin's auto-maximization added. Fullscreen works. Moving images inside
 	the window works properly again. NETWM/KWin handling is better now.
 	Also better handling of non-loadable files. 
 
diff --git a/kuickshow/src/aboutwidget.cpp b/kuickshow/src/aboutwidget.cpp
index 79689a5..d5d3a84 100644
--- a/kuickshow/src/aboutwidget.cpp
+++ b/kuickshow/src/aboutwidget.cpp
@@ -22,7 +22,7 @@
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 
-#include <kwin.h>
+#include <twin.h>
 #include <kstandarddirs.h>
 
 #include "imlibwidget.h"
diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp
index 215c8ad..1d11a42 100644
--- a/kuickshow/src/imagewindow.cpp
+++ b/kuickshow/src/imagewindow.cpp
@@ -56,7 +56,7 @@
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
 #include <ktempfile.h>
-#include <kwin.h>
+#include <twin.h>
 #include <netwm.h>
 #include <kurldrag.h>
 #include <kio/netaccess.h>
diff --git a/kuickshow/src/kuick.h b/kuickshow/src/kuick.h
index 98289df..c55745e 100644
--- a/kuickshow/src/kuick.h
+++ b/kuickshow/src/kuick.h
@@ -22,8 +22,8 @@
 #include <tqrect.h>
 #include <tqsize.h>
 
-#include <kwin.h>
-#include <kwinmodule.h>
+#include <twin.h>
+#include <twinmodule.h>
 
 class Kuick
 {
diff --git a/kuickshow/src/kuickglobals.h b/kuickshow/src/kuickglobals.h
index 4ea2ff3..bd5be8c 100644
--- a/kuickshow/src/kuickglobals.h
+++ b/kuickshow/src/kuickglobals.h
@@ -19,7 +19,7 @@
 #ifndef KUICKGLOBALS_H
 #define KUICKGLOBALS_H
 
-#include <kwinmodule.h>
+#include <twinmodule.h>
 
 class KuickGlobals
 {
diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp
index bff2caa..636ec39 100644
--- a/kuickshow/src/kuickshow.cpp
+++ b/kuickshow/src/kuickshow.cpp
@@ -57,7 +57,7 @@
 #include <kurlcombobox.h>
 #include <kurlcompletion.h>
 #include <kurldrag.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kstdguiitem.h>
 
 #include <kdebug.h>