diff --git a/HACKING b/HACKING
index 76e40edce3..223185d95a 100644
--- a/HACKING
+++ b/HACKING
@@ -143,7 +143,7 @@ changes may have extensive consequences.
 
 Various notes:
 
-- kDebug has overloaded operator << for the Client class, so you can e.g. use 'kDebug() << this << endl;'
+- kDebug has overloaded operator << for the Client class, so you can e.g. use 'kDebug() << this;'
 in class Client and it will print information about the window.
 
 - KWin itself cannot create any normal windows, because it would have trouble managing its own windows.
diff --git a/activation.cpp b/activation.cpp
index 197e8cdc3a..f51c105a10 100644
--- a/activation.cpp
+++ b/activation.cpp
@@ -356,7 +356,7 @@ void Workspace::takeActivity( Client* c, int flags, bool handled )
         }
     if( !c->isShown( true )) // shouldn't happen, call activateClient() if needed
         {
-        kWarning( 1212 ) << "takeActivity: not shown" << endl;
+        kWarning( 1212 ) << "takeActivity: not shown" ;
         return;
         }
     c->takeActivity( flags, handled, Allowed );
@@ -533,20 +533,20 @@ bool Workspace::allowClientActivation( const Client* c, Time time, bool focus_in
         return true;
     if( ac == NULL || ac->isDesktop())
         {
-        kDebug( 1212 ) << "Activation: No client active, allowing" << endl;
+        kDebug( 1212 ) << "Activation: No client active, allowing";
         return true; // no active client -> always allow
         }
     // TODO window urgency  -> return true?
     if( Client::belongToSameApplication( c, ac, true ))
         {
-        kDebug( 1212 ) << "Activation: Belongs to active application" << endl;
+        kDebug( 1212 ) << "Activation: Belongs to active application";
         return true;
         }
     if( level == 3 ) // high
         return false;
     if( time == -1U )  // no time known
         {
-        kDebug( 1212 ) << "Activation: No timestamp at all" << endl;
+        kDebug( 1212 ) << "Activation: No timestamp at all";
         if( level == 1 ) // low
             return true;
         // no timestamp at all, don't activate - because there's also creation timestamp
@@ -579,7 +579,7 @@ bool Workspace::allowFullClientRaising( const Client* c, Time time )
         return false;
     if( ac == NULL || ac->isDesktop())
         {
-        kDebug( 1212 ) << "Raising: No client active, allowing" << endl;
+        kDebug( 1212 ) << "Raising: No client active, allowing";
         return true; // no active client -> always allow
         }
     if( c->ignoreFocusStealing())
@@ -587,7 +587,7 @@ bool Workspace::allowFullClientRaising( const Client* c, Time time )
     // TODO window urgency  -> return true?
     if( Client::belongToSameApplication( c, ac, true ))
         {
-        kDebug( 1212 ) << "Raising: Belongs to active application" << endl;
+        kDebug( 1212 ) << "Raising: Belongs to active application";
         return true;
         }
     if( level == 3 ) // high
@@ -747,7 +747,7 @@ Time Client::readUserTimeMapTimestamp( const KStartupInfoId* asn_id, const KStar
     bool session ) const
     {
     Time time = info->userTime();
-    kDebug( 1212 ) << "User timestamp, initial:" << time << endl;
+    kDebug( 1212 ) << "User timestamp, initial:" << time;
     // newer ASN timestamp always replaces user timestamp, unless user timestamp is 0
     // helps e.g. with konqy reusing
     if( asn_data != NULL && time != 0 )
@@ -764,7 +764,7 @@ Time Client::readUserTimeMapTimestamp( const KStartupInfoId* asn_id, const KStar
             time = asn_data->timestamp();
             }
         }
-    kDebug( 1212 ) << "User timestamp, ASN:" << time << endl;
+    kDebug( 1212 ) << "User timestamp, ASN:" << time;
     if( time == -1U )
         { // The window doesn't have any timestamp.
       // If it's the first window for its application
@@ -796,7 +796,7 @@ Time Client::readUserTimeMapTimestamp( const KStartupInfoId* asn_id, const KStar
             // don't refuse if focus stealing prevention is turned off
             if( !first_window && rules()->checkFSP( options->focusStealingPreventionLevel ) > 0 )
                 {
-                kDebug( 1212 ) << "User timestamp, already exists:" << 0 << endl;
+                kDebug( 1212 ) << "User timestamp, already exists:" << 0;
                 return 0; // refuse activation
                 }
             }
@@ -816,7 +816,7 @@ Time Client::readUserTimeMapTimestamp( const KStartupInfoId* asn_id, const KStar
         else
             time = readUserCreationTime();
         }
-    kDebug( 1212 ) << "User timestamp, final:" << this << ":" << time << endl;
+    kDebug( 1212 ) << "User timestamp, final:" << this << ":" << time;
     return time;
     }
 
diff --git a/client.cpp b/client.cpp
index b83dc1446d..1fe926e299 100644
--- a/client.cpp
+++ b/client.cpp
@@ -1018,7 +1018,7 @@ void Client::closeWindow()
  */
 void Client::killWindow()
     {
-    kDebug( 1212 ) << "Client::killWindow():" << caption() << endl;
+    kDebug( 1212 ) << "Client::killWindow():" << caption();
     // not sure if we need an Notify::Kill or not.. until then, use
     // Notify::Close
     Notify::raise( Notify::Close );
@@ -1069,7 +1069,7 @@ void Client::gotPing( Time timestamp )
 
 void Client::pingTimeout()
     {
-    kDebug( 1212 ) << "Ping timeout:" << caption() << endl;
+    kDebug( 1212 ) << "Ping timeout:" << caption();
     delete ping_timer;
     ping_timer = NULL;
     killProcess( true, ping_timestamp );
@@ -1084,7 +1084,7 @@ void Client::killProcess( bool ask, Time timestamp )
     pid_t pid = info->pid();
     if( pid <= 0 || machine.isEmpty()) // needed properties missing
         return;
-    kDebug( 1212 ) << "Kill process:" << pid << "(" << machine << ")" << endl;
+    kDebug( 1212 ) << "Kill process:" << pid << "(" << machine << ")";
     if( !ask )
         {
         if( machine != "localhost" )
@@ -1118,7 +1118,7 @@ void Client::killProcess( bool ask, Time timestamp )
 
 void Client::processKillerExited()
     {
-    kDebug( 1212 ) << "Killer exited" << endl;
+    kDebug( 1212 ) << "Killer exited";
     delete process_killer;
     process_killer = NULL;
     }
@@ -1238,8 +1238,8 @@ void Client::takeActivity( int flags, bool handled, allowed_t )
     static Client* previous_client;
     if( previous_activity_timestamp == xTime() && previous_client != this )
         {
-        kDebug( 1212 ) << "Repeated use of the same X timestamp for activity" << endl;
-        kDebug( 1212 ) << kBacktrace() << endl;
+        kDebug( 1212 ) << "Repeated use of the same X timestamp for activity";
+        kDebug( 1212 ) << kBacktrace();
         }
     previous_activity_timestamp = xTime();
     previous_client = this;
@@ -1255,8 +1255,8 @@ void Client::takeFocus( allowed_t )
     static Client* previous_client;
     if( previous_focus_timestamp == xTime() && previous_client != this )
         {
-        kDebug( 1212 ) << "Repeated use of the same X timestamp for focus" << endl;
-        kDebug( 1212 ) << kBacktrace() << endl;
+        kDebug( 1212 ) << "Repeated use of the same X timestamp for focus";
+        kDebug( 1212 ) << kBacktrace();
         }
     previous_focus_timestamp = xTime();
     previous_client = this;
diff --git a/clients/kwmtheme/cli_installer/main.cpp b/clients/kwmtheme/cli_installer/main.cpp
index f125decb32..ed3ef500c8 100644
--- a/clients/kwmtheme/cli_installer/main.cpp
+++ b/clients/kwmtheme/cli_installer/main.cpp
@@ -16,11 +16,11 @@ void copy(const QString &src, const QString &dest)
     QFile copyInput(src);
     QFile copyOutput(dest);
     if(!copyInput.open(QIODevice::ReadOnly)){
-        kWarning() << "Couldn't open " << src << endl;
+        kWarning() << "Couldn't open " << src ;
         return;
     }
     if(!copyOutput.open(QIODevice::WriteOnly)){
-        kWarning() << "Couldn't open " << dest << endl;
+        kWarning() << "Couldn't open " << dest ;
         copyInput.close();
         return;
     }
@@ -41,7 +41,7 @@ int main(int argc, char **argv)
     KApplication app(argc, argv);
     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
     if(!args->count()){
-        kWarning() << "You need to specify the path to a theme config file!" << endl;
+        kWarning() << "You need to specify the path to a theme config file!" ;
         return(1);
     }
 
@@ -50,7 +50,7 @@ int main(int argc, char **argv)
     QString tmpStr;
 
     if(!f.exists()){
-        kWarning() << "Specified theme config file doesn't exist!" << endl;
+        kWarning() << "Specified theme config file doesn't exist!" ;
         return(2);
     }
 
diff --git a/clients/kwmtheme/kwmthemeclient.cpp b/clients/kwmtheme/kwmthemeclient.cpp
index 3c975dc13f..c150cc4137 100644
--- a/clients/kwmtheme/kwmthemeclient.cpp
+++ b/clients/kwmtheme/kwmthemeclient.cpp
@@ -94,7 +94,7 @@ static void create_pixmaps()
         framePixmaps[i] = new QPixmap(locate("data",
                                       "kwin/pics/"+config.readEntry(keys[i], " ")));
         if(framePixmaps[i]->isNull())
-            kWarning() << "Unable to load frame pixmap for " << keys[i] << endl;
+            kWarning() << "Unable to load frame pixmap for " << keys[i] ;
     }
 /*
     *framePixmaps[FrameTop] = stretchPixmap(*framePixmaps[FrameTop], false);
@@ -337,7 +337,7 @@ void KWMThemeClient::init()
             if((val != "Off") && 
                ((val == "Iconify") && !isMinimizable()) &&
                ((val == "Maximize") && !isMaximizable()))
-                kWarning() << "KWin: Unrecognized button value: " << val << endl;
+                kWarning() << "KWin: Unrecognized button value: " << val ;
 
         }
     }
diff --git a/clients/oxygen/oxygenbutton.cpp b/clients/oxygen/oxygenbutton.cpp
index a501a97f65..5afa6b66ff 100644
--- a/clients/oxygen/oxygenbutton.cpp
+++ b/clients/oxygen/oxygenbutton.cpp
@@ -117,7 +117,7 @@ void OxygenButton::leaveEvent(QEvent *e)
 
 void OxygenButton::pressSlot()
 {
-    kDebug() << "Pressed " << endl;
+    kDebug() << "Pressed ";
     status_ = Oxygen::Pressed;
     update();
 }
diff --git a/composite.cpp b/composite.cpp
index 45dc3d4154..b41c24a8e8 100644
--- a/composite.cpp
+++ b/composite.cpp
@@ -67,17 +67,17 @@ void Workspace::setupCompositing()
 #if defined( HAVE_XCOMPOSITE ) && defined( HAVE_XDAMAGE )
     if( !options->useCompositing )
         {
-        kDebug( 1212 ) << "Compositing is turned off in options" << endl;
+        kDebug( 1212 ) << "Compositing is turned off in options";
         return;
         }
     if( !Extensions::compositeAvailable())
         {
-        kDebug( 1212 ) << "No composite extension available" << endl;
+        kDebug( 1212 ) << "No composite extension available";
         return;
         }
     if( !Extensions::damageAvailable())
         {
-        kDebug( 1212 ) << "No damage extension available" << endl;
+        kDebug( 1212 ) << "No damage extension available";
         return;
         }
     if( scene != NULL )
@@ -101,7 +101,7 @@ void Workspace::setupCompositing()
                 type = XRenderCompositing;
                 break;
             default:
-                kDebug( 1212 ) << "No compositing" << endl;
+                kDebug( 1212 ) << "No compositing";
                 return;
             }
         }
@@ -109,12 +109,12 @@ void Workspace::setupCompositing()
     switch( type )
         {
         /*case 'B':
-            kDebug( 1212 ) << "X compositing" << endl;
+            kDebug( 1212 ) << "X compositing";
             scene = new SceneBasic( this );
           break; // don't fall through (this is a testing one) */
 #ifdef HAVE_OPENGL
         case OpenGLCompositing:
-            kDebug( 1212 ) << "OpenGL compositing" << endl;
+            kDebug( 1212 ) << "OpenGL compositing";
             scene = new SceneOpenGL( this );
             if( !scene->initFailed())
                 break; // -->
@@ -124,12 +124,12 @@ void Workspace::setupCompositing()
 #endif
 #if defined(HAVE_XRENDER) && defined(HAVE_XFIXES)
         case XRenderCompositing:
-            kDebug( 1212 ) << "XRender compositing" << endl;
+            kDebug( 1212 ) << "XRender compositing";
             scene = new SceneXrender( this );
           break;
 #endif
         default:
-          kDebug( 1212 ) << "No compositing" << endl;
+          kDebug( 1212 ) << "No compositing";
           return;
         }
     if( scene == NULL || scene->initFailed())
@@ -166,7 +166,7 @@ void Workspace::setupCompositing()
     // 200Hz to 1000Hz are effectively identical
     else if( rate > 1000 )
         rate = 1000;
-    kDebug( 1212 ) << "Refresh rate " << rate << "Hz" << endl;
+    kDebug( 1212 ) << "Refresh rate " << rate << "Hz";
     compositeRate = 1000 / rate;
     compositeTimer.start( compositeRate );
     lastCompositePaint.start();
@@ -188,7 +188,7 @@ void Workspace::setupCompositing()
     delete popup; // force re-creation of the Alt+F3 popup (opacity option)
     popup = NULL;
 #else
-    kDebug( 1212 ) << "Compositing was not available at compile time" << endl;
+    kDebug( 1212 ) << "Compositing was not available at compile time";
 #endif
     }
 
@@ -238,7 +238,7 @@ void Workspace::finishCompositing()
 
 void Workspace::lostCMSelection()
     {
-    kDebug( 1212 ) << "Lost compositing manager selection" << endl;
+    kDebug( 1212 ) << "Lost compositing manager selection";
     finishCompositing();
     }
 
@@ -445,7 +445,7 @@ Pixmap Toplevel::createWindowPixmap()
         window_pix = None;
     ungrabXServer();
     if( window_pix == None )
-        kDebug( 1212 ) << "Creating window pixmap failed: " << this << endl;
+        kDebug( 1212 ) << "Creating window pixmap failed: " << this;
     return window_pix;
 #else
     return None;
diff --git a/data/update_default_rules.cpp b/data/update_default_rules.cpp
index 0725ee52d7..a078778666 100644
--- a/data/update_default_rules.cpp
+++ b/data/update_default_rules.cpp
@@ -24,7 +24,7 @@ int main( int argc, char* argv[] )
     QString file = KStandardDirs::locate( "data", QString( "kwin/default_rules/" ) + argv[ 1 ] );
     if( file.isEmpty())
         {
-        kWarning() << "File " << argv[ 1 ] << " not found!" << endl;
+        kWarning() << "File " << argv[ 1 ] << " not found!" ;
         return 1;
         }
     KConfig src_cfg( file );
diff --git a/effects.cpp b/effects.cpp
index aac1c0ee7a..545b6541d0 100644
--- a/effects.cpp
+++ b/effects.cpp
@@ -632,20 +632,20 @@ bool EffectsHandlerImpl::loadEffect( const QString& name )
     assert( current_transform == 0 );
 
     if( !name.startsWith("kwin4_effect_") )
-        kWarning( 1212 ) << k_funcinfo << "Effect names usually have kwin4_effect_ prefix" << endl;
+        kWarning( 1212 ) << k_funcinfo << "Effect names usually have kwin4_effect_ prefix" ;
 
     // Make sure a single effect won't be loaded multiple times
     for(QVector< EffectPair >::const_iterator it = loaded_effects.constBegin(); it != loaded_effects.constEnd(); ++it)
         {
         if( (*it).first == name )
             {
-            kDebug( 1212 ) << "EffectsHandler::loadEffect : Effect already loaded : " << name << endl;
+            kDebug( 1212 ) << "EffectsHandler::loadEffect : Effect already loaded : " << name;
             return true;
             }
         }
 
 
-    kDebug( 1212 ) << k_funcinfo << "Trying to load " << name << endl;
+    kDebug( 1212 ) << k_funcinfo << "Trying to load " << name;
     QString internalname = name.toLower();
 
     QString constraint = QString("[X-KDE-PluginInfo-Name] == '%1'").arg(internalname);
@@ -673,7 +673,7 @@ bool EffectsHandlerImpl::loadEffect( const QString& name )
         t_supportedfunc supported = reinterpret_cast<t_supportedfunc>(supported_func);
         if(!supported())
             {
-            kWarning( 1212 ) << "EffectsHandler::loadEffect : Effect " << name << " is not supported" << endl;
+            kWarning( 1212 ) << "EffectsHandler::loadEffect : Effect " << name << " is not supported" ;
             library->unload();
             return false;
             }
@@ -722,7 +722,7 @@ void EffectsHandlerImpl::unloadEffect( const QString& name )
         {
         if ( it.value().first == name )
             {
-            kDebug( 1212 ) << "EffectsHandler::unloadEffect : Unloading Effect : " << name << endl;
+            kDebug( 1212 ) << "EffectsHandler::unloadEffect : Unloading Effect : " << name;
             delete it.value().second;
             effect_order.erase(it);
             effectsChanged();
@@ -731,7 +731,7 @@ void EffectsHandlerImpl::unloadEffect( const QString& name )
             }
         }
 
-    kDebug( 1212 ) << "EffectsHandler::unloadEffect : Effect not loaded : " << name << endl;
+    kDebug( 1212 ) << "EffectsHandler::unloadEffect : Effect not loaded : " << name;
     }
 
 void EffectsHandlerImpl::reloadEffect( const QString& name )
@@ -755,10 +755,10 @@ bool EffectsHandlerImpl::isEffectLoaded( const QString& name )
 void EffectsHandlerImpl::effectsChanged()
     {
     loaded_effects.clear();
-    kDebug() << k_funcinfo << "Recreating effects' list:" << endl;
+    kDebug() << k_funcinfo << "Recreating effects' list:";
     foreach( EffectPair effect, effect_order )
         {
-        kDebug() << k_funcinfo << effect.first << endl;
+        kDebug() << k_funcinfo << effect.first;
         loaded_effects.append( effect );
         }
     }
diff --git a/effects/blur.cpp b/effects/blur.cpp
index bbcf77f612..a1c34764a2 100644
--- a/effects/blur.cpp
+++ b/effects/blur.cpp
@@ -62,7 +62,7 @@ bool BlurEffect::loadData()
     int texh = displayHeight();
     if( !GLTexture::NPOTTextureSupported() )
     {
-        kWarning( 1212 ) << k_funcinfo << "NPOT textures not supported, wasting some memory" << endl;
+        kWarning( 1212 ) << k_funcinfo << "NPOT textures not supported, wasting some memory" ;
         texw = nearestPowerOfTwo(texw);
         texh = nearestPowerOfTwo(texh);
     }
diff --git a/effects/demo_liquid.cpp b/effects/demo_liquid.cpp
index a1ddf07ffe..6024d1c309 100644
--- a/effects/demo_liquid.cpp
+++ b/effects/demo_liquid.cpp
@@ -52,7 +52,7 @@ bool LiquidEffect::loadData()
     int texh = displayHeight();
     if( !GLTexture::NPOTTextureSupported() )
     {
-        kWarning( 1212 ) << k_funcinfo << "NPOT textures not supported, wasting some memory" << endl;
+        kWarning( 1212 ) << k_funcinfo << "NPOT textures not supported, wasting some memory" ;
         texw = nearestPowerOfTwo(texw);
         texh = nearestPowerOfTwo(texh);
     }
diff --git a/effects/lookingglass.cpp b/effects/lookingglass.cpp
index 72de4e8c0e..69dd4ab309 100644
--- a/effects/lookingglass.cpp
+++ b/effects/lookingglass.cpp
@@ -78,7 +78,7 @@ void LookingGlassEffect::prePaintScreen( ScreenPrePaintData& data, int time )
             zoom = qMin( zoom * qMax( 1.0f + diff, 1.2f ), target_zoom );
         else
             zoom = qMax( zoom * qMin( 1.0f - diff, 0.8f ), target_zoom );
-        kDebug() << k_funcinfo << "zoom is now " << zoom << endl;
+        kDebug() << k_funcinfo << "zoom is now " << zoom;
         radius = qBound(200.0f, 200.0f * zoom, 500.0f);
 
         if( zoom > 1.0f )
diff --git a/effects/presentwindows.cpp b/effects/presentwindows.cpp
index 199d4c5243..7f29c36c98 100644
--- a/effects/presentwindows.cpp
+++ b/effects/presentwindows.cpp
@@ -390,7 +390,7 @@ void PresentWindowsEffect::calculateWindowTransformationsDumb(EffectWindowList w
     // Size of one cell
     int cellwidth = placementRect.width() / cols;
     int cellheight = placementRect.height() / rows;
-    kDebug() << k_funcinfo << "Got " << windowlist.count() << " clients, using " << rows << "x" << cols << " grid" << endl;
+    kDebug() << k_funcinfo << "Got " << windowlist.count() << " clients, using " << rows << "x" << cols << " grid";
 
     // Calculate position and scale factor for each window
     int i = 0;
@@ -450,7 +450,7 @@ void PresentWindowsEffect::calculateWindowTransformationsKompose(EffectWindowLis
         rows = (int)ceil( sqrt(windowlist.count()) );
         columns = (int)ceil( (double)windowlist.count() / (double)rows );
     }
-    kDebug() << k_funcinfo << "Using " << rows << " rows & " << columns << " columns for " << windowlist.count() << " clients" << endl;
+    kDebug() << k_funcinfo << "Using " << rows << " rows & " << columns << " columns for " << windowlist.count() << " clients";
 
     // Calculate width & height
     int w = (availRect.width() - (columns+1) * spacing ) / columns;
diff --git a/effects/presentwindows_config.cpp b/effects/presentwindows_config.cpp
index cc9fa54adc..dccbb85f35 100644
--- a/effects/presentwindows_config.cpp
+++ b/effects/presentwindows_config.cpp
@@ -29,7 +29,7 @@ namespace KWin
 PresentWindowsEffectConfig::PresentWindowsEffectConfig(QWidget* parent, const QStringList& args) :
         KCModule(KGenericFactory<PresentWindowsEffectConfig>::componentData(), parent, args)
     {
-    kDebug() << k_funcinfo << endl;
+    kDebug() << k_funcinfo;
 
     QGridLayout* layout = new QGridLayout(this);
 
@@ -56,7 +56,7 @@ PresentWindowsEffectConfig::PresentWindowsEffectConfig(QWidget* parent, const QS
 
 PresentWindowsEffectConfig::~PresentWindowsEffectConfig()
     {
-    kDebug() << k_funcinfo << endl;
+    kDebug() << k_funcinfo;
     }
 
 void PresentWindowsEffectConfig::addItems(QComboBox* combo)
@@ -74,7 +74,7 @@ void PresentWindowsEffectConfig::addItems(QComboBox* combo)
 
 void PresentWindowsEffectConfig::load()
     {
-    kDebug() << k_funcinfo << endl;
+    kDebug() << k_funcinfo;
     KCModule::load();
 
     KConfigGroup conf = EffectsHandler::effectConfig("PresentWindows");
@@ -92,7 +92,7 @@ void PresentWindowsEffectConfig::load()
 
 void PresentWindowsEffectConfig::save()
     {
-    kDebug() << k_funcinfo << endl;
+    kDebug() << k_funcinfo;
     KCModule::save();
 
     KConfigGroup conf = EffectsHandler::effectConfig("PresentWindows");
@@ -114,7 +114,7 @@ void PresentWindowsEffectConfig::save()
 
 void PresentWindowsEffectConfig::defaults()
     {
-    kDebug() << k_funcinfo << endl;
+    kDebug() << k_funcinfo;
     mActivateCombo->setCurrentIndex( (int)ElectricTopRight );
     mActivateAllCombo->setCurrentIndex( (int)ElectricNone - 1 );
     emit changed(true);
diff --git a/effects/shadow_config.cpp b/effects/shadow_config.cpp
index 12c7e6fe26..258674ee6c 100644
--- a/effects/shadow_config.cpp
+++ b/effects/shadow_config.cpp
@@ -29,7 +29,7 @@ namespace KWin
 ShadowEffectConfig::ShadowEffectConfig(QWidget* parent, const QStringList& args) :
         KCModule(KGenericFactory<ShadowEffectConfig>::componentData(), parent, args)
     {
-    kDebug() << k_funcinfo << endl;
+    kDebug() << k_funcinfo;
 
     QGridLayout* layout = new QGridLayout(this);
 
@@ -65,12 +65,12 @@ ShadowEffectConfig::ShadowEffectConfig(QWidget* parent, const QStringList& args)
 
 ShadowEffectConfig::~ShadowEffectConfig()
     {
-    kDebug() << k_funcinfo << endl;
+    kDebug() << k_funcinfo;
     }
 
 void ShadowEffectConfig::load()
     {
-    kDebug() << k_funcinfo << endl;
+    kDebug() << k_funcinfo;
     KCModule::load();
 
     KConfigGroup conf = EffectsHandler::effectConfig("Shadow");
@@ -84,7 +84,7 @@ void ShadowEffectConfig::load()
 
 void ShadowEffectConfig::save()
     {
-    kDebug() << k_funcinfo << endl;
+    kDebug() << k_funcinfo;
     KCModule::save();
 
     KConfigGroup conf = EffectsHandler::effectConfig("Shadow");
@@ -100,7 +100,7 @@ void ShadowEffectConfig::save()
 
 void ShadowEffectConfig::defaults()
     {
-    kDebug() << k_funcinfo << endl;
+    kDebug() << k_funcinfo;
     mShadowXOffset->setValue( 10 );
     mShadowYOffset->setValue( 10 );
     mShadowOpacity->setValue( 20 );
diff --git a/effects/videorecord.cpp b/effects/videorecord.cpp
index db9e77e1bc..8fe8c44473 100644
--- a/effects/videorecord.cpp
+++ b/effects/videorecord.cpp
@@ -108,24 +108,24 @@ void VideoRecordEffect::startRecording()
     client = CapturyOpen( &config );
     if( client == NULL )
         {
-        kDebug( 1212 ) << "Video recording init failed" << endl;
+        kDebug( 1212 ) << "Video recording init failed";
         return;
         }
     // TODO
     if( CapturySetOutputFileName( client, "/tmp/kwin_video.cps" ) != CAPTURY_SUCCESS )
         {
-        kDebug( 1212 ) << "Video recording file open failed" << endl;
+        kDebug( 1212 ) << "Video recording file open failed";
         return;
         }
     effects->addRepaintFull(); // trigger reading initial screen contents into buffer
-    kDebug( 1212 ) << "Video recording start" << endl;
+    kDebug( 1212 ) << "Video recording start";
     }
 
 void VideoRecordEffect::stopRecording()
     {
     if( client == NULL )
         return;
-    kDebug( 1212 ) << "Video recording stop" << endl;
+    kDebug( 1212 ) << "Video recording stop";
     CapturyClose( client );
     client = NULL;
     }
diff --git a/events.cpp b/events.cpp
index d66b3f6d79..d0aa35e038 100644
--- a/events.cpp
+++ b/events.cpp
@@ -246,7 +246,7 @@ bool Workspace::workspaceEvent( XEvent * e )
             was_user_interaction = true;
             int keyQt;
             KKeyServer::xEventToQt(e, &keyQt);
-            kDebug(125) << "Workspace::keyPress( " << keyQt << " )" << endl;
+            kDebug(125) << "Workspace::keyPress( " << keyQt << " )";
             if (movingClient)
                 {
                 movingClient->keyPressEvent(keyQt);
@@ -437,7 +437,7 @@ bool Workspace::workspaceEvent( XEvent * e )
                 XGetInputFocus( display(), &focus, &revert );
                 if( focus == None || focus == PointerRoot )
                     {
-                    //kWarning( 1212 ) << "X focus set to None/PointerRoot, reseting focus" << endl;
+                    //kWarning( 1212 ) << "X focus set to None/PointerRoot, reseting focus" ;
                     Client *c = mostRecentlyActivatedClient();
                     if( c != NULL )
                         requestFocus( c, true );
@@ -1275,7 +1275,7 @@ void Client::processMousePressEvent( QMouseEvent* e )
     {
     if( e->type() != QEvent::MouseButtonPress )
         {
-        kWarning() << "processMousePressEvent()" << endl;
+        kWarning() << "processMousePressEvent()" ;
         return;
         }
     int button;
diff --git a/geometry.cpp b/geometry.cpp
index 4688541a1f..2075c296c6 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -76,7 +76,7 @@ void Workspace::updateClientArea( bool force )
     {
     QDesktopWidget *desktopwidget = KApplication::desktop();
     int nscreens = desktopwidget -> numScreens ();
-//    kDebug () << "screens: " << nscreens << endl;
+//    kDebug () << "screens: " << nscreens;
     QRect* new_wareas = new QRect[ numberOfDesktops() + 1 ];
     QRect** new_sareas = new QRect*[ numberOfDesktops() + 1];
     QRect* screens = new QRect [ nscreens ];
@@ -124,7 +124,7 @@ void Workspace::updateClientArea( bool force )
                             iS < nscreens;
                             iS ++ )
                         {
-//                            kDebug () << "adjusting new_sarea: " << screens[ iS ] << endl;
+//                            kDebug () << "adjusting new_sarea: " << screens[ iS ];
                             new_sareas[ (*it)->desktop() ][ iS ] =
                                 new_sareas[ (*it)->desktop() ][ iS ].intersect(
                                         (*it)->adjustedClientArea( desktopArea, screens[ iS ] )
@@ -140,7 +140,7 @@ void Workspace::updateClientArea( bool force )
             for( int iS = 0;
                     iS < nscreens;
                     iS ++ )
-                kDebug () << "new_sarea: " << new_sareas[ i ][ iS ] << endl;
+                kDebug () << "new_sarea: " << new_sareas[ i ][ iS ];
         }
 #endif
     // TODO topmenu update for screenarea changes?
@@ -770,19 +770,19 @@ QRect Client::adjustedClientArea( const QRect &desktopArea, const QRect& area )
     stareaB.setBottom( qMin( stareaB.bottom(), screenarea.bottom()));
 
     if (stareaL . intersects (area)) {
-//        kDebug () << "Moving left of: " << r << " to " << stareaL.right() + 1 << endl;
+//        kDebug () << "Moving left of: " << r << " to " << stareaL.right() + 1;
         r . setLeft( stareaL . right() + 1 );
     }
     if (stareaR . intersects (area)) {
-//        kDebug () << "Moving right of: " << r << " to " << stareaR.left() - 1 << endl;
+//        kDebug () << "Moving right of: " << r << " to " << stareaR.left() - 1;
         r . setRight( stareaR . left() - 1 );
     }
     if (stareaT . intersects (area)) {
-//        kDebug () << "Moving top of: " << r << " to " << stareaT.bottom() + 1 << endl;
+//        kDebug () << "Moving top of: " << r << " to " << stareaT.bottom() + 1;
         r . setTop( stareaT . bottom() + 1 );
     }
     if (stareaB . intersects (area)) {
-//        kDebug () << "Moving bottom of: " << r << " to " << stareaB.top() - 1 << endl;
+//        kDebug () << "Moving bottom of: " << r << " to " << stareaB.top() - 1;
         r . setBottom( stareaB . top() - 1 );
     }
     return r;
@@ -897,7 +897,7 @@ void Client::checkWorkspacePosition()
             else
                 area = workspace()->clientArea( MaximizeFullArea, QPoint( 0, 0 ), desktop());
             area.setHeight( workspace()->topMenuHeight());
-//            kDebug() << "TOPMENU size adjust: " << area << ":" << this << endl;
+//            kDebug() << "TOPMENU size adjust: " << area << ":" << this;
             setGeometry( area );
             }
         return;
@@ -1040,8 +1040,8 @@ QSize Client::sizeForClientSize( const QSize& wsize, Sizemode mode, bool noframe
     int h = wsize.height();
     if( w < 1 || h < 1 )
         {
-        kWarning() << "sizeForClientSize() with empty size!" << endl;
-        kWarning() << kBacktrace() << endl;
+        kWarning() << "sizeForClientSize() with empty size!" ;
+        kWarning() << kBacktrace() ;
         }
     if (w<1) w = 1;
     if (h<1) h = 1;
@@ -1489,8 +1489,8 @@ void Client::resizeWithChecks( int w, int h, ForceGeometry_t force )
         {
         if( h == border_top + border_bottom )
             {
-            kWarning() << "Shaded geometry passed for size:" << endl;
-            kWarning() << kBacktrace() << endl;
+            kWarning() << "Shaded geometry passed for size:" ;
+            kWarning() << kBacktrace() ;
             }
         }
     int newx = x();
@@ -1664,8 +1664,8 @@ void Client::setGeometry( int x, int y, int w, int h, ForceGeometry_t force )
         {
         if( h == border_top + border_bottom )
             {
-            kDebug() << "Shaded geometry passed for size:" << endl;
-            kDebug() << kBacktrace() << endl;
+            kDebug() << "Shaded geometry passed for size:";
+            kDebug() << kBacktrace();
             }
         else
             {
@@ -1734,8 +1734,8 @@ void Client::plainResize( int w, int h, ForceGeometry_t force )
         {
         if( h == border_top + border_bottom )
             {
-            kDebug() << "Shaded geometry passed for size:" << endl;
-            kDebug() << kBacktrace() << endl;
+            kDebug() << "Shaded geometry passed for size:";
+            kDebug() << kBacktrace();
             }
         else
             {
@@ -1749,8 +1749,8 @@ void Client::plainResize( int w, int h, ForceGeometry_t force )
         }
     if( QSize( w, h ) != rules()->checkSize( QSize( w, h )))
         {
-        kDebug() << "forced size fail:" << QSize( w,h ) << ":" << rules()->checkSize( QSize( w, h )) << endl;
-        kDebug() << kBacktrace() << endl;
+        kDebug() << "forced size fail:" << QSize( w,h ) << ":" << rules()->checkSize( QSize( w, h ));
+        kDebug() << kBacktrace();
         }
     // resuming geometry updates is handled only in setGeometry()
     assert( pending_geometry_update == PendingGeometryNone || block_geometry_updates > 0 );
@@ -2062,8 +2062,8 @@ void Client::checkMaximizeGeometry()
     static int recursion_protection = 0;
     if( recursion_protection > 3 )
         {
-        kWarning( 1212 ) << "Check maximize overflow - you loose!" << endl;
-        kWarning( 1212 ) << kBacktrace() << endl;
+        kWarning( 1212 ) << "Check maximize overflow - you loose!" ;
+        kWarning( 1212 ) << kBacktrace() ;
         return;
         }
     ++recursion_protection;
diff --git a/group.cpp b/group.cpp
index 9e020d4510..ff5d9c6957 100644
--- a/group.cpp
+++ b/group.cpp
@@ -90,8 +90,8 @@ bool performTransiencyCheck()
                     && !Workspace::self()->clients.contains( *it2 )
                     && !Workspace::self()->desktops.contains( *it2 ))
                     {
-                    kDebug() << "TC:" << *it1 << " has non-existent main client " << endl;
-                    kDebug() << "TC2:" << *it2 << endl; // this may crash
+                    kDebug() << "TC:" << *it1 << " has non-existent main client ";
+                    kDebug() << "TC2:" << *it2; // this may crash
                     ret = false;
                     continue;
                     }
@@ -111,8 +111,8 @@ bool performTransiencyCheck()
                 && !Workspace::self()->clients.contains( *it2 )
                 && !Workspace::self()->desktops.contains( *it2 ))
                 {
-                kDebug() << "TC:" << *it1 << " has non-existent transient " << endl;
-                kDebug() << "TC2:" << *it2 << endl; // this may crash
+                kDebug() << "TC:" << *it1 << " has non-existent transient ";
+                kDebug() << "TC2:" << *it2; // this may crash
                 ret = false;
                 continue;
                 }
@@ -254,15 +254,15 @@ void Group::addMember( Client* member_P )
     {
     TRANSIENCY_CHECK( member_P );
     _members.append( member_P );
-//    kDebug() << "GROUPADD:" << this << ":" << member_P << endl;
-//    kDebug() << kBacktrace() << endl;
+//    kDebug() << "GROUPADD:" << this << ":" << member_P;
+//    kDebug() << kBacktrace();
     }
 
 void Group::removeMember( Client* member_P )
     {
     TRANSIENCY_CHECK( member_P );
-//    kDebug() << "GROUPREMOVE:" << this << ":" << member_P << endl;
-//    kDebug() << kBacktrace() << endl;
+//    kDebug() << "GROUPREMOVE:" << this << ":" << member_P;
+//    kDebug() << kBacktrace();
     Q_ASSERT( _members.contains( member_P ));
     _members.removeAll( member_P );
 // there are cases when automatic deleting of groups must be delayed,
@@ -643,28 +643,28 @@ void Client::removeFromMainClients()
 void Client::cleanGrouping()
     {
     TRANSIENCY_CHECK( this );
-//    kDebug() << "CLEANGROUPING:" << this << endl;
+//    kDebug() << "CLEANGROUPING:" << this;
 //    for( ClientList::ConstIterator it = group()->members().begin();
 //         it != group()->members().end();
 //         ++it )
-//        kDebug() << "CL:" << *it << endl;
+//        kDebug() << "CL:" << *it;
 //    ClientList mains;
 //    mains = mainClients();
 //    for( ClientList::ConstIterator it = mains.begin();
 //         it != mains.end();
 //         ++it )
-//        kDebug() << "MN:" << *it << endl;
+//        kDebug() << "MN:" << *it;
     removeFromMainClients();
-//    kDebug() << "CLEANGROUPING2:" << this << endl;
+//    kDebug() << "CLEANGROUPING2:" << this;
 //    for( ClientList::ConstIterator it = group()->members().begin();
 //         it != group()->members().end();
 //         ++it )
-//        kDebug() << "CL2:" << *it << endl;
+//        kDebug() << "CL2:" << *it;
 //    mains = mainClients();
 //    for( ClientList::ConstIterator it = mains.begin();
 //         it != mains.end();
 //         ++it )
-//        kDebug() << "MN2:" << *it << endl;
+//        kDebug() << "MN2:" << *it;
     for( ClientList::ConstIterator it = transients_list.begin();
          it != transients_list.end();
          )
@@ -677,16 +677,16 @@ void Client::cleanGrouping()
         else
             ++it;
         }
-//    kDebug() << "CLEANGROUPING3:" << this << endl;
+//    kDebug() << "CLEANGROUPING3:" << this;
 //    for( ClientList::ConstIterator it = group()->members().begin();
 //         it != group()->members().end();
 //         ++it )
-//        kDebug() << "CL3:" << *it << endl;
+//        kDebug() << "CL3:" << *it;
 //    mains = mainClients();
 //    for( ClientList::ConstIterator it = mains.begin();
 //         it != mains.end();
 //         ++it )
-//        kDebug() << "MN3:" << *it << endl;
+//        kDebug() << "MN3:" << *it;
     // HACK
     // removeFromMainClients() did remove 'this' from transient
     // lists of all group members, but then made windows that
@@ -699,11 +699,11 @@ void Client::cleanGrouping()
          it != group_members.end();
          ++it )
         (*it)->removeTransient( this );
-//    kDebug() << "CLEANGROUPING4:" << this << endl;
+//    kDebug() << "CLEANGROUPING4:" << this;
 //    for( ClientList::ConstIterator it = group_members.begin();
 //         it != group_members.end();
 //         ++it )
-//        kDebug() << "CL4:" << *it << endl;
+//        kDebug() << "CL4:" << *it;
     }
 
 // Make sure that no group transient is considered transient
@@ -781,7 +781,7 @@ Window Client::verifyTransientFor( Window new_transient_for, bool defined )
             return None;
     if( new_transient_for == window()) // pointing to self
         { // also fix the property itself
-        kWarning( 1216 ) << "Client " << this << " has WM_TRANSIENT_FOR poiting to itself." << endl;
+        kWarning( 1216 ) << "Client " << this << " has WM_TRANSIENT_FOR poiting to itself." ;
         new_property_value = new_transient_for = rootWindow();
         }
 //  The transient_for window may be embedded in another application,
@@ -826,7 +826,7 @@ Window Client::verifyTransientFor( Window new_transient_for, bool defined )
         loop_pos = pos->transient_for_id;
         if( --count == 0 )
             {
-            kWarning( 1216 ) << "Client " << this << " caused WM_TRANSIENT_FOR loop." << endl;
+            kWarning( 1216 ) << "Client " << this << " caused WM_TRANSIENT_FOR loop." ;
             new_transient_for = rootWindow();
             }
         }
@@ -849,19 +849,19 @@ void Client::addTransient( Client* cl )
     transients_list.append( cl );
     if( workspace()->mostRecentlyActivatedClient() == this && cl->isModal())        
         check_active_modal = true;
-//    kDebug() << "ADDTRANS:" << this << ":" << cl << endl;
-//    kDebug() << kBacktrace() << endl;
+//    kDebug() << "ADDTRANS:" << this << ":" << cl;
+//    kDebug() << kBacktrace();
 //    for( ClientList::ConstIterator it = transients_list.begin();
 //         it != transients_list.end();
 //         ++it )
-//        kDebug() << "AT:" << (*it) << endl;
+//        kDebug() << "AT:" << (*it);
     }
 
 void Client::removeTransient( Client* cl )
     {
     TRANSIENCY_CHECK( this );
-//    kDebug() << "REMOVETRANS:" << this << ":" << cl << endl;
-//    kDebug() << kBacktrace() << endl;
+//    kDebug() << "REMOVETRANS:" << this << ":" << cl;
+//    kDebug() << kBacktrace();
     transients_list.removeAll( cl );
     // cl is transient for this, but this is going away
     // make cl group transient
diff --git a/kcmkwin/kwincompositing/main.cpp b/kcmkwin/kwincompositing/main.cpp
index d91ef2b2c8..c762041417 100644
--- a/kcmkwin/kwincompositing/main.cpp
+++ b/kcmkwin/kwincompositing/main.cpp
@@ -75,7 +75,7 @@ void KWinCompositingConfig::showAdvancedOptions()
 
 void KWinCompositingConfig::load()
 {
-    kDebug() << k_funcinfo << endl;
+    kDebug() << k_funcinfo;
     mKWinConfig->reparseConfiguration();
 
     KConfigGroup config(mKWinConfig, "Compositing");
@@ -98,7 +98,7 @@ void KWinCompositingConfig::load()
 
 void KWinCompositingConfig::save()
 {
-    kDebug() << k_funcinfo << endl;
+    kDebug() << k_funcinfo;
 
     KConfigGroup config(mKWinConfig, "Compositing");
     config.writeEntry("Enabled", ui.useCompositing->isChecked());
@@ -133,7 +133,7 @@ void KWinCompositingConfig::configChanged()
 
 void KWinCompositingConfig::defaults()
 {
-    kDebug() << k_funcinfo << endl;
+    kDebug() << k_funcinfo;
     ui.useCompositing->setChecked(false);
     ui.effectWinManagement->setChecked(true);
     ui.effectShadows->setChecked(true);
@@ -142,7 +142,7 @@ void KWinCompositingConfig::defaults()
 
 QString KWinCompositingConfig::quickHelp() const
 {
-    kDebug() << k_funcinfo << endl;
+    kDebug() << k_funcinfo;
     return i18n("<h1>Desktop Effects</h1>");
 }
 
diff --git a/kcmkwin/kwineffects/main.cpp b/kcmkwin/kwineffects/main.cpp
index fad4e8c5c1..3c7702e616 100644
--- a/kcmkwin/kwineffects/main.cpp
+++ b/kcmkwin/kwineffects/main.cpp
@@ -81,7 +81,7 @@ void KWinEffectsConfig::reparseConfiguration(const QByteArray&conf)
 
 void KWinEffectsConfig::load()
 {
-    kDebug() << k_funcinfo << endl;
+    kDebug() << k_funcinfo;
     mKWinConfig->reparseConfiguration();
 
     mPluginSelector->load();
@@ -92,7 +92,7 @@ void KWinEffectsConfig::load()
 
 void KWinEffectsConfig::save()
 {
-    kDebug() << k_funcinfo << endl;
+    kDebug() << k_funcinfo;
 
     mPluginSelector->save();
 
@@ -108,13 +108,13 @@ void KWinEffectsConfig::save()
 
 void KWinEffectsConfig::defaults()
 {
-    kDebug() << k_funcinfo << endl;
+    kDebug() << k_funcinfo;
     mPluginSelector->defaults();
 }
 
 QString KWinEffectsConfig::quickHelp() const
 {
-    kDebug() << k_funcinfo << endl;
+    kDebug() << k_funcinfo;
     return i18n("<h1>Window Effects</h1> Here you can configure which effects will be used.");
 }
 
diff --git a/layers.cpp b/layers.cpp
index 55fe9f3953..c26f9646db 100644
--- a/layers.cpp
+++ b/layers.cpp
@@ -109,13 +109,13 @@ void Workspace::updateStackingOrder( bool propagate_new_clients )
     force_restacking = false;
     stacking_order = new_stacking_order;
 #if 0
-    kDebug() << "stacking:" << changed << endl;
+    kDebug() << "stacking:" << changed;
     if( changed || propagate_new_clients )
         {
         for( ClientList::ConstIterator it = stacking_order.begin();
              it != stacking_order.end();
              ++it )
-            kDebug() << (void*)(*it) << *it << ":" << (*it)->layer() << endl;
+            kDebug() << (void*)(*it) << *it << ":" << (*it)->layer();
         }
 #endif
     if( changed || propagate_new_clients )
@@ -543,7 +543,7 @@ ClientList Workspace::constrainedStackingOrder()
     ClientList layer[ NumLayers ];
 
 #if 0
-    kDebug() << "stacking1:" << endl;
+    kDebug() << "stacking1:";
 #endif
     // build the order from layers
     QHash< Group*, Layer > minimum_layer;
@@ -570,11 +570,11 @@ ClientList Workspace::constrainedStackingOrder()
          ++lay )    
         stacking += layer[ lay ];
 #if 0
-    kDebug() << "stacking2:" << endl;
+    kDebug() << "stacking2:";
     for( ClientList::ConstIterator it = stacking.begin();
          it != stacking.end();
          ++it )
-        kDebug() << (void*)(*it) << *it << ":" << (*it)->layer() << endl;
+        kDebug() << (void*)(*it) << *it << ":" << (*it)->layer();
 #endif
     // now keep transients above their mainwindows
     // TODO this could(?) use some optimization
@@ -623,7 +623,7 @@ ClientList Workspace::constrainedStackingOrder()
                     break;
                 }
             }
-//        kDebug() << "STACK:" << stacking[ i ] << ":" << ( i2 == -1 ? ((Client*)0) : stacking[ i2 ] ) << endl;
+//        kDebug() << "STACK:" << stacking[ i ] << ":" << ( i2 == -1 ? ((Client*)0) : stacking[ i2 ] );
         if( i2 == -1 )
             {
             --i;
@@ -638,12 +638,12 @@ ClientList Workspace::constrainedStackingOrder()
         stacking.insert( i2, current );
         }
 #if 0
-    kDebug() << "stacking3:" << endl;
+    kDebug() << "stacking3:";
     for( ClientList::ConstIterator it = stacking.begin();
          it != stacking.end();
          ++it )
-        kDebug() << (void*)(*it) << *it << ":" << (*it)->layer() << endl;
-    kDebug() << "\n\n" << endl;
+        kDebug() << (void*)(*it) << *it << ":" << (*it)->layer();
+    kDebug() << "\n\n";
 #endif
     return stacking;
     }
diff --git a/lib/kdecoration_plugins_p.cpp b/lib/kdecoration_plugins_p.cpp
index f9e18efc67..28554ead53 100644
--- a/lib/kdecoration_plugins_p.cpp
+++ b/lib/kdecoration_plugins_p.cpp
@@ -113,7 +113,7 @@ bool KDecorationPlugins::loadPlugin( QString nameStr )
     KDecorationFactory* oldFactory = fact;
 
     QString path = KLibLoader::findLibrary(nameStr);
-	kDebug() << "kwin : path " << path << " for " << nameStr << endl;
+	kDebug() << "kwin : path " << path << " for " << nameStr;
 
     // If the plugin was not found, try to find the default
     if (path.isEmpty())
@@ -139,7 +139,7 @@ bool KDecorationPlugins::loadPlugin( QString nameStr )
     // If that fails, fall back to the default plugin
     if (!library)
         {
-	kDebug() << " could not load library, try default plugin again" << endl;
+	kDebug() << " could not load library, try default plugin again";
         nameStr = defaultPlugin;
 	if ( pluginStr == nameStr )
 	    return true;
diff --git a/lib/kwineffects.cpp b/lib/kwineffects.cpp
index de6075bf6a..7ba07c392a 100644
--- a/lib/kwineffects.cpp
+++ b/lib/kwineffects.cpp
@@ -323,7 +323,7 @@ WindowQuad WindowQuad::makeSubQuad( float x1, float y1, float x2, float y2 ) con
     assert( x1 < x2 && y1 < y2 && x1 >= left() && x2 <= right() && y1 >= top() && y2 <= bottom());
 #ifndef NDEBUG
     if( isTransformed())
-        kFatal( 1212 ) << "Splitting quads is allowed only in pre-paint calls!" << endl;
+        kFatal( 1212 ) << "Splitting quads is allowed only in pre-paint calls!" ;
 #endif
     WindowQuad ret( *this );
     // vertices are clockwise starting from topleft
@@ -383,7 +383,7 @@ WindowQuadList WindowQuadList::splitAtX( float x ) const
         {
 #ifndef NDEBUG
         if( quad.isTransformed())
-            kFatal( 1212 ) << "Splitting quads is allowed only in pre-paint calls!" << endl;
+            kFatal( 1212 ) << "Splitting quads is allowed only in pre-paint calls!" ;
 #endif
         bool wholeleft = true;
         bool wholeright = true;
@@ -414,7 +414,7 @@ WindowQuadList WindowQuadList::splitAtY( float y ) const
         {
 #ifndef NDEBUG
         if( quad.isTransformed())
-            kFatal( 1212 ) << "Splitting quads is allowed only in pre-paint calls!" << endl;
+            kFatal( 1212 ) << "Splitting quads is allowed only in pre-paint calls!" ;
 #endif
         bool wholetop = true;
         bool wholebottom = true;
@@ -451,7 +451,7 @@ WindowQuadList WindowQuadList::makeGrid( int maxquadsize ) const
         {
 #ifndef NDEBUG
         if( quad.isTransformed())
-            kFatal( 1212 ) << "Splitting quads is allowed only in pre-paint calls!" << endl;
+            kFatal( 1212 ) << "Splitting quads is allowed only in pre-paint calls!" ;
 #endif
         left = qMin( left, quad.left());
         right = qMax( right, quad.right());
diff --git a/lib/kwinglutils.cpp b/lib/kwinglutils.cpp
index c3c4de3265..2d7346b184 100644
--- a/lib/kwinglutils.cpp
+++ b/lib/kwinglutils.cpp
@@ -93,7 +93,7 @@ void checkGLError( const char* txt )
     {
     GLenum err = glGetError();
     if( err != GL_NO_ERROR )
-        kWarning() << "GL error (" << txt << "): 0x" << QString::number( err, 16 ) << endl;
+        kWarning() << "GL error (" << txt << "): 0x" << QString::number( err, 16 ) ;
     }
 
 int nearestPowerOfTwo( int x )
@@ -699,7 +699,7 @@ bool GLShader::load(const QString& vertexsource, const QString& fragmentsource)
     if(( !vertexsource.isEmpty() && !vertexShaderSupported() ) ||
           ( !fragmentsource.isEmpty() && !fragmentShaderSupported() ))
         {
-        kDebug(1212) << k_funcinfo << "Shaders not supported" << endl;
+        kDebug(1212) << k_funcinfo << "Shaders not supported";
         return false;
         }
 
@@ -735,7 +735,7 @@ bool GLShader::load(const QString& vertexsource, const QString& fragmentsource)
             return false;
             }
         else if(logsize > 0)
-            kDebug(1212) << "Vertex shader compilation log:" << endl << log << endl;
+            kDebug(1212) << "Vertex shader compilation log:"<< log;
         // Attach the shader to the program
         glAttachShader(mProgram, vertexshader);
         // Delete shader
@@ -768,7 +768,7 @@ bool GLShader::load(const QString& vertexsource, const QString& fragmentsource)
             return false;
             }
         else if(logsize > 0)
-            kDebug(1212) << "Fragment shader compilation log:" << endl << log << endl;
+            kDebug(1212) << "Fragment shader compilation log:"<< log;
         // Attach the shader to the program
         glAttachShader(mProgram, fragmentshader);
         // Delete shader
@@ -793,7 +793,7 @@ bool GLShader::load(const QString& vertexsource, const QString& fragmentsource)
         return false;
         }
     else if(logsize > 0)
-        kDebug(1212) << "Shader linking log:" << endl << log << endl;
+        kDebug(1212) << "Shader linking log:"<< log;
     delete[] log;
 
     mVariableLocations = new QHash<QString, int>;
diff --git a/lib/kwinshadereffect.cpp b/lib/kwinshadereffect.cpp
index 26f947952e..df269ae217 100644
--- a/lib/kwinshadereffect.cpp
+++ b/lib/kwinshadereffect.cpp
@@ -52,7 +52,7 @@ bool ShaderEffect::loadData(const QString& shadername)
     int texh = displayHeight();
     if( !GLTexture::NPOTTextureSupported() )
     {
-        kWarning( 1212 ) << k_funcinfo << "NPOT textures not supported, wasting some memory" << endl;
+        kWarning( 1212 ) << k_funcinfo << "NPOT textures not supported, wasting some memory" ;
         texw = nearestPowerOfTwo(texw);
         texh = nearestPowerOfTwo(texh);
     }
diff --git a/rules.cpp b/rules.cpp
index dad0d30790..7c16c4e67e 100644
--- a/rules.cpp
+++ b/rules.cpp
@@ -880,7 +880,7 @@ WindowRules Workspace::findWindowRules( const Client* c, bool ignore_temporary )
         if( (*it)->match( c ))
             {
             Rules* rule = *it;
-            kDebug( 1212 ) << "Rule found:" << rule << ":" << c << endl;
+            kDebug( 1212 ) << "Rule found:" << rule << ":" << c;
             if( rule->isTemporary())
                 it = rules.erase( it );
             else
diff --git a/scene.cpp b/scene.cpp
index 2fe0432c31..d061a8ce2b 100644
--- a/scene.cpp
+++ b/scene.cpp
@@ -181,7 +181,7 @@ void Scene::paintGenericScreen( int orig_mask, ScreenPaintData )
 #ifndef NDEBUG
         foreach( WindowQuad q, data.quads )
             if( q.isTransformed())
-                kFatal( 1212 ) << "Pre-paint calls are not allowed to transform quads!" << endl;
+                kFatal( 1212 ) << "Pre-paint calls are not allowed to transform quads!" ;
 #endif
         if( !w->isPaintingEnabled())
             continue;
@@ -222,7 +222,7 @@ void Scene::paintSimpleScreen( int orig_mask, QRegion region )
 #ifndef NDEBUG
         foreach( WindowQuad q, data.quads )
             if( q.isTransformed())
-                kFatal( 1212 ) << "Pre-paint calls are not allowed to transform quads!" << endl;
+                kFatal( 1212 ) << "Pre-paint calls are not allowed to transform quads!" ;
 #endif
         if( !w->isPaintingEnabled())
             continue;
diff --git a/scene_opengl.cpp b/scene_opengl.cpp
index 5b432c50f8..2e8b0dc721 100644
--- a/scene_opengl.cpp
+++ b/scene_opengl.cpp
@@ -101,14 +101,14 @@ SceneOpenGL::SceneOpenGL( Workspace* ws )
     {
     if( !Extensions::glxAvailable())
         {
-        kDebug( 1212 ) << "No glx extensions available" << endl;
+        kDebug( 1212 ) << "No glx extensions available";
         return; // error
         }
     initGLX();
     // check for FBConfig support
     if( !hasGLXVersion( 1, 3 ) && !hasGLExtension( "GLX_SGIX_fbconfig" ))
         {
-        kDebug( 1212 ) << "GLX1.3 or GLX_SGIX_fbconfig missing" << endl;
+        kDebug( 1212 ) << "GLX1.3 or GLX_SGIX_fbconfig missing";
         return; // error
         }
     if( !selectMode())
@@ -128,14 +128,14 @@ SceneOpenGL::SceneOpenGL( Workspace* ws )
     int vis_buffer, vis_drawable;
     glXGetFBConfigAttrib( display(), fbcbuffer, GLX_VISUAL_ID, &vis_buffer );
     XVisualInfo* visinfo_buffer = glXGetVisualFromFBConfig( display(), fbcbuffer );
-    kDebug( 1212 ) << "Buffer visual (depth " << visinfo_buffer->depth << "): 0x" << QString::number( vis_buffer, 16 ) << endl;
+    kDebug( 1212 ) << "Buffer visual (depth " << visinfo_buffer->depth << "): 0x" << QString::number( vis_buffer, 16 );
     XFree( visinfo_buffer );
     for( int i = 0; i <= 32; i++ )
         {
         if( fbcdrawableinfo[ i ].fbconfig == NULL )
             continue;
         glXGetFBConfigAttrib( display(), fbcdrawableinfo[ i ].fbconfig, GLX_VISUAL_ID, &vis_drawable );
-        kDebug( 1212 ) << "Drawable visual (depth " << i << "): 0x" << QString::number( vis_drawable, 16 ) << endl;
+        kDebug( 1212 ) << "Drawable visual (depth " << i << "): 0x" << QString::number( vis_drawable, 16 );
         }
 
     // OpenGL scene setup
@@ -288,7 +288,7 @@ bool SceneOpenGL::initRenderingContext()
         { // failed
         if( !direct_rendering )
             {
-            kDebug( 1212 ) << "Couldn't initialize rendering context" << endl;
+            kDebug( 1212 ) << "Couldn't initialize rendering context";
             return false;
             }
         glXDestroyContext( display(), ctxbuffer );
@@ -296,7 +296,7 @@ bool SceneOpenGL::initRenderingContext()
         ctxbuffer = glXCreateNewContext( display(), fbcbuffer, GLX_RGBA_TYPE, NULL, GL_FALSE );
         if( ctxbuffer == NULL || !glXMakeContextCurrent( display(), glxbuffer, glxbuffer, ctxbuffer ))
             {
-            kDebug( 1212 ) << "Couldn't initialize rendering context" << endl;
+            kDebug( 1212 ) << "Couldn't initialize rendering context";
             return false;
             }
         }
@@ -344,7 +344,7 @@ bool SceneOpenGL::initBuffer()
         }
     else
         {
-        kDebug( 1212 ) << "Couldn't create output buffer (failed to create overlay window?) !" << endl;
+        kDebug( 1212 ) << "Couldn't create output buffer (failed to create overlay window?) !";
         return false; // error
         }
     return true;
@@ -426,7 +426,7 @@ bool SceneOpenGL::initBufferConfigs()
         XFree( fbconfigs );
     if( fbcbuffer_db == NULL && fbcbuffer_nondb == NULL )
         {
-        kDebug( 1212 ) << "Couldn't find framebuffer configuration for buffer!" << endl;
+        kDebug( 1212 ) << "Couldn't find framebuffer configuration for buffer!";
         return false;
         }
     return true;
@@ -539,7 +539,7 @@ bool SceneOpenGL::initDrawableConfigs()
         XFree( fbconfigs );
     if( fbcdrawableinfo[ DefaultDepth( display(), DefaultScreen( display())) ].fbconfig == NULL )
         {
-        kDebug( 1212 ) << "Couldn't find framebuffer configuration for default depth!" << endl;
+        kDebug( 1212 ) << "Couldn't find framebuffer configuration for default depth!";
         return false;
         }
     return true;
@@ -1052,7 +1052,7 @@ bool SceneOpenGL::Window::bindTexture()
     if( success )
         toplevel->resetDamage( toplevel->rect());
     else
-        kDebug( 1212 ) << "Failed to bind window" << endl;
+        kDebug( 1212 ) << "Failed to bind window";
     return success;
     }
 
diff --git a/scene_xrender.cpp b/scene_xrender.cpp
index eec2a0a506..cf99e2a9c8 100644
--- a/scene_xrender.cpp
+++ b/scene_xrender.cpp
@@ -82,12 +82,12 @@ SceneXrender::SceneXrender( Workspace* ws )
     {
     if( !Extensions::renderAvailable())
         {
-        kDebug( 1212 ) << "No xrender extension available" << endl;
+        kDebug( 1212 ) << "No xrender extension available";
         return;
         }
     if( !Extensions::fixesRegionAvailable())
         {
-        kDebug( 1212 ) << "No xfixes v3+ extension available" << endl;
+        kDebug( 1212 ) << "No xfixes v3+ extension available";
         return;
         }
     KXErrorHandler xerr;
@@ -217,7 +217,7 @@ void SceneXrender::paintTransformedScreen( int orig_mask )
 #ifndef NDEBUG
         foreach( WindowQuad q, data.quads )
             if( q.isTransformed())
-                kFatal( 1212 ) << "Pre-paint calls are not allowed to transform quads!" << endl;
+                kFatal( 1212 ) << "Pre-paint calls are not allowed to transform quads!" ;
 #endif
         if( !w->isPaintingEnabled())
             continue;
diff --git a/sm.cpp b/sm.cpp
index 57a578c2f0..6d41521df7 100644
--- a/sm.cpp
+++ b/sm.cpp
@@ -269,7 +269,7 @@ const char* Workspace::windowTypeToTxt( NET::WindowType type )
         return window_type_names[ type + 1 ]; // +1 (unknown==-1)
     if( type == -2 ) // undefined (not really part of NET::WindowType)
         return "Undefined";
-    kFatal() << "Unknown Window Type" << endl;
+    kFatal() << "Unknown Window Type" ;
     return NULL;
     }
 
diff --git a/tabbox.cpp b/tabbox.cpp
index 22a79e9213..84623f79ec 100644
--- a/tabbox.cpp
+++ b/tabbox.cpp
@@ -623,7 +623,7 @@ void TabBox::hide()
     if( effects )
         static_cast<EffectsHandlerImpl*>(effects)->tabBoxClosed();
     if( isDisplayed())
-        kDebug( 1212 ) << "Tab box was not properly closed by an effect" << endl;
+        kDebug( 1212 ) << "Tab box was not properly closed by an effect";
     QWidget::hide();
     QApplication::syncX();
     XEvent otherEvent;
@@ -748,7 +748,7 @@ bool areKeySymXsDepressed( bool bAll, const uint keySyms[], int nKeySyms )
     {
     char keymap[32];
 
-    kDebug(125) << "areKeySymXsDepressed: " << (bAll ? "all of " : "any of ") << nKeySyms << endl;
+    kDebug(125) << "areKeySymXsDepressed: " << (bAll ? "all of " : "any of ") << nKeySyms;
 
     XQueryKeymap( display(), keymap );
 
diff --git a/tools/decobenchmark/main.cpp b/tools/decobenchmark/main.cpp
index 7a22750493..26b1ed666f 100644
--- a/tools/decobenchmark/main.cpp
+++ b/tools/decobenchmark/main.cpp
@@ -48,12 +48,12 @@ DecoBenchApplication::DecoBenchApplication(const QString &library, Tests tests,
 	preview = new KDecorationPreview( plugins, 0 );
 
 	if (plugins->loadPlugin(library) )
-		kDebug() << "Decoration library " << library << " loaded..." << endl;
+		kDebug() << "Decoration library " << library << " loaded...";
 	else
 		kError() << "Error loading decoration library " << library << "!" << endl;
 
 	if (preview->recreateDecoration() )
-		kDebug() << "Decoration created..." << endl;
+		kDebug() << "Decoration created...";
 	else
 		kError() << "Error creating decoration!" << endl;
 
@@ -85,7 +85,7 @@ void DecoBenchApplication::executeTest()
 	ftime(&aend);
 
 	long long time_diff = (aend.time - astart.time)*1000+aend.millitm - astart.millitm;
-	kDebug() << "Total:" << (float(time_diff)/1000) << endl;
+	kDebug() << "Total:" << (float(time_diff)/1000);
 	quit();
 }
 
diff --git a/tools/decobenchmark/preview.cpp b/tools/decobenchmark/preview.cpp
index 2098b7bed2..da70fed19a 100644
--- a/tools/decobenchmark/preview.cpp
+++ b/tools/decobenchmark/preview.cpp
@@ -65,7 +65,7 @@ KDecorationPreview::~KDecorationPreview()
 
 void KDecorationPreview::performRepaintTest(int n)
 {
-    kDebug() << "start " << n << " repaints..." << endl;
+    kDebug() << "start " << n << " repaints...";
     bridge->setCaption("Deco Benchmark");
     deco->captionChange();
     positionPreviews(0);
@@ -77,7 +77,7 @@ void KDecorationPreview::performRepaintTest(int n)
 
 void KDecorationPreview::performCaptionTest(int n)
 {
-    kDebug() << "start " << n << " caption changes..." << endl;
+    kDebug() << "start " << n << " caption changes...";
     QString caption = "Deco Benchmark %1";
     positionPreviews(0);
     for (int i = 0; i < n; ++i) {
@@ -90,7 +90,7 @@ void KDecorationPreview::performCaptionTest(int n)
 
 void KDecorationPreview::performResizeTest(int n)
 {
-    kDebug() << "start " << n << " resizes..." << endl;
+    kDebug() << "start " << n << " resizes...";
     bridge->setCaption("Deco Benchmark");
     deco->captionChange();
     for (int i = 0; i < n; ++i) {
@@ -101,7 +101,7 @@ void KDecorationPreview::performResizeTest(int n)
 
 void KDecorationPreview::performRecreationTest(int n)
 {
-    kDebug() << "start " << n << " resizes..." << endl;
+    kDebug() << "start " << n << " resizes...";
     bridge->setCaption("Deco Benchmark");
     deco->captionChange();
     positionPreviews(0);
diff --git a/workspace.cpp b/workspace.cpp
index 445b0248ee..edc46acaa0 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -802,7 +802,7 @@ void Workspace::updateCurrentTopMenu()
             }
         }
 
-//    kDebug() << "CURRENT TOPMENU:" << menubar << ":" << active_client << endl;
+//    kDebug() << "CURRENT TOPMENU:" << menubar << ":" << active_client;
     if ( menubar )
         {
         if( active_client && !menubar->isOnDesktop( active_client->desktop()))
@@ -958,7 +958,7 @@ void Workspace::reconfigure()
 
 void Workspace::slotSettingsChanged(int category)
     {
-    kDebug(1212) << "Workspace::slotSettingsChanged()" << endl;
+    kDebug(1212) << "Workspace::slotSettingsChanged()";
     if( category == KGlobalSettings::SETTINGS_SHORTCUTS )
         readShortcuts();
     }
@@ -970,7 +970,7 @@ KWIN_PROCEDURE( CheckBorderSizesProcedure, Client, cl->checkBorderSizes() );
 
 void Workspace::slotReconfigure()
     {
-    kDebug(1212) << "Workspace::slotReconfigure()" << endl;
+    kDebug(1212) << "Workspace::slotReconfigure()";
     reconfigureTimer.stop();
 
     if( options->electricBorders() == Options::ElectricAlways )
@@ -2310,13 +2310,13 @@ void Workspace::addTopMenu( Client* c )
         updateTopMenuGeometry( c );
         updateCurrentTopMenu();
         }
-//        kDebug() << "NEW TOPMENU:" << c << endl;
+//        kDebug() << "NEW TOPMENU:" << c;
     }
 
 void Workspace::removeTopMenu( Client* c )
     {
 //    if( c->isTopMenu())
-//        kDebug() << "REMOVE TOPMENU:" << c << endl;
+//        kDebug() << "REMOVE TOPMENU:" << c;
     assert( c->isTopMenu());
     assert( topmenus.contains( c ));
     topmenus.removeAll( c );
@@ -2326,7 +2326,7 @@ void Workspace::removeTopMenu( Client* c )
 
 void Workspace::lostTopMenuSelection()
     {
-//    kDebug() << "lost TopMenu selection" << endl;
+//    kDebug() << "lost TopMenu selection";
     // make sure this signal is always set when not owning the selection
     disconnect( topmenu_watcher, SIGNAL( lostOwner()), this, SLOT( lostTopMenuOwner()));
     connect( topmenu_watcher, SIGNAL( lostOwner()), this, SLOT( lostTopMenuOwner()));
@@ -2348,13 +2348,13 @@ void Workspace::lostTopMenuOwner()
     {
     if( !options->topMenuEnabled())
         return;
-//    kDebug() << "TopMenu selection lost owner" << endl;
+//    kDebug() << "TopMenu selection lost owner";
     if( !topmenu_selection->claim( false ))
         {
-//        kDebug() << "Failed to claim TopMenu selection" << endl;
+//        kDebug() << "Failed to claim TopMenu selection";
         return;
         }
-//    kDebug() << "claimed TopMenu selection" << endl;
+//    kDebug() << "claimed TopMenu selection";
     setupTopMenuHandling();
     }