4 files changed, 14 insertions, 13 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index ac2d56d768..79abf2fd40 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -45,7 +45,7 @@
 #  include "tools.h"
 #endif
 
-#include <QDate>
+#include <qdatetime.h>
 #include <qdir.h>
 #include <qdiriterator.h>
 #include <qtemporaryfile.h>
diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp
index cf8ed9611b..d40e883e2f 100644
--- a/tools/configure/environment.cpp
+++ b/tools/configure/environment.cpp
@@ -41,15 +41,16 @@
 
 #include "environment.h"
 
+#include <qdebug.h>
+#include <qstringlist.h>
+#include <qmap.h>
+#include <qdir.h>
+#include <qfile.h>
+#include <qfileinfo.h>
+
 #include <process.h>
 #include <errno.h>
 #include <iostream>
-#include <qdebug.h>
-#include <QDir>
-#include <QStringList>
-#include <QMap>
-#include <QFile>
-#include <QFileInfo>
 
 //#define CONFIGURE_DEBUG_EXECUTE
 //#define CONFIGURE_DEBUG_CP_DIR
diff --git a/tools/configure/tools.cpp b/tools/configure/tools.cpp
index b3b21d8349..c3f54937da 100644
--- a/tools/configure/tools.cpp
+++ b/tools/configure/tools.cpp
@@ -41,9 +41,9 @@
 
 #include "tools.h"
 
-#include <QDir>
-#include <QFile>
-#include <QByteArray>
+#include <qdir.h>
+#include <qfile.h>
+#include <qbytearray.h>
 
 
 // std stuff ------------------------------------
diff --git a/tools/configure/tools.h b/tools/configure/tools.h
index e882953733..76912eedc8 100644
--- a/tools/configure/tools.h
+++ b/tools/configure/tools.h
@@ -42,9 +42,9 @@
 #ifndef _TOOLS_H_
 #define _TOOLS_H_
 
-#include <QString>
-#include <QStringList>
-#include <QMap>
+#include <qstring.h>
+#include <qstringlist.h>
+#include <qmap.h>
 
 
 class Tools