diff --git a/client.cpp b/client.cpp
index 90d78cd29e..6b3052f800 100644
--- a/client.cpp
+++ b/client.cpp
@@ -2214,7 +2214,7 @@ void Client::cancelAutoRaise()
     autoRaiseTimer = 0;
     }
 
-void Client::debug( kdbgstream& stream ) const
+void Client::debug( QDebug& stream ) const
     {
     stream << "\'ID:" << window() << ";WMCLASS:" << resourceClass() << ":"
            << resourceName() << ";Caption:" << caption() << "\'";
diff --git a/client.h b/client.h
index 4e5778492b..f8d67d3372 100644
--- a/client.h
+++ b/client.h
@@ -447,7 +447,7 @@ class Client
             bool ignoreMenu = false );
 
     protected:
-        virtual void debug( kdbgstream& stream ) const;
+        virtual void debug( QDebug& stream ) const;
         virtual bool shouldUnredirect() const;
 
     private slots:
diff --git a/deleted.cpp b/deleted.cpp
index 6c1297ff00..91cc454d63 100644
--- a/deleted.cpp
+++ b/deleted.cpp
@@ -127,7 +127,7 @@ QSize Deleted::clientSize() const
     return contentsRect.size();
     }
 
-void Deleted::debug( kdbgstream& stream ) const
+void Deleted::debug( QDebug& stream ) const
     {
     stream << "\'ID:" << window() << "\' (deleted)";
     }
diff --git a/deleted.h b/deleted.h
index e7f70b1511..779471d8ac 100644
--- a/deleted.h
+++ b/deleted.h
@@ -50,7 +50,7 @@ class Deleted
         virtual void addRepaintFull(); // in composite.cpp
         QRect decorationRect() const;
     protected:
-        virtual void debug( kdbgstream& stream ) const;
+        virtual void debug( QDebug& stream ) const;
         virtual bool shouldUnredirect() const;
     private:
         Deleted( Workspace *ws ); // use create()
diff --git a/rules.cpp b/rules.cpp
index 5ea0b6a83a..324c7cd688 100644
--- a/rules.cpp
+++ b/rules.cpp
@@ -718,7 +718,7 @@ void Rules::discardUsed( bool withdrawn )
 
 #endif
 
-kdbgstream& operator<<( kdbgstream& stream, const Rules* r )
+QDebug& operator<<( QDebug& stream, const Rules* r )
     {
     return stream << "[" << r->description << ":" << r->wmclass << "]" ;
     }
diff --git a/rules.h b/rules.h
index 026197dcd0..9fb4f4680a 100644
--- a/rules.h
+++ b/rules.h
@@ -268,7 +268,7 @@ class Rules
         SetRule shortcutrule;
         bool disableglobalshortcuts;
         ForceRule disableglobalshortcutsrule;
-        friend kdbgstream& operator<<( kdbgstream& stream, const Rules* );
+        friend QDebug& operator<<( QDebug& stream, const Rules* );
     };
 
 #ifndef KCMRULES
@@ -329,7 +329,7 @@ void WindowRules::remove( Rules* rule )
 
 #endif
 
-kdbgstream& operator<<( kdbgstream& stream, const Rules* );
+QDebug& operator<<( QDebug& stream, const Rules* );
 
 } // namespace
 
diff --git a/scene_xrender.cpp b/scene_xrender.cpp
index 5b79412453..520ff8e45b 100644
--- a/scene_xrender.cpp
+++ b/scene_xrender.cpp
@@ -68,7 +68,7 @@ struct RegionDebug
    XserverRegion rr;   
    };   
 
-kdbgstream& operator<<( kdbgstream& stream, RegionDebug r )
+QDebug& operator<<( QDebug& stream, RegionDebug r )
     {       
     if( r.rr == None )
         return stream << "EMPTY";
diff --git a/toplevel.cpp b/toplevel.cpp
index bfa21486ff..0454a5cb44 100644
--- a/toplevel.cpp
+++ b/toplevel.cpp
@@ -57,7 +57,7 @@ Toplevel::~Toplevel()
     delete info;
     }
 
-kdbgstream& operator<<( kdbgstream& stream, const Toplevel* cl )
+QDebug& operator<<( QDebug& stream, const Toplevel* cl )
     {
     if( cl == NULL )
         return stream << "\'NULL\'";
@@ -65,7 +65,7 @@ kdbgstream& operator<<( kdbgstream& stream, const Toplevel* cl )
     return stream;
     }
 
-kdbgstream& operator<<( kdbgstream& stream, const ToplevelList& list )
+QDebug& operator<<( QDebug& stream, const ToplevelList& list )
     {
     stream << "LIST:(";
     bool first = true;
@@ -82,7 +82,7 @@ kdbgstream& operator<<( kdbgstream& stream, const ToplevelList& list )
     return stream;
     }
 
-kdbgstream& operator<<( kdbgstream& stream, const ConstToplevelList& list )
+QDebug& operator<<( QDebug& stream, const ConstToplevelList& list )
     {
     stream << "LIST:(";
     bool first = true;
diff --git a/toplevel.h b/toplevel.h
index 6ec12100d6..54a4c0d11b 100644
--- a/toplevel.h
+++ b/toplevel.h
@@ -152,10 +152,10 @@ class Toplevel
         void getWmClientMachine();
         void getResourceClass();
         void getWindowRole();
-        virtual void debug( kdbgstream& stream ) const = 0;
+        virtual void debug( QDebug& stream ) const = 0;
         void copyToDeleted( Toplevel* c );
         void disownDataPassedToDeleted();
-        friend kdbgstream& operator<<( kdbgstream& stream, const Toplevel* );
+        friend QDebug& operator<<( QDebug& stream, const Toplevel* );
         void deleteEffectWindow();
         virtual bool shouldUnredirect() const = 0;
         QRect geom;
@@ -442,9 +442,9 @@ inline bool Toplevel::unredirected() const
     return unredirect;
     }
 
-kdbgstream& operator<<( kdbgstream& stream, const Toplevel* );
-kdbgstream& operator<<( kdbgstream& stream, const ToplevelList& );
-kdbgstream& operator<<( kdbgstream& stream, const ConstToplevelList& );
+QDebug& operator<<( QDebug& stream, const Toplevel* );
+QDebug& operator<<( QDebug& stream, const ToplevelList& );
+QDebug& operator<<( QDebug& stream, const ConstToplevelList& );
 
 KWIN_COMPARE_PREDICATE( WindowMatchPredicate, Toplevel, Window, cl->window() == value );
 KWIN_COMPARE_PREDICATE( FrameIdMatchPredicate, Toplevel, Window, cl->frameId() == value );
diff --git a/unmanaged.cpp b/unmanaged.cpp
index 5c13cf0a6d..fabd2fd59f 100644
--- a/unmanaged.cpp
+++ b/unmanaged.cpp
@@ -132,7 +132,7 @@ QRect Unmanaged::transparentRect() const
     return QRect(clientPos(), clientSize());
     }
 
-void Unmanaged::debug( kdbgstream& stream ) const
+void Unmanaged::debug( QDebug& stream ) const
     {
     stream << "\'ID:" << window() << "\'";
     }
diff --git a/unmanaged.h b/unmanaged.h
index e92a6afd90..6d0ac1c481 100644
--- a/unmanaged.h
+++ b/unmanaged.h
@@ -44,7 +44,7 @@ class Unmanaged
         virtual QSize clientSize() const;
         virtual QRect transparentRect() const;
     protected:
-        virtual void debug( kdbgstream& stream ) const;
+        virtual void debug( QDebug& stream ) const;
         virtual bool shouldUnredirect() const;
     private:
         virtual ~Unmanaged(); // use release()