diff --git a/Makefile.am b/Makefile.am
index 0f252a6231..d73be62e98 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,9 @@ SUBDIRS = . pics clients
 bin_PROGRAMS = kwin
 lib_LTLIBRARIES = kwin.la
 
-kwin_la_SOURCES = atoms.cpp  client.cpp main.cpp stdclient.cpp workspace.cpp tabbox.cpp options.cpp plugins.cpp events.cpp killwindow.cpp KWinInterface.skel
+kwin_la_SOURCES = atoms.cpp  client.cpp main.cpp stdclient.cpp workspace.cpp \
+	tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel
+	#killwindow.cpp 
 kwin_la_LIBADD = $(LIB_KDEUI)
 kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version
 
diff --git a/client.cpp b/client.cpp
index 1af7399d31..4cc35cf79d 100644
--- a/client.cpp
+++ b/client.cpp
@@ -2071,4 +2071,5 @@ NoBorderClient::~NoBorderClient()
 {
 }
 
+#include "client.moc"
 
diff --git a/options.cpp b/options.cpp
index 5045e82ece..8d308cf1d9 100644
--- a/options.cpp
+++ b/options.cpp
@@ -210,3 +210,6 @@ Options::MouseCommand Options::mouseCommand(const QString &name)
     if (name == "Nothing") return MouseNothing;
     return MouseNothing;
 }
+
+#include "options.moc"
+
diff --git a/plugins.cpp b/plugins.cpp
index f58e7b68db..b526ab4421 100644
--- a/plugins.cpp
+++ b/plugins.cpp
@@ -182,5 +182,5 @@ void PluginMgr::loadPlugin(QString nameStr)
         lt_dlclose(oldHandle);
 }
 
-
+#include "plugins.moc"
 
diff --git a/stdclient.cpp b/stdclient.cpp
index 58ae39ea09..7af4774fed 100644
--- a/stdclient.cpp
+++ b/stdclient.cpp
@@ -394,3 +394,4 @@ void StdClient::maxButtonClicked( int button )
     }
 }
 
+#include "stdclient.moc"
diff --git a/tabbox.cpp b/tabbox.cpp
index 02ddfd9119..427b0ae30c 100644
--- a/tabbox.cpp
+++ b/tabbox.cpp
@@ -296,3 +296,4 @@ TabBox::delayedShow()
   delayedShowTimer.start(delayTime, true);
 }
 
+#include "tabbox.moc"
diff --git a/workspace.cpp b/workspace.cpp
index fc6ec9867a..7f79d413cb 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -25,7 +25,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 #include "atoms.h"
 #include "plugins.h"
 #include "events.h"
-#include "killwindow.h"
+//#include "killwindow.h"
 #include <X11/X.h>
 #include <X11/Xos.h>
 #include <X11/Xlib.h>
@@ -1939,8 +1939,11 @@ void Workspace::slotLogout()
  */
 void Workspace::slotKillWindow()
 {
+#warning KillWindow missing because killwindow.h not committed...
+/*
     KillWindow kill( this );
     kill.start();
+*/
 }
 
 
@@ -2382,3 +2385,4 @@ QRect Workspace::clientArea()
   return area;
 }
 
+#include "workspace.moc"