diff --git a/src/BlockArray.cpp b/src/BlockArray.cpp
index 82b69326a..9873826b8 100644
--- a/src/BlockArray.cpp
+++ b/src/BlockArray.cpp
@@ -154,7 +154,7 @@ bool BlockArray::setSize(size_t newsize)
 
 bool BlockArray::setHistorySize(size_t newsize)
 {
-//    kDebug(1211) << "setHistorySize " << size << " " << newsize << endl;
+//    kDebug(1211) << "setHistorySize " << size << " " << newsize;
 
     if (size == newsize)
         return false;
diff --git a/src/History.cpp b/src/History.cpp
index 2050f34eb..70649833e 100644
--- a/src/History.cpp
+++ b/src/History.cpp
@@ -115,7 +115,7 @@ void HistoryFile::map()
     {
             readWriteBalance = 0; 
             fileMap = 0;
-            kDebug() << __FUNCTION__ << ": mmap'ing history failed.  errno = " << errno << endl;
+            kDebug() << __FUNCTION__ << ": mmap'ing history failed.  errno = " << errno;
     }
 }
 
diff --git a/src/Screen.cpp b/src/Screen.cpp
index 8a4d336e4..604926c19 100644
--- a/src/Screen.cpp
+++ b/src/Screen.cpp
@@ -189,7 +189,7 @@ void Screen::setMargins(int top, int bot)
   top = top - 1;              // Adjust to internal lineno
   bot = bot - 1;              // Adjust to internal lineno
   if ( !( 0 <= top && top < bot && bot < lines ) )
-  { kDebug()<<" setRegion("<<top<<","<<bot<<") : bad range."<<endl;
+  { kDebug()<<" setRegion("<<top<<","<<bot<<") : bad range.";
     return;                   // Default error action: ignore
   }
   tmargin = top;
@@ -1283,7 +1283,7 @@ void Screen::getSelectionEnd(int& column , int& line)
 }
 void Screen::setSelectionStart(/*const ScreenCursor& viewCursor ,*/ const int x, const int y, const bool mode)
 {
-//  kDebug(1211) << "setSelBeginXY(" << x << "," << y << ")" << endl;
+//  kDebug(1211) << "setSelBeginXY(" << x << "," << y << ")";
   sel_begin = loc(x,y); //+histCursor) ;
 
   /* FIXME, HACK to correct for x too far to the right... */
@@ -1296,7 +1296,7 @@ void Screen::setSelectionStart(/*const ScreenCursor& viewCursor ,*/ const int x,
 
 void Screen::setSelectionEnd( const int x, const int y)
 {
-//  kDebug(1211) << "setSelExtentXY(" << x << "," << y << ")" << endl;
+//  kDebug(1211) << "setSelExtentXY(" << x << "," << y << ")";
   if (sel_begin == -1) return;
   int l =  loc(x,y); // + histCursor);
 
diff --git a/src/Session.cpp b/src/Session.cpp
index 110ef69a9..545674802 100644
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -247,9 +247,9 @@ void Session::run()
 {
   //check that everything is in place to run the session
   if (_program.isEmpty())
-      kDebug() << "Session::run() - program to run not set." << endl;
+      kDebug() << "Session::run() - program to run not set.";
   if (_arguments.isEmpty())
-      kDebug() << "Session::run() - no command line arguments specified." << endl;
+      kDebug() << "Session::run() - no command line arguments specified.";
   
   // Upon a KPty error, there is no description on what that error was...
   // Check to see if the given program is executable.
@@ -328,7 +328,7 @@ void Session::setUserTitle( int what, const QString &caption )
 	
     if (what == 11) {
       QString colorString = caption.section(';',0,0);
-      kDebug() << __FILE__ << __LINE__ << ": setting background colour to " << colorString << endl;
+      kDebug() << __FILE__ << __LINE__ << ": setting background colour to " << colorString;
       QColor backColor = QColor(colorString);
       if (backColor.isValid()){// change color via \033]11;Color\007
 	if (backColor != _modifiedBackground) 
@@ -627,7 +627,7 @@ void Session::setIconName(const QString& iconName)
 void Session::setIconText(const QString& iconText)
 {
   _iconText = iconText;
-  //kDebug(1211)<<"Session setIconText " <<  _iconText <<endl;
+  //kDebug(1211)<<"Session setIconText " <<  _iconText;
 }
 
 QString Session::iconName() const
diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
index 5f6223d91..7810fe40c 100644
--- a/src/TerminalDisplay.cpp
+++ b/src/TerminalDisplay.cpp
@@ -2448,7 +2448,7 @@ void TerminalDisplay::bell(const QString& message)
     _allowBell = false;
     QTimer::singleShot(500,this,SLOT(enableBell()));
  
-    kDebug(1211) << __FUNCTION__ << endl;
+    kDebug(1211) << __FUNCTION__;
 
     if (_bellMode==BELL_SYSTEM) 
     {
diff --git a/src/ViewContainer.cpp b/src/ViewContainer.cpp
index 8131a4c29..6af807c92 100644
--- a/src/ViewContainer.cpp
+++ b/src/ViewContainer.cpp
@@ -361,7 +361,7 @@ void TabbedViewContainer::removeViewWidget( QWidget* view )
 
 void TabbedViewContainer::updateIcon(ViewProperties* item)
 {
-    kDebug() << __FUNCTION__ << ": icon changed." << endl;
+    kDebug() << __FUNCTION__ << ": icon changed.";
 
     QList<QWidget*> items = widgetsForItem(item);
     QListIterator<QWidget*> itemIter(items);
@@ -374,7 +374,7 @@ void TabbedViewContainer::updateIcon(ViewProperties* item)
 }
 void TabbedViewContainer::updateTitle(ViewProperties* item) 
 {
-    kDebug() << __FUNCTION__ << ": title changed." << endl;
+    kDebug() << __FUNCTION__ << ": title changed.";
 
     QList<QWidget*> items = widgetsForItem(item);
     QListIterator<QWidget*> itemIter(items);
diff --git a/src/Vt102Emulation.cpp b/src/Vt102Emulation.cpp
index 8bf4fddbd..06dea2ad7 100644
--- a/src/Vt102Emulation.cpp
+++ b/src/Vt102Emulation.cpp
@@ -106,21 +106,21 @@ void Vt102Emulation::clearEntireScreen()
 
 void Vt102Emulation::reset()
 {
-  //kDebug(1211)<<"Vt102Emulation::reset() resetToken()"<<endl;
+  //kDebug(1211)<<"Vt102Emulation::reset() resetToken()";
   resetToken();
-  //kDebug(1211)<<"Vt102Emulation::reset() resetModes()"<<endl;
+  //kDebug(1211)<<"Vt102Emulation::reset() resetModes()";
   resetModes();
-  //kDebug(1211)<<"Vt102Emulation::reset() resetCharSet()"<<endl;
+  //kDebug(1211)<<"Vt102Emulation::reset() resetCharSet()";
   resetCharset(0);
-  //kDebug(1211)<<"Vt102Emulation::reset() reset screen0()"<<endl;
+  //kDebug(1211)<<"Vt102Emulation::reset() reset screen0()";
   _screen[0]->reset();
-  //kDebug(1211)<<"Vt102Emulation::reset() resetCharSet()"<<endl;
+  //kDebug(1211)<<"Vt102Emulation::reset() resetCharSet()";
   resetCharset(1);
-  //kDebug(1211)<<"Vt102Emulation::reset() reset _screen 1"<<endl;
+  //kDebug(1211)<<"Vt102Emulation::reset() reset _screen 1";
   _screen[1]->reset();
-  //kDebug(1211)<<"Vt102Emulation::reset() setCodec()"<<endl;
+  //kDebug(1211)<<"Vt102Emulation::reset() setCodec()";
   setCodec(LocaleCodec);
-  //kDebug(1211)<<"Vt102Emulation::reset() done"<<endl;
+  //kDebug(1211)<<"Vt102Emulation::reset() done";
  
   bufferedUpdate();
 }