diff --git a/kmkernel.cpp b/kmkernel.cpp
index 2c84d69db..2fc2a160b 100644
--- a/kmkernel.cpp
+++ b/kmkernel.cpp
@@ -1171,7 +1171,7 @@ void KMKernel::init()
 
   readConfig();
 
-  the_undoStack     = new UndoStack(20);
+  the_undoStack = new UndoStack(20);
 
   the_msgSender = new MessageComposer::AkonadiSender;
   readConfig();
diff --git a/kmkernel.h b/kmkernel.h
index 41ce52865..57094dfe1 100644
--- a/kmkernel.h
+++ b/kmkernel.h
@@ -350,7 +350,7 @@ public:
   const KComponentData &xmlGuiInstance() { return mXmlGuiInstance; }
   void setXmlGuiInstance( const KComponentData &instance ) { mXmlGuiInstance = instance; }
 
-  UndoStack *undoStack() { return the_undoStack; }
+  UndoStack *undoStack() const { return the_undoStack; }
   MessageComposer::MessageSender *msgSender();
 
   /*reimp*/ void openFilterDialog(bool createDummyFilter = true);
@@ -386,7 +386,7 @@ public:
    */
   bool haveSystemTrayApplet() const;
 
-  QTextCodec *networkCodec() { return netCodec; }
+  QTextCodec *networkCodec() const { return netCodec; }
 
   /** returns a reference to the first Mainwin or a temporary Mainwin */
   KMainWindow* mainWin();
diff --git a/kmreadermainwin.h b/kmreadermainwin.h
index c952673d1..5bd1189bd 100644
--- a/kmreadermainwin.h
+++ b/kmreadermainwin.h
@@ -17,7 +17,6 @@ class KAction;
 class KFontAction;
 class KFontSizeAction;
 class KJob;
-template <typename T, typename S> class QMap;
 
 namespace KMail {
 class MessageActions;
@@ -91,7 +90,6 @@ private:
   KFontSizeAction *mFontSizeAction;
   KMail::MessageActions *mMsgActions;
   Akonadi::Collection mParentCollection;
-
 };
 
 #endif /*KMReaderMainWin_h*/