diff --git a/src/editor/kmcomposerwin.h b/src/editor/kmcomposerwin.h
index 5b76bedbf4c09749788441372253b908796a1ed5..8e3d59aa0014d020e771d6cf75572f3d098d10ea 100644
--- a/src/editor/kmcomposerwin.h
+++ b/src/editor/kmcomposerwin.h
@@ -22,18 +22,16 @@
 #include <QList>
 #include <QVector>
 
-// LIBKDEPIM includes
 #include <MessageComposer/RichTextComposerNg>
+#include <MessageComposer/ComposerViewBase>
 
 #include <MessageComposer/MessageSender>
 
-// KDEPIMLIBS includes
 #include <kmime/kmime_message.h>
 #include <kmime/kmime_headers.h>
 
 // Other includes
 #include <Libkleo/Enum>
-#include <MessageComposer/ComposerViewBase>
 
 class QUrl;
 
diff --git a/src/kmkernel.cpp b/src/kmkernel.cpp
index bf4e4ab1d7f3a637c605d303df41951d86a67157..94b884208f0f93d74a9bbc530b4b007434dffde9 100644
--- a/src/kmkernel.cpp
+++ b/src/kmkernel.cpp
@@ -36,7 +36,6 @@ using PimCommon::RecentAddresses;
 // kdepim includes
 #include "kmail-version.h"
 
-// kdepimlibs includes
 #include <KIdentityManagement/kidentitymanagement/identity.h>
 #include <KIdentityManagement/kidentitymanagement/identitymanager.h>
 #include <MailTransport/Transport>
diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp
index a1c7218c8b3e3f6b6fe3d2da10541c36e79af46e..566b09ae72c32914619dc44f8163792cd6a5246b 100644
--- a/src/kmmainwidget.cpp
+++ b/src/kmmainwidget.cpp
@@ -95,7 +95,6 @@
 #include <Libkdepim/ProgressManager>
 #include <PimCommon/BroadcastStatus>
 
-// KDEPIMLIBS includes
 #include <AkonadiCore/AgentManager>
 #include <AkonadiCore/AttributeFactory>
 #include <AkonadiCore/itemfetchjob.h>