diff --git a/testclient/mainwindow.h b/testclient/mainwindow.h
--- a/testclient/mainwindow.h
+++ b/testclient/mainwindow.h
@@ -23,7 +23,6 @@
 #pragma once
 
 #include <QMainWindow>
-#include <QSerialPort>
 
 #include "atcore.h"
 #include "commandwidget.h"
diff --git a/unittests/atcoretests.h b/unittests/atcoretests.h
--- a/unittests/atcoretests.h
+++ b/unittests/atcoretests.h
@@ -16,7 +16,6 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <QtTest>
 #include <QObject>
 
 #include "../src/core/atcore.h"
diff --git a/unittests/atcoretests.cpp b/unittests/atcoretests.cpp
--- a/unittests/atcoretests.cpp
+++ b/unittests/atcoretests.cpp
@@ -18,6 +18,8 @@
 */
 #include <algorithm>
 
+#include <QtTest>
+
 #include "atcoretests.h"
 
 void AtCoreTests::initTestCase()
diff --git a/unittests/gcodetests.h b/unittests/gcodetests.h
--- a/unittests/gcodetests.h
+++ b/unittests/gcodetests.h
@@ -16,7 +16,6 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <QtTest>
 #include <QObject>
 
 #include "../src/core/gcodecommands.h"
diff --git a/unittests/gcodetests.cpp b/unittests/gcodetests.cpp
--- a/unittests/gcodetests.cpp
+++ b/unittests/gcodetests.cpp
@@ -18,6 +18,8 @@
 */
 #include <algorithm>
 
+#include <QtTest>
+
 #include "gcodetests.h"
 
 bool GCodeTests::testGCodeNeedsArg(GCode::GCommands code)
diff --git a/unittests/temperaturetests.h b/unittests/temperaturetests.h
--- a/unittests/temperaturetests.h
+++ b/unittests/temperaturetests.h
@@ -16,7 +16,6 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <QtTest>
 #include <QObject>
 
 #include "../src/core/temperature.h"
diff --git a/unittests/temperaturetests.cpp b/unittests/temperaturetests.cpp
--- a/unittests/temperaturetests.cpp
+++ b/unittests/temperaturetests.cpp
@@ -18,6 +18,8 @@
 */
 #include <algorithm>
 
+#include <QtTest>
+
 #include "temperaturetests.h"
 
 void TemperatureTests::initTestCase()