diff --git a/gui/aboutdialog.cpp b/gui/aboutdialog.cpp
index 2d1b800da..58e20c588 100644
--- a/gui/aboutdialog.cpp
+++ b/gui/aboutdialog.cpp
@@ -18,6 +18,7 @@
 
 #include <QDialog>
 #include <QWidget>
+#include <QString>
 #include "aboutdialog.h"
 
 AboutDialog::AboutDialog(const QString &version, QWidget *parent)
diff --git a/gui/applicationdialog.cpp b/gui/applicationdialog.cpp
index 320798417..4474de07f 100644
--- a/gui/applicationdialog.cpp
+++ b/gui/applicationdialog.cpp
@@ -16,7 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <QString>
 #include <QWidget>
+#include <QDialog>
 #include <QFileDialog>
 #include <QDebug>
 #include <QMessageBox>
diff --git a/gui/applicationlist.cpp b/gui/applicationlist.cpp
index 33346ddac..214a7b29e 100644
--- a/gui/applicationlist.cpp
+++ b/gui/applicationlist.cpp
@@ -16,11 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "applicationlist.h"
 #include <QStringList>
 #include <QFileInfo>
+#include <QObject>
+#include <QSettings>
+#include <QStringList>
 #include <stdlib.h>
 #include "common.h"
+#include "applicationlist.h"
+
 
 ApplicationList::ApplicationList(QObject *parent) :
     QObject(parent)
@@ -113,7 +117,6 @@ QString ApplicationList::GetApplicationPath(const int index) const
 
 }
 
-
 void ApplicationList::SetApplicationType(const int index,
         const QString &name,
         const QString &path)
@@ -143,7 +146,6 @@ void ApplicationList::RemoveApplication(const int index)
     mApplications.removeAt(index);
 }
 
-
 void ApplicationList::MoveFirst(const int index)
 {
     if (index < mApplications.size() && index > 0)
@@ -152,7 +154,6 @@ void ApplicationList::MoveFirst(const int index)
     }
 }
 
-
 void ApplicationList::Copy(ApplicationList *list)
 {
     if (!list)
diff --git a/gui/checkthread.cpp b/gui/checkthread.cpp
index e74f8ce26..0ec23ca27 100644
--- a/gui/checkthread.cpp
+++ b/gui/checkthread.cpp
@@ -16,9 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-#include "checkthread.h"
+#include <QString>
 #include <QDebug>
+#include "checkthread.h"
+#include "threadresult.h"
+#include "cppcheck.h"
 
 CheckThread::CheckThread(ThreadResult &result) :
     mState(Ready),
diff --git a/gui/csvreport.cpp b/gui/csvreport.cpp
index 9217c8d4c..0fb3dbfb7 100644
--- a/gui/csvreport.cpp
+++ b/gui/csvreport.cpp
@@ -16,9 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <QObject>
+#include <QString>
 #include <QDir>
 #include <QFile>
 #include <QTextStream>
+#include "report.h"
 #include "csvreport.h"
 
 CsvReport::CsvReport(const QString &filename, QObject * parent) :
diff --git a/gui/filelist.cpp b/gui/filelist.cpp
index 7bd1e1a98..d24b8fc52 100644
--- a/gui/filelist.cpp
+++ b/gui/filelist.cpp
@@ -16,6 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <QString>
+#include <QStringList>
 #include <QDir>
 #include <QFileInfo>
 #include <QDebug>
diff --git a/gui/projectfiledialog.cpp b/gui/projectfiledialog.cpp
index a89b4579a..72273d7b8 100644
--- a/gui/projectfiledialog.cpp
+++ b/gui/projectfiledialog.cpp
@@ -16,6 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <QWidget>
+#include <QDialog>
+#include <QString>
 #include <QStringList>
 #include <QFileInfo>
 #include "projectfiledialog.h"
diff --git a/gui/report.cpp b/gui/report.cpp
index 2f5e150e3..34300a780 100644
--- a/gui/report.cpp
+++ b/gui/report.cpp
@@ -16,6 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <QObject>
+#include <QString>
 #include <QFile>
 #include "erroritem.h"
 #include "report.h"
diff --git a/gui/resultstree.cpp b/gui/resultstree.cpp
index 21343e579..6178c48b9 100644
--- a/gui/resultstree.cpp
+++ b/gui/resultstree.cpp
@@ -17,17 +17,30 @@
  */
 
 #include <QApplication>
+#include <QWidget>
+#include <QStandardItem>
+#include <QModelIndex>
 #include <QDebug>
+#include <QString>
+#include <QStringList>
+#include <QList>
+#include <QMap>
+#include <QVariant>
 #include <QMenu>
 #include <QSignalMapper>
 #include <QProcess>
 #include <QDir>
 #include <QMessageBox>
+#include <QAction>
 #include <QFileInfo>
 #include <QFileDialog>
 #include <QClipboard>
+#include <QContextMenuEvent>
 #include "erroritem.h"
+#include "settings.h"
+#include "applicationlist.h"
 #include "resultstree.h"
+#include "report.h"
 #include "xmlreport.h"
 
 ResultsTree::ResultsTree(QWidget * parent) :
diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp
index aa7a84bb0..ae2e51fe8 100644
--- a/gui/settingsdialog.cpp
+++ b/gui/settingsdialog.cpp
@@ -20,7 +20,9 @@
 #include <QDialog>
 #include <QWidget>
 #include <QLabel>
+#include <QList>
 #include <QDebug>
+#include <QListWidgetItem>
 #include <QTabWidget>
 #include <QSettings>
 #include "settingsdialog.h"
diff --git a/gui/statsdialog.cpp b/gui/statsdialog.cpp
index 16ca528ba..6b56e33de 100644
--- a/gui/statsdialog.cpp
+++ b/gui/statsdialog.cpp
@@ -16,6 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <QWidget>
+#include <QDialog>
+#include <QString>
 #include <QClipboard>
 #include <QMimeData>
 #include "common.h"
diff --git a/gui/threadhandler.cpp b/gui/threadhandler.cpp
index f09072191..6d8a6b2df 100644
--- a/gui/threadhandler.cpp
+++ b/gui/threadhandler.cpp
@@ -16,9 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-#include "threadhandler.h"
+#include <QObject>
+#include <QStringList>
 #include <QDebug>
+#include "settings.h"
+#include "threadhandler.h"
+#include "resultsview.h"
 
 ThreadHandler::ThreadHandler(QObject *parent) :
     QObject(parent),
diff --git a/gui/threadresult.cpp b/gui/threadresult.cpp
index 2df3c161b..259b95193 100644
--- a/gui/threadresult.cpp
+++ b/gui/threadresult.cpp
@@ -17,8 +17,13 @@
  */
 
 
+#include <QString>
+#include <QMutexLocker>
+#include <QList>
+#include <QStringList>
 #include <QDebug>
 #include "erroritem.h"
+#include "errorlogger.h"
 #include "threadresult.h"
 
 ThreadResult::ThreadResult() : mMaxProgress(0), mProgress(0)
diff --git a/gui/xmlreport.cpp b/gui/xmlreport.cpp
index 61a927387..c3a104235 100644
--- a/gui/xmlreport.cpp
+++ b/gui/xmlreport.cpp
@@ -16,10 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <QObject>
+#include <QString>
+#include <QList>
 #include <QDir>
 #include <QFile>
 #include <QXmlStreamWriter>
 #include <QDebug>
+#include "report.h"
 #include "erroritem.h"
 #include "xmlreport.h"