diff --git a/plugins/chewing/src/chewingadapter.cpp b/plugins/chewing/src/chewingadapter.cpp
index 3971ff1d..77ed9009 100644
--- a/plugins/chewing/src/chewingadapter.cpp
+++ b/plugins/chewing/src/chewingadapter.cpp
@@ -16,14 +16,8 @@
 
 #include "chewingadapter.h"
 
-#include <iostream>
 
-#include <iconv.h>
-#include <string>
-#include <string.h>
 
-#include <QChar>
-#include <QCoreApplication>
 
 #define CHEWING_MAX_LEN 32
 
diff --git a/plugins/chewing/src/chewingadapter.h b/plugins/chewing/src/chewingadapter.h
index da30ecac..955d5bf3 100644
--- a/plugins/chewing/src/chewingadapter.h
+++ b/plugins/chewing/src/chewingadapter.h
@@ -18,7 +18,6 @@
 #define CHEWINGADAPTER_H
 
 #include <QObject>
-#include <QStringList>
 
 #include "chewing.h"
 
diff --git a/plugins/chewing/src/chewinglanguagefeatures.h b/plugins/chewing/src/chewinglanguagefeatures.h
index 20da83e1..5604f4b6 100644
--- a/plugins/chewing/src/chewinglanguagefeatures.h
+++ b/plugins/chewing/src/chewinglanguagefeatures.h
@@ -18,7 +18,6 @@
 #define CHEWINGLANGUAGEFEATURES_H
 
 #include "abstractlanguagefeatures.h"
-#include <QObject>
 
 class ChewingLanguageFeatures : public QObject, public AbstractLanguageFeatures
 {
diff --git a/plugins/chewing/src/chewingplugin.cpp b/plugins/chewing/src/chewingplugin.cpp
index f42acab1..cde5f4ba 100644
--- a/plugins/chewing/src/chewingplugin.cpp
+++ b/plugins/chewing/src/chewingplugin.cpp
@@ -1,7 +1,6 @@
 #include "chewingplugin.h"
 #include "chewinglanguagefeatures.h"
 
-#include <QDebug>
 
 ChewingPlugin::ChewingPlugin(QObject *parent) :
     AbstractLanguagePlugin(parent)
diff --git a/plugins/chewing/src/chewingplugin.h b/plugins/chewing/src/chewingplugin.h
index 5c5bbb74..3f2496ad 100644
--- a/plugins/chewing/src/chewingplugin.h
+++ b/plugins/chewing/src/chewingplugin.h
@@ -1,14 +1,10 @@
 #ifndef CHEWINGPLUGIN_H
 #define CHEWINGPLUGIN_H
 
-#include <QObject>
-#include <QStringList>
 #include <QThread>
-#include "languageplugininterface.h"
 #include "abstractlanguageplugin.h"
 
 #include "chewingadapter.h"
-#include <iostream>
 
 class ChewingLanguageFeatures;
 
diff --git a/plugins/ko/src/koreanlanguagefeatures.h b/plugins/ko/src/koreanlanguagefeatures.h
index e5c15195..3bffef01 100644
--- a/plugins/ko/src/koreanlanguagefeatures.h
+++ b/plugins/ko/src/koreanlanguagefeatures.h
@@ -18,7 +18,6 @@
 #define KOREANLANGUAGEFEATURES_H
 
 #include "abstractlanguagefeatures.h"
-#include <QObject>
 
 class KoreanLanguageFeatures : public QObject, public AbstractLanguageFeatures
 {
diff --git a/plugins/ko/src/koreanplugin.cpp b/plugins/ko/src/koreanplugin.cpp
index b810235b..20688bd9 100644
--- a/plugins/ko/src/koreanplugin.cpp
+++ b/plugins/ko/src/koreanplugin.cpp
@@ -2,7 +2,6 @@
 #include "koreanlanguagefeatures.h"
 #include "spellpredictworker.h"
 
-#include <QDebug>
 
 KoreanPlugin::KoreanPlugin(QObject *parent) :
     AbstractLanguagePlugin(parent)
diff --git a/plugins/ko/src/koreanplugin.h b/plugins/ko/src/koreanplugin.h
index 19908ac6..13ce6a09 100644
--- a/plugins/ko/src/koreanplugin.h
+++ b/plugins/ko/src/koreanplugin.h
@@ -1,14 +1,9 @@
 #ifndef KOREANPLUGIN_H
 #define KOREANPLUGIN_H
 
-#include <QObject>
-#include <QStringList>
-#include "languageplugininterface.h"
 #include "abstractlanguageplugin.h"
-#include "spellchecker.h"
 #include "spellpredictworker.h"
 
-#include <iostream>
 
 class KoreanLanguageFeatures;
 
diff --git a/plugins/pinyin/src/chineselanguagefeatures.h b/plugins/pinyin/src/chineselanguagefeatures.h
index bea63d3d..06a21ffb 100644
--- a/plugins/pinyin/src/chineselanguagefeatures.h
+++ b/plugins/pinyin/src/chineselanguagefeatures.h
@@ -18,7 +18,6 @@
 #define CHINESELANGUAGEFEATURES_H
 
 #include "abstractlanguagefeatures.h"
-#include <QObject>
 
 class ChineseLanguageFeatures : public QObject, public AbstractLanguageFeatures
 {
diff --git a/plugins/pinyin/src/pinyinadapter.cpp b/plugins/pinyin/src/pinyinadapter.cpp
index f31a00c8..fccf03f5 100644
--- a/plugins/pinyin/src/pinyinadapter.cpp
+++ b/plugins/pinyin/src/pinyinadapter.cpp
@@ -21,14 +21,8 @@
 #include <algorithm>
 #include <iterator>
 
-#include <iconv.h>
-#include <string>
-#include <string.h>
 
-#include <QDebug>
 #include <QLoggingCategory>
-#include <QCoreApplication>
-#include <QRegExp>
 
 #define MAX_SUGGESTIONS 100
 
diff --git a/plugins/pinyin/src/pinyinadapter.h b/plugins/pinyin/src/pinyinadapter.h
index 83d29541..1e05d600 100644
--- a/plugins/pinyin/src/pinyinadapter.h
+++ b/plugins/pinyin/src/pinyinadapter.h
@@ -17,8 +17,6 @@
 #ifndef PINYINADAPTER_H
 #define PINYINADAPTER_H
 
-#include <QObject>
-#include <QStringList>
 
 #include "pinyin.h"
 #include "abstractlanguageplugin.h"
diff --git a/plugins/pinyin/src/pinyinplugin.h b/plugins/pinyin/src/pinyinplugin.h
index 7444a374..5d6be408 100644
--- a/plugins/pinyin/src/pinyinplugin.h
+++ b/plugins/pinyin/src/pinyinplugin.h
@@ -1,14 +1,11 @@
 #ifndef PINYINPLUGIN_H
 #define PINYINPLUGIN_H
 
-#include <QObject>
-#include <QStringList>
 #include <QThread>
 #include "languageplugininterface.h"
 #include "abstractlanguageplugin.h"
 
 #include "pinyinadapter.h"
-#include <iostream>
 
 class ChineseLanguageFeatures;
 
diff --git a/plugins/th/src/thailanguagefeatures.h b/plugins/th/src/thailanguagefeatures.h
index bcf1038a..d349ae80 100644
--- a/plugins/th/src/thailanguagefeatures.h
+++ b/plugins/th/src/thailanguagefeatures.h
@@ -18,7 +18,6 @@
 #define THAILANGUAGEFEATURES_H
 
 #include "abstractlanguagefeatures.h"
-#include <QObject>
 
 class ThaiLanguageFeatures : public QObject, public AbstractLanguageFeatures
 {
diff --git a/plugins/th/src/thaiplugin.h b/plugins/th/src/thaiplugin.h
index 52a11d5b..bb579df8 100644
--- a/plugins/th/src/thaiplugin.h
+++ b/plugins/th/src/thaiplugin.h
@@ -1,8 +1,6 @@
 #ifndef THAIPLUGIN_H
 #define THAIPLUGIN_H
 
-#include <QObject>
-#include "languageplugininterface.h"
 #include "abstractlanguageplugin.h"
 
 class ThaiLanguageFeatures;
diff --git a/plugins/westernsupport/spellchecker.cpp b/plugins/westernsupport/spellchecker.cpp
index d55eeb35..7982b926 100644
--- a/plugins/westernsupport/spellchecker.cpp
+++ b/plugins/westernsupport/spellchecker.cpp
@@ -52,11 +52,6 @@ class Hunspell
 };
 #endif
 
-#include <QFile>
-#include <QTextStream>
-#include <QTextCodec>
-#include <QStringList>
-#include <QDebug>
 #include <QDir>
 
 //! \class SpellChecker
diff --git a/plugins/westernsupport/spellpredictworker.cpp b/plugins/westernsupport/spellpredictworker.cpp
index d7c721aa..54d336e9 100644
--- a/plugins/westernsupport/spellpredictworker.cpp
+++ b/plugins/westernsupport/spellpredictworker.cpp
@@ -27,7 +27,6 @@
 
 #include "spellpredictworker.h"
 
-#include <QDebug>
 
 SpellPredictWorker::SpellPredictWorker(QObject *parent)
     : QObject(parent)
diff --git a/plugins/westernsupport/spellpredictworker.h b/plugins/westernsupport/spellpredictworker.h
index 7ba24f45..284585ed 100644
--- a/plugins/westernsupport/spellpredictworker.h
+++ b/plugins/westernsupport/spellpredictworker.h
@@ -31,9 +31,6 @@
 #include "spellchecker.h"
 #include "languageplugininterface.h"
 
-#include <QObject>
-#include <QStringList>
-#include <QMap>
 
 class SpellPredictWorker : public QObject
 {
diff --git a/plugins/westernsupport/westernlanguagefeatures.cpp b/plugins/westernsupport/westernlanguagefeatures.cpp
index 1da20710..e709c01a 100644
--- a/plugins/westernsupport/westernlanguagefeatures.cpp
+++ b/plugins/westernsupport/westernlanguagefeatures.cpp
@@ -30,7 +30,6 @@
 
 #include "westernlanguagefeatures.h"
 
-#include <QtCore>
 
 WesternLanguageFeatures::WesternLanguageFeatures(QObject *parent) :
     QObject(parent)
diff --git a/plugins/westernsupport/westernlanguagefeatures.h b/plugins/westernsupport/westernlanguagefeatures.h
index 86afa946..969ab83d 100644
--- a/plugins/westernsupport/westernlanguagefeatures.h
+++ b/plugins/westernsupport/westernlanguagefeatures.h
@@ -32,7 +32,6 @@
 #define MALIITKEYBOARD_LANGUAGEFEATURES_H
 
 #include "abstractlanguagefeatures.h"
-#include <QObject>
 
 class WesternLanguageFeatures : public QObject, public AbstractLanguageFeatures
 {
diff --git a/plugins/westernsupport/westernlanguagesplugin.cpp b/plugins/westernsupport/westernlanguagesplugin.cpp
index 9ac81b23..0b517ba6 100644
--- a/plugins/westernsupport/westernlanguagesplugin.cpp
+++ b/plugins/westernsupport/westernlanguagesplugin.cpp
@@ -2,7 +2,6 @@
 #include "westernlanguagefeatures.h"
 #include "spellpredictworker.h"
 
-#include <QDebug>
 
 WesternLanguagesPlugin::WesternLanguagesPlugin(QObject *parent) :
     AbstractLanguagePlugin(parent)
diff --git a/plugins/westernsupport/westernlanguagesplugin.h b/plugins/westernsupport/westernlanguagesplugin.h
index ad745495..13e17bbd 100644
--- a/plugins/westernsupport/westernlanguagesplugin.h
+++ b/plugins/westernsupport/westernlanguagesplugin.h
@@ -1,14 +1,9 @@
 #ifndef WESTERNLANGUAGESPLUGIN_H
 #define WESTERNLANGUAGESPLUGIN_H
 
-#include <QObject>
 
-#include "languageplugininterface.h"
-#include "westernlanguagefeatures.h"
-#include "spellchecker.h"
 #include "abstractlanguageplugin.h"
 
-#include "spellpredictworker.h"
 
 class WesternLanguageFeatures;
 class SpellPredictWorker;
diff --git a/src/3rdparty/QGSettings/qconftypes.cpp b/src/3rdparty/QGSettings/qconftypes.cpp
index d1784a50..a6e26fdf 100644
--- a/src/3rdparty/QGSettings/qconftypes.cpp
+++ b/src/3rdparty/QGSettings/qconftypes.cpp
@@ -16,7 +16,6 @@
 
 #include "qconftypes.h"
 
-#include <QStringList>
 
 /* This file is responsible for conversion between C++ values and GVariant *.
  *
diff --git a/src/3rdparty/QGSettings/qgsettings.h b/src/3rdparty/QGSettings/qgsettings.h
index 0a46464c..c56a01d8 100644
--- a/src/3rdparty/QGSettings/qgsettings.h
+++ b/src/3rdparty/QGSettings/qgsettings.h
@@ -20,7 +20,6 @@
 #define __QGSETTINGS_H__
 
 #include <QObject>
-#include <QStringList>
 
 /**
  * @brief QGSettings provides access to application settings stored with GSettings.
diff --git a/src/lib/logic/abstractwordengine.h b/src/lib/logic/abstractwordengine.h
index a054d5cd..f51e9ffd 100644
--- a/src/lib/logic/abstractwordengine.h
+++ b/src/lib/logic/abstractwordengine.h
@@ -33,7 +33,6 @@
 
 #include "models/text.h"
 #include "models/wordcandidate.h"
-#include <QtCore>
 
 class AbstractLanguageFeatures;
 
diff --git a/src/lib/logic/eventhandler.h b/src/lib/logic/eventhandler.h
index 67cec7f4..8ca29d70 100644
--- a/src/lib/logic/eventhandler.h
+++ b/src/lib/logic/eventhandler.h
@@ -31,7 +31,6 @@
 #ifndef MALIIT_KEYBOARD_EVENTHANDLER_H
 #define MALIIT_KEYBOARD_EVENTHANDLER_H
 
-#include <QtCore>
 #include "models/wordcandidate.h"
 
 namespace MaliitKeyboard {
@@ -39,12 +38,10 @@ namespace MaliitKeyboard {
 class Key;
 
 namespace Model {
-class Layout;
 }
 
 namespace Logic {
 
-class LayoutUpdater;
 
 class EventHandler
     : public QObject
diff --git a/src/lib/logic/wordengine.h b/src/lib/logic/wordengine.h
index 94886b05..da7cd5d4 100644
--- a/src/lib/logic/wordengine.h
+++ b/src/lib/logic/wordengine.h
@@ -32,13 +32,10 @@
 #ifndef MALIIT_KEYBOARD_WORDENGINE_H
 #define MALIIT_KEYBOARD_WORDENGINE_H
 
-#include "models/text.h"
 #include "logic/abstractwordengine.h"
 #include "logic/abstractlanguagefeatures.h"
 #include "languageplugininterface.h"
 
-#include <QtCore>
-#include <QMutex>
 
 namespace MaliitKeyboard {
 namespace Logic {
diff --git a/src/lib/models/key.h b/src/lib/models/key.h
index 5695cc1c..6763110a 100644
--- a/src/lib/models/key.h
+++ b/src/lib/models/key.h
@@ -34,7 +34,6 @@
 
 #include "models/area.h"
 
-#include <QtCore>
 
 namespace MaliitKeyboard {
 
diff --git a/src/lib/models/layout.cpp b/src/lib/models/layout.cpp
index 304064e5..c641d92c 100644
--- a/src/lib/models/layout.cpp
+++ b/src/lib/models/layout.cpp
@@ -31,10 +31,7 @@
 #include "layout.h"
 #include "keyarea.h"
 #include "key.h"
-#include "keydescription.h"
 
-#include <QtGui/QGuiApplication>
-#include <QScreen>
 
 namespace MaliitKeyboard {
 namespace Model {
diff --git a/src/lib/models/layout.h b/src/lib/models/layout.h
index 82ce19f9..f4a6779e 100644
--- a/src/lib/models/layout.h
+++ b/src/lib/models/layout.h
@@ -32,7 +32,6 @@
 #define MALIIT_KEYBOARD_LAYOUT_H
 
 #include "models/key.h"
-#include <QtCore>
 
 namespace MaliitKeyboard {
 
@@ -40,8 +39,6 @@ class KeyArea;
 
 
 namespace Logic {
-class LayoutHelper;
-class LayoutUpdater;
 }
 
 namespace Model {
diff --git a/src/lib/models/wordcandidate.h b/src/lib/models/wordcandidate.h
index a83663db..81a041f9 100644
--- a/src/lib/models/wordcandidate.h
+++ b/src/lib/models/wordcandidate.h
@@ -34,7 +34,6 @@
 
 #include "models/area.h"
 
-#include <QtCore>
 
 namespace MaliitKeyboard {
 
diff --git a/src/lib/models/wordribbon.h b/src/lib/models/wordribbon.h
index ae0a3887..0f94ac03 100644
--- a/src/lib/models/wordribbon.h
+++ b/src/lib/models/wordribbon.h
@@ -35,7 +35,6 @@
 #include "models/wordcandidate.h"
 #include "models/area.h"
 
-#include <QtCore>
 
 namespace MaliitKeyboard {
 
diff --git a/src/plugin/device.cpp b/src/plugin/device.cpp
index c992f29a..ffa1e16c 100644
--- a/src/plugin/device.cpp
+++ b/src/plugin/device.cpp
@@ -29,7 +29,6 @@
 
 #include "keyboardsettings.h"
 
-#include <QFile>
 #include <QFileInfo>
 #include <QJsonDocument>
 #include <QScreen>
diff --git a/src/plugin/device.h b/src/plugin/device.h
index 000a466c..f4db5b2e 100644
--- a/src/plugin/device.h
+++ b/src/plugin/device.h
@@ -28,7 +28,6 @@
 #ifndef DEVICE_H
 #define DEVICE_H
 
-#include <QObject>
 #include <QJsonObject>
 
 class QScreen;
diff --git a/src/plugin/editor.cpp b/src/plugin/editor.cpp
index ac747571..90deb3dd 100644
--- a/src/plugin/editor.cpp
+++ b/src/plugin/editor.cpp
@@ -32,8 +32,6 @@
 #include "models/text.h"
 #include "editor.h"
 
-#include <QtGui/QKeyEvent>
-#include <QTimer>
 #include <maliit/namespace.h>
 
 namespace MaliitKeyboard {
diff --git a/src/plugin/editor.h b/src/plugin/editor.h
index 09eba881..64a8be81 100644
--- a/src/plugin/editor.h
+++ b/src/plugin/editor.h
@@ -32,12 +32,9 @@
 #ifndef MALIIT_KEYBOARD_EDITOR_H
 #define MALIIT_KEYBOARD_EDITOR_H
 
-#include "models/key.h"
-#include "models/wordcandidate.h"
 #include "view/abstracttexteditor.h"
 
 #include <maliit/plugins/abstractinputmethodhost.h>
-#include <QtCore>
 
 namespace MaliitKeyboard {
 
diff --git a/src/plugin/inputmethod.cpp b/src/plugin/inputmethod.cpp
index 23cacca6..1f2f208d 100644
--- a/src/plugin/inputmethod.cpp
+++ b/src/plugin/inputmethod.cpp
@@ -32,23 +32,16 @@
 #include "inputmethod.h"
 #include "inputmethod_p.h"
 
-#include "models/key.h"
-#include "models/keyarea.h"
-#include "models/wordribbon.h"
-#include "models/layout.h"
 
 #include "logic/abstractlanguagefeatures.h"
 
 #include "view/setup.h"
 
-#include <maliit/plugins/subviewdescription.h>
 #include <maliit/plugins/updateevent.h>
 #include <maliit/namespace.h>
 
-#include <QGuiApplication>
 
 
-class MImUpdateEvent;
 
 using namespace MaliitKeyboard;
 
diff --git a/src/plugin/inputmethod.h b/src/plugin/inputmethod.h
index f29ae7eb..5ecdd1a8 100644
--- a/src/plugin/inputmethod.h
+++ b/src/plugin/inputmethod.h
@@ -33,11 +33,8 @@
 #define MALIIT_KEYBOARD_INPUTMETHOD_H
 
 #include <maliit/plugins/abstractinputmethod.h>
-#include <maliit/plugins/abstractinputmethodhost.h>
 #include <maliit/plugins/keyoverride.h>
 
-#include <QtGui>
-#include <QtQuick/QQuickView>
 
 class InputMethodPrivate;
 
diff --git a/src/plugin/keyboardgeometry.cpp b/src/plugin/keyboardgeometry.cpp
index 2bc2f8d8..2f828fe9 100644
--- a/src/plugin/keyboardgeometry.cpp
+++ b/src/plugin/keyboardgeometry.cpp
@@ -27,7 +27,6 @@
 
 #include "keyboardgeometry.h"
 
-#include <QDebug>
 
 KeyboardGeometry::KeyboardGeometry(QObject *parent) :
     QObject(parent)
diff --git a/src/plugin/keyboardsettings.h b/src/plugin/keyboardsettings.h
index 7e285134..ba0f50bd 100644
--- a/src/plugin/keyboardsettings.h
+++ b/src/plugin/keyboardsettings.h
@@ -31,7 +31,6 @@
 #define KEYBOARDSETTINGS_H
 
 #include <QObject>
-#include <QStringList>
 
 class QGSettings;
 
diff --git a/src/plugin/plugin.cpp b/src/plugin/plugin.cpp
index 98938de0..03758da7 100644
--- a/src/plugin/plugin.cpp
+++ b/src/plugin/plugin.cpp
@@ -33,8 +33,6 @@
 #include "inputmethod.h"
 
 #include <QtQml>
-#include <libintl.h>
-
 MaliitKeyboardPlugin::MaliitKeyboardPlugin(QObject *parent)
     : QObject(parent)
     , Maliit::Plugins::InputMethodPlugin()
diff --git a/src/plugin/plugin.h b/src/plugin/plugin.h
index 8ab7f978..54760abf 100644
--- a/src/plugin/plugin.h
+++ b/src/plugin/plugin.h
@@ -33,9 +33,6 @@
 #define MALIIT_KEYBOARD_PLUGIN_H
 
 #include <maliit/plugins/inputmethodplugin.h>
-#include <QtCore>
-#include <QtGui>
-
 class MaliitKeyboardPlugin
     : public QObject, public Maliit::Plugins::InputMethodPlugin
 {
diff --git a/src/plugin/updatenotifier.h b/src/plugin/updatenotifier.h
index aa1b4c1f..7a85ddbe 100644
--- a/src/plugin/updatenotifier.h
+++ b/src/plugin/updatenotifier.h
@@ -32,7 +32,6 @@
 #define MALIIT_KEYBOARD_UPDATENOTIFIER_H
 
 #include <QtCore>
-#include <maliit/plugins/keyoverride.h>
 
 class MImUpdateEvent;
 
diff --git a/src/view/abstracttexteditor.cpp b/src/view/abstracttexteditor.cpp
index bf7a69e1..1b931ef9 100644
--- a/src/view/abstracttexteditor.cpp
+++ b/src/view/abstracttexteditor.cpp
@@ -30,10 +30,8 @@
  */
 
 #include "abstracttexteditor.h"
-#include "models/wordribbon.h"
 #include "logic/abstractlanguagefeatures.h"
 
-#include <QElapsedTimer>
 
 namespace MaliitKeyboard {
 
diff --git a/src/view/abstracttexteditor.h b/src/view/abstracttexteditor.h
index a9aabdb6..4baaccb8 100644
--- a/src/view/abstracttexteditor.h
+++ b/src/view/abstracttexteditor.h
@@ -37,7 +37,6 @@
 #include "models/text.h"
 #include "logic/abstractwordengine.h"
 
-#include <QtCore>
 #include <QtGui/QKeyEvent>
 
 namespace MaliitKeyboard {
diff --git a/src/view/setup.cpp b/src/view/setup.cpp
index 439490ad..a7d3bda2 100644
--- a/src/view/setup.cpp
+++ b/src/view/setup.cpp
@@ -32,10 +32,6 @@
 #include "setup.h"
 #include "abstracttexteditor.h"
 
-#include "models/layout.h"
-#include "models/key.h"
-#include "models/wordcandidate.h"
-#include "models/text.h"
 
 #include "logic/eventhandler.h"
 
diff --git a/src/view/setup.h b/src/view/setup.h
index 0e422757..70d7f90f 100644
--- a/src/view/setup.h
+++ b/src/view/setup.h
@@ -34,18 +34,13 @@
 
 namespace MaliitKeyboard {
 
-class Glass;
-class Renderer;
 class AbstractTextEditor;
 
 namespace Logic {
-class LayoutHelper;
-class LayoutUpdater;
 class EventHandler;
 }
 
 namespace Model {
-class Layout;
 }
 
 namespace Setup {
diff --git a/tests/unittests/common/inputmethodhostprobe.cpp b/tests/unittests/common/inputmethodhostprobe.cpp
index 35dec941..6a6270be 100644
--- a/tests/unittests/common/inputmethodhostprobe.cpp
+++ b/tests/unittests/common/inputmethodhostprobe.cpp
@@ -30,7 +30,6 @@
  */
 
 #include "inputmethodhostprobe.h"
-#include <QtDebug>
 
 InputMethodHostProbe::InputMethodHostProbe()
     : m_commit_string_history()
diff --git a/tests/unittests/common/utils.h b/tests/unittests/common/utils.h
index 0929a467..971a37c2 100644
--- a/tests/unittests/common/utils.h
+++ b/tests/unittests/common/utils.h
@@ -33,7 +33,6 @@
 #define TESTUTILS_H
 
 class QObject;
-class QString;
 
 namespace TestUtils {
 
diff --git a/tests/unittests/common/wordengineprobe.h b/tests/unittests/common/wordengineprobe.h
index 63f43b5b..b353dfb8 100644
--- a/tests/unittests/common/wordengineprobe.h
+++ b/tests/unittests/common/wordengineprobe.h
@@ -34,7 +34,6 @@
 #include "logic/abstractwordengine.h"
 #include "logic/abstractlanguagefeatures.h"
 
-#include <QtCore>
 
 class MockLanguageFeatures : public AbstractLanguageFeatures
 {
diff --git a/tests/unittests/ut_editor/ut_editor.cpp b/tests/unittests/ut_editor/ut_editor.cpp
index 9939af13..fe127f49 100644
--- a/tests/unittests/ut_editor/ut_editor.cpp
+++ b/tests/unittests/ut_editor/ut_editor.cpp
@@ -28,16 +28,13 @@
  *
  */
 
-#include "utils.h"
 #include "wordengineprobe.h"
 #include "common/inputmethodhostprobe.h"
 
 #include "plugin/editor.h"
 #include "models/key.h"
 #include "models/text.h"
-#include "view/setup.h"
 
-#include <QtCore>
 #include <QtTest>
 
 using namespace MaliitKeyboard;
diff --git a/tests/unittests/ut_editor/wordengineprobe.h b/tests/unittests/ut_editor/wordengineprobe.h
index 65b6141d..2300bb57 100644
--- a/tests/unittests/ut_editor/wordengineprobe.h
+++ b/tests/unittests/ut_editor/wordengineprobe.h
@@ -34,7 +34,6 @@
 #include "logic/abstractwordengine.h"
 #include "logic/abstractlanguagefeatures.h"
 
-#include <QtCore>
 
 class MockLanguageFeatures : public AbstractLanguageFeatures
 {
diff --git a/tests/unittests/ut_languagefeatures/ut_languagefeatures.cpp b/tests/unittests/ut_languagefeatures/ut_languagefeatures.cpp
index b0d54d4a..7f9c117e 100644
--- a/tests/unittests/ut_languagefeatures/ut_languagefeatures.cpp
+++ b/tests/unittests/ut_languagefeatures/ut_languagefeatures.cpp
@@ -27,7 +27,6 @@
 
 #include "westernlanguagefeatures.h"
 
-#include <QtCore>
 #include <QtTest>
 
 namespace MaliitKeyboard {
diff --git a/tests/unittests/ut_repeat-backspace/ut_repeat-backspace.cpp b/tests/unittests/ut_repeat-backspace/ut_repeat-backspace.cpp
index c51384af..b96954cc 100644
--- a/tests/unittests/ut_repeat-backspace/ut_repeat-backspace.cpp
+++ b/tests/unittests/ut_repeat-backspace/ut_repeat-backspace.cpp
@@ -32,13 +32,11 @@
 #include "utils.h"
 #include "models/key.h"
 #include "models/text.h"
-#include "logic/wordengine.h"
 #include "plugin/editor.h"
 #include "common/wordengineprobe.h"
 
 #include <inputmethodhostprobe.h>
 
-#include <QtCore>
 #include <QtTest>
 
 using namespace MaliitKeyboard;
diff --git a/tests/unittests/ut_text/ut_text.cpp b/tests/unittests/ut_text/ut_text.cpp
index 9a8e21a2..b69f0993 100644
--- a/tests/unittests/ut_text/ut_text.cpp
+++ b/tests/unittests/ut_text/ut_text.cpp
@@ -27,7 +27,6 @@
 
 #include "models/text.h"
 
-#include <QtCore>
 #include <QtTest>
 
 namespace MaliitKeyboard {
diff --git a/tests/unittests/ut_word-candidates/ut_word-candidates.cpp b/tests/unittests/ut_word-candidates/ut_word-candidates.cpp
index 0c121d32..e7350227 100644
--- a/tests/unittests/ut_word-candidates/ut_word-candidates.cpp
+++ b/tests/unittests/ut_word-candidates/ut_word-candidates.cpp
@@ -28,16 +28,13 @@
  *
  */
 
-#include "utils.h"
 #include "wordengineprobe.h"
 #include "common/inputmethodhostprobe.h"
 
 #include "plugin/editor.h"
 #include "models/key.h"
 #include "models/text.h"
-#include "view/setup.h"
 
-#include <QtCore>
 #include <QtTest>
 
 using namespace MaliitKeyboard;
diff --git a/tests/unittests/ut_word-candidates/wordengineprobe.h b/tests/unittests/ut_word-candidates/wordengineprobe.h
index 63f43b5b..b353dfb8 100644
--- a/tests/unittests/ut_word-candidates/wordengineprobe.h
+++ b/tests/unittests/ut_word-candidates/wordengineprobe.h
@@ -34,7 +34,6 @@
 #include "logic/abstractwordengine.h"
 #include "logic/abstractlanguagefeatures.h"
 
-#include <QtCore>
 
 class MockLanguageFeatures : public AbstractLanguageFeatures
 {