diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index ab4765e3..d783238f 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1,18 +1,16 @@
 #include "mainwindow.h"
 
-#include <qvariant.h>
-#include <qimage.h>
-#include <qpixmap.h>
-
-#include <QTextStream>
-#include <QWhatsThis>
-
-#include "qmessagebox.h"
 #include <QtGui/QFileDialog>
 #include <QSettings>
+#include <QFile>
+#include <QApplication>
+#include <QVariant>
+#include <QImage>
+#include <QPixmap>
+#include <QTextStream>
+#include <QWhatsThis>
+#include <QMessageBox>
 
-#include "qfile.h"
-#include "qapplication.h"
 #include "createtableform.h"
 #include "createindexform.h"
 #include "deletetableform.h"
@@ -24,6 +22,10 @@
 #include "importcsvform.h"
 #include "exporttablecsvform.h"
 #include "preferencesform.h"
+#include "editform.h"
+#include "findform.h"
+#include "sqllogform.h"
+
 /*
  *  Constructs a mainForm as a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'.
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 3b7b4889..95f74d25 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -42,12 +42,9 @@
 #include <QtCore/QPoint>
 #include <QtCore/QVariant>
 
-#include "editform.h"
-#include "findform.h"
 #include "QtGui/QClipboard"
 #include "QtGui/QRegExpValidator"
 #include "sqlitedb.h"
-#include "sqllogform.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -980,6 +977,10 @@ namespace Ui {
 
 QT_END_NAMESPACE
 
+class sqlLogForm;
+class editForm;
+class findForm;
+
 class mainForm : public QMainWindow, public Ui::mainForm
 {
     Q_OBJECT