diff --git a/actionscheduler.h b/actionscheduler.h
index faf598a80..08f09aec4 100644
--- a/actionscheduler.h
+++ b/actionscheduler.h
@@ -32,14 +32,15 @@
 #ifndef actionscheduler_h
 #define actionscheduler_h
 
-#include "qobject.h"
-#include "qguardedptr.h"
-#include "qtimer.h"
 #include "kmfilteraction.h" // for KMFilterAction::ReturnCode
 #include "kmfilter.h"
 #include "kmfiltermgr.h" // KMFilterMgr::FilterSet
 #include "kmcommands.h"
 
+#include <qobject.h>
+#include <qguardedptr.h>
+#include <qtimer.h>
+
 class KMHeaders;
 
 /* A class for asynchronous filtering of messages */
diff --git a/kmheaders.h b/kmheaders.h
index 1efd6bd7d..9309e86bb 100644
--- a/kmheaders.h
+++ b/kmheaders.h
@@ -3,18 +3,20 @@
 #ifndef __KMHEADERS
 #define __KMHEADERS
 
-#include <qwidget.h>
-#include <qstrlist.h>
+#include "kmmessage.h"
+#include "kmime_util.h"
+#include "kmcommands.h"
+
 #include <klistview.h>
 #include <kfoldertree.h>
+#include <kpopupmenu.h>
+
+#include <qwidget.h>
+#include <qstrlist.h>
 #include <qmemarray.h>
 #include <qmap.h>
 #include <qdragobject.h>
 #include <qdict.h>
-#include "kmmessage.h"
-#include "kmime_util.h"
-#include <kpopupmenu.h>
-#include "kmcommands.h"
 
 class KMFolder;
 class KMMessage;