diff --git a/include/main.h b/include/main.h
index 65c664c9..acb7f1c2 100644
--- a/include/main.h
+++ b/include/main.h
@@ -16,10 +16,11 @@
 #ifndef MAIN_H
 #define MAIN_H
 
-#include <kwmmapp.h>
+
 #include <ktmainwindow.h>
 //#include <ktopwidget.h>
 #include <ksimpleconfig.h>
+#include <kwmmapp.h>
 #include <qstrlist.h>
 
 #include "TEShell.h"
diff --git a/src/main.C b/src/main.C
index bb2534e9..2c7fe234 100644
--- a/src/main.C
+++ b/src/main.C
@@ -44,9 +44,8 @@
 /* TODO
 - don't reread the pixmap every time
 */
-#ifdef HAVE_CONFIG_H
+
 #include"config.h"
-#endif
 
 #include <qdir.h>
 #include <qevent.h>
@@ -57,12 +56,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "main.h"
-
 #include <kcolordlg.h>
 #include <kfontdialog.h>
 #include <kglobal.h>
 #include <kstddirs.h>
+#include <kconfig.h>
 #include <kurl.h>
 #include <qpainter.h>
 
@@ -72,12 +70,13 @@
 #include <qptrdict.h>
 #include <qmessagebox.h>
 
+#include <locale.h>
+#include <klocale.h>
 #include <kwm.h>
 #include <sys/wait.h>
 #include <assert.h>
 
-#include <locale.h>
-#include <klocale.h>
+#include "main.h"
 
 #define HERE printf("%s(%d): here\n",__FILE__,__LINE__)