diff --git a/clients/default/kdedefault.h b/clients/default/kdedefault.h
index 4a8ec19a75..946aca8605 100644
--- a/clients/default/kdedefault.h
+++ b/clients/default/kdedefault.h
@@ -21,7 +21,7 @@
 class QSpacerItem;
 class QBoxLayout;
 class QGridLayout;
-class KPixmap;
+class QPixmap;
 
 namespace Default {
 
@@ -41,7 +41,7 @@ class KDEDefaultHandler: public KDecorationFactory
 		unsigned long readConfig( bool update );
 		void createPixmaps();
 		void freePixmaps();
-		void drawButtonBackground(KPixmap *pix,
+		void drawButtonBackground(QPixmap *pix,
 				const QPalette &g, bool sunken);
 };
 
diff --git a/clients/quartz/quartz.cpp b/clients/quartz/quartz.cpp
index f7e2807f1e..e6633ecdc6 100644
--- a/clients/quartz/quartz.cpp
+++ b/clients/quartz/quartz.cpp
@@ -250,7 +250,7 @@ void QuartzHandler::readConfig()
 
 // This does the colour transition magic. (You say "Oh, is that it?")
 // This may be made configurable at a later stage
-void QuartzHandler::drawBlocks( QPixmap *pi, KPixmap &p, const QColor &c1, const QColor &c2 )
+void QuartzHandler::drawBlocks( QPixmap *pi, QPixmap &p, const QColor &c1, const QColor &c2 )
 {
 	QPainter px;
 
diff --git a/clients/quartz/quartz.h b/clients/quartz/quartz.h
index 4266a02036..2b196dc155 100644
--- a/clients/quartz/quartz.h
+++ b/clients/quartz/quartz.h
@@ -43,7 +43,7 @@ class QuartzHandler: public QObject, public KDecorationFactory
 		void readConfig();
 		void createPixmaps();
 		void freePixmaps();
-		void drawBlocks(KPixmap* pi, KPixmap &p, const QColor &c1, const QColor &c2);
+		void drawBlocks(QPixmap* pi, QPixmap &p, const QColor &c1, const QColor &c2);
 };
 
 
diff --git a/clients/redmond/redmond.cpp b/clients/redmond/redmond.cpp
index 90f91512eb..4b518a92f5 100644
--- a/clients/redmond/redmond.cpp
+++ b/clients/redmond/redmond.cpp
@@ -551,7 +551,7 @@ void RedmondDeco::paintEvent( QPaintEvent* )
         // KS - Add gradient caching if needed at a later stage.
 
         // Create a disposable pixmap buffer for the title blend
-        QPixmap* titleBuffer = new KPixmap;
+        QPixmap* titleBuffer = new QPixmap;
         *titleBuffer = QPixmap(w-2*modBorderWidth, titleHeight);
 
         if (titleBuffer->depth() > 16) {
diff --git a/kcmkwin/kwindecoration/kwindecoration.cpp b/kcmkwin/kwindecoration/kwindecoration.cpp
index 23cc1ddc21..2c47e663f5 100644
--- a/kcmkwin/kwindecoration/kwindecoration.cpp
+++ b/kcmkwin/kwindecoration/kwindecoration.cpp
@@ -67,14 +67,12 @@
 typedef KGenericFactory<KWinDecorationModule, QWidget> KWinDecoFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_kwindecoration, KWinDecoFactory("kcmkwindecoration") )
 
-KWinDecorationModule::KWinDecorationModule(QWidget* parent, const char* name, const QStringList &)
+KWinDecorationModule::KWinDecorationModule(QWidget* parent, const QStringList &)
 	: DCOPObject("KWinClientDecoration"),
 	  KCModule(KWinDecoFactory::instance(), parent),
           kwinConfig("kwinrc"),
           pluginObject(0)
 {
-    setObjectName( name );
-
 	kwinConfig.setGroup("Style");
         plugins = new KDecorationPreviewPlugins( &kwinConfig );
 
diff --git a/kcmkwin/kwindecoration/kwindecoration.h b/kcmkwin/kwindecoration/kwindecoration.h
index ea2a238e09..47ffbb62ed 100644
--- a/kcmkwin/kwindecoration/kwindecoration.h
+++ b/kcmkwin/kwindecoration/kwindecoration.h
@@ -66,7 +66,7 @@ class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface
 	Q_OBJECT
 
 	public:
-		KWinDecorationModule(QWidget* parent, const char* name, const QStringList &);
+		KWinDecorationModule(QWidget* parent, const QStringList &);
 		~KWinDecorationModule();
 
 		virtual void load();