diff --git a/killwindow.cpp b/killwindow.cpp
index df6b447061..216501589c 100644
--- a/killwindow.cpp
+++ b/killwindow.cpp
@@ -4,7 +4,9 @@ kwin - the KDE window manager
 Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 ******************************************************************/
 
+#ifndef QT_CLEAN_NAMESPACE
 #define QT_CLEAN_NAMESPACE
+#endif
 #include "killwindow.h"
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
diff --git a/plugins.cpp b/plugins.cpp
index cf47eb897e..2e7179b426 100644
--- a/plugins.cpp
+++ b/plugins.cpp
@@ -1,6 +1,6 @@
 /*****************************************************************
 kwin - the KDE window manager
-								  
+
 Copyright (C) 1999, 2000    Daniel M. Duley <mosfet@kde.org>
 ******************************************************************/
 #include <kglobal.h>
@@ -76,7 +76,7 @@ void PluginMenu::parseDesktop(QFileInfo *fi)
     config.setDesktopGroup();
     tmpStr = config.readEntry("X-KDE-Library", "");
     if(tmpStr.isEmpty()){
-        warning("KWin: Invalid plugin: %s", fi->absFilePath().latin1());
+        qWarning("KWin: Invalid plugin: %s", fi->absFilePath().latin1());
         return;
     }
     fileList.append(tmpStr);
@@ -148,7 +148,7 @@ void PluginMgr::loadPlugin(QString nameStr)
     nameStr = KGlobal::dirs()->findResource("lib", nameStr);
 
     if(!nameStr){
-        warning("KWin: cannot find client plugin.");
+        qWarning("KWin: cannot find client plugin.");
         handle = 0;
         alloc_ptr = NULL;
         config->writeEntry("PluginLib", "standard");
@@ -156,7 +156,7 @@ void PluginMgr::loadPlugin(QString nameStr)
     else{
         handle = lt_dlopen(nameStr.latin1());
         if(!handle){
-            warning("KWin: cannot load client plugin %s.", nameStr.latin1());
+            qWarning("KWin: cannot load client plugin %s.", nameStr.latin1());
             handle = 0;
             alloc_ptr = NULL;
             config->writeEntry("PluginLib", "standard");
@@ -166,7 +166,7 @@ void PluginMgr::loadPlugin(QString nameStr)
             if(alloc_func)
                 alloc_ptr = (Client* (*)(Workspace *ws, WId w))alloc_func;
             else{
-                warning("KWin: %s is not a KWin plugin.", nameStr.latin1());
+                qWarning("KWin: %s is not a KWin plugin.", nameStr.latin1());
                 lt_dlclose(handle);
                 handle = 0;
                 alloc_ptr = NULL;