diff --git a/src/ui/AudioOutputWidget.h b/src/ui/AudioOutputWidget.h
index 07fe5d56997b96d57bb355da0c2d521ace543873..4fd439872016d9eebcfed0aca8007ae7a1e84c91 100644
--- a/src/ui/AudioOutputWidget.h
+++ b/src/ui/AudioOutputWidget.h
@@ -31,7 +31,7 @@ This file is part of the QGROUNDCONTROL project
 #ifndef AUDIOOUTPUTWIDGET_H
 #define AUDIOOUTPUTWIDGET_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 namespace Ui
 {
diff --git a/src/ui/DebugConsole.h b/src/ui/DebugConsole.h
index 725886d073f554fbd6fc8736e55a307543aca956..53d1ffccd926c3323668b7a7afdbd996eb315e0e 100644
--- a/src/ui/DebugConsole.h
+++ b/src/ui/DebugConsole.h
@@ -32,7 +32,7 @@ This file is part of the QGROUNDCONTROL project
 #ifndef DEBUGCONSOLE_H
 #define DEBUGCONSOLE_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include <QList>
 #include <QByteArray>
 #include <QTimer>
diff --git a/src/ui/HDDisplay.h b/src/ui/HDDisplay.h
index e39090d7c499d1ee674345dfdf6adba954fea5e0..29aa075ded3b69a7b83a28493273237bb7b3bacd 100644
--- a/src/ui/HDDisplay.h
+++ b/src/ui/HDDisplay.h
@@ -32,7 +32,7 @@ This file is part of the QGROUNDCONTROL project
 #ifndef HDDISPLAY_H
 #define HDDISPLAY_H
 
-#include <QtGui/QGraphicsView>
+#include <QGraphicsView>
 #include <QColor>
 #include <QTimer>
 #include <QFontDatabase>
diff --git a/src/ui/HSIDisplay.h b/src/ui/HSIDisplay.h
index b4edb3a25e9f4d8823cad0bd426678e3825d0947..e97a7717c61f1107bd6193b950f1cd0a66a97c8d 100644
--- a/src/ui/HSIDisplay.h
+++ b/src/ui/HSIDisplay.h
@@ -32,7 +32,7 @@ This file is part of the QGROUNDCONTROL project
 #ifndef HSIDISPLAY_H
 #define HSIDISPLAY_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include <QColor>
 #include <QTimer>
 #include <QMap>
diff --git a/src/ui/JoystickWidget.h b/src/ui/JoystickWidget.h
index 71931b1e35c19670988ee0b06bc160b72904e12b..36250decc0ff0e29983c7f0fdacf10cca635ccec 100644
--- a/src/ui/JoystickWidget.h
+++ b/src/ui/JoystickWidget.h
@@ -31,7 +31,7 @@ This file is part of the PIXHAWK project
 #ifndef JOYSTICKWIDGET_H
 #define JOYSTICKWIDGET_H
 
-#include <QtGui/QDialog>
+#include <QDialog>
 #include <QLabel>
 #include <QMap>
 #include "JoystickInput.h"
diff --git a/src/ui/MAVLinkSettingsWidget.h b/src/ui/MAVLinkSettingsWidget.h
index 7c1da7bc7cb9212d9a610d881c0e21bf5d0614bd..743daaf243561eaac3d6f63e7692e25fa87709d2 100644
--- a/src/ui/MAVLinkSettingsWidget.h
+++ b/src/ui/MAVLinkSettingsWidget.h
@@ -1,7 +1,7 @@
 #ifndef MAVLINKSETTINGSWIDGET_H
 #define MAVLINKSETTINGSWIDGET_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 #include "MAVLinkProtocol.h"
 
diff --git a/src/ui/MainWindow.h b/src/ui/MainWindow.h
index 2a08c516a33b647ee6726c535ba6fa26f38a3fad..87bd6fd5db252a528f96ee1bd050a7ef263642d4 100644
--- a/src/ui/MainWindow.h
+++ b/src/ui/MainWindow.h
@@ -30,7 +30,7 @@ This file is part of the QGROUNDCONTROL project
 
 #ifndef _MAINWINDOW_H_
 #define _MAINWINDOW_H_
-#include <QtGui/QMainWindow>
+#include <QMainWindow>
 #include <QStatusBar>
 #include <QStackedWidget>
 #include <QSettings>
diff --git a/src/ui/MapWidget.h b/src/ui/MapWidget.h
index cd8bb951ebc1a71585d6f01c069bdce18391ed27..d2b98a3ddf7bad6abdd65d675faf54c56b55a3c2 100644
--- a/src/ui/MapWidget.h
+++ b/src/ui/MapWidget.h
@@ -33,7 +33,7 @@ This file is part of the QGROUNDCONTROL project
 #ifndef MAPWIDGET_H
 #define MAPWIDGET_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include <QMap>
 #include "qmapcontrol.h"
 #include "UASInterface.h"
diff --git a/src/ui/ObjectDetectionView.h b/src/ui/ObjectDetectionView.h
index 4acc01defd333399ba8d66febb82501794bce179..0f0bf9bfa90e0585eabba49a2172745a6ddef8c4 100644
--- a/src/ui/ObjectDetectionView.h
+++ b/src/ui/ObjectDetectionView.h
@@ -33,7 +33,7 @@ This file is part of the QGROUNDCONTROL project
 #ifndef _OBJECTDETECTIONVIEW_H_
 #define _OBJECTDETECTIONVIEW_H_
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include <QResizeEvent>
 #include <QMap>
 #include "UASInterface.h"
diff --git a/src/ui/ParameterInterface.h b/src/ui/ParameterInterface.h
index eb6752d63f177d208900c7befc01c25a41123190..ff74e00ced168ce103dcbd19e56c66fcbf7a0440 100644
--- a/src/ui/ParameterInterface.h
+++ b/src/ui/ParameterInterface.h
@@ -32,7 +32,7 @@ This file is part of the QGROUNDCONTROL project
 #ifndef PARAMETERINTERFACE_H
 #define PARAMETERINTERFACE_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 #include "ui_ParameterInterface.h"
 #include "UASInterface.h"
diff --git a/src/ui/SlugsPadCameraControl.h b/src/ui/SlugsPadCameraControl.h
index 356b8fbad162b7b39b336a73cbe8c37b4a452507..3f4e8799d28fb9f5157d2028d6db8e0917a17b91 100644
--- a/src/ui/SlugsPadCameraControl.h
+++ b/src/ui/SlugsPadCameraControl.h
@@ -1,7 +1,7 @@
 #ifndef SLUGSPADCAMERACONTROL_H
 #define SLUGSPADCAMERACONTROL_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include <QGraphicsView>
 #include <QMouseEvent>
 #include <QKeyEvent>
diff --git a/src/ui/WaypointEditableView.h b/src/ui/WaypointEditableView.h
index fb1916ec418aaf18c0469d8361ab69c5ed16bbe0..362cc694de1f96582ee75c667bc3945d5aa0b179 100644
--- a/src/ui/WaypointEditableView.h
+++ b/src/ui/WaypointEditableView.h
@@ -33,7 +33,7 @@ This file is part of the QGROUNDCONTROL project
 #ifndef WAYPOINTEDITABLEVIEW_H
 #define WAYPOINTEDITABLEVIEW_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include "Waypoint.h"
 #include <iostream>
 
diff --git a/src/ui/WaypointList.h b/src/ui/WaypointList.h
index f5d39cb67665634e4c410c68c4f3d5952f19ce16..4f6fbf8223567b8b73ed36c72f27e83d815ed631 100644
--- a/src/ui/WaypointList.h
+++ b/src/ui/WaypointList.h
@@ -34,7 +34,7 @@ This file is part of the QGROUNDCONTROL project
 #ifndef WAYPOINTLIST_H
 #define WAYPOINTLIST_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include <QMap>
 #include <QVBoxLayout>
 #include <QTimer>
diff --git a/src/ui/WaypointViewOnlyView.h b/src/ui/WaypointViewOnlyView.h
index c50056541cb21a7584e822d985058f00da145d3b..9352475e995086c60ed49094aae25a49df2bb777 100644
--- a/src/ui/WaypointViewOnlyView.h
+++ b/src/ui/WaypointViewOnlyView.h
@@ -1,7 +1,7 @@
 #ifndef WAYPOINTVIEWONLYVIEW_H
 #define WAYPOINTVIEWONLYVIEW_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include "Waypoint.h"
 #include <iostream>
 
diff --git a/src/ui/generated/AudioOutputWidget.h b/src/ui/generated/AudioOutputWidget.h
index 1b9c4caaa644a1a78b47d276cc75169f8d9bc655..18d0259cad731487063acf7cf11500ceb708c60b 100644
--- a/src/ui/generated/AudioOutputWidget.h
+++ b/src/ui/generated/AudioOutputWidget.h
@@ -11,14 +11,14 @@
 #define AUDIOOUTPUTWIDGET_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QGridLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QPushButton>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QGridLayout>
+#include <QHeaderView>
+#include <QPushButton>
+#include <QSpacerItem>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/ui/generated/DebugConsole.h b/src/ui/generated/DebugConsole.h
index 70d7b3073cc5cb86d42de386afc1b986e3305681..be6ac82752874c05454832e3a42d5f861561133d 100644
--- a/src/ui/generated/DebugConsole.h
+++ b/src/ui/generated/DebugConsole.h
@@ -11,19 +11,19 @@
 #define DEBUGCONSOLE_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QCheckBox>
-#include <QtGui/QComboBox>
-#include <QtGui/QGridLayout>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
-#include <QtGui/QPlainTextEdit>
-#include <QtGui/QPushButton>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QGridLayout>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPlainTextEdit>
+#include <QPushButton>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/ui/generated/HDDisplay.h b/src/ui/generated/HDDisplay.h
index aa1049989a7354b0400616b217083b1d6371185a..ae61edd024d4c5762797d86c502b69d7bbc14a18 100644
--- a/src/ui/generated/HDDisplay.h
+++ b/src/ui/generated/HDDisplay.h
@@ -11,13 +11,13 @@
 #define HDDISPLAY_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QGraphicsView>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QGraphicsView>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/ui/generated/JoystickWidget.h b/src/ui/generated/JoystickWidget.h
index 04f4d853b32f3743403fcea727e98a978f2db620..1eb2ee277c556d2bae954a5b595f099c1fdff28c 100644
--- a/src/ui/generated/JoystickWidget.h
+++ b/src/ui/generated/JoystickWidget.h
@@ -11,17 +11,17 @@
 #define JOYSTICKWIDGET_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QDial>
-#include <QtGui/QDialog>
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QGroupBox>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLCDNumber>
-#include <QtGui/QProgressBar>
-#include <QtGui/QSlider>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QDial>
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QGroupBox>
+#include <QHeaderView>
+#include <QLCDNumber>
+#include <QProgressBar>
+#include <QSlider>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/ui/generated/LineChart.h b/src/ui/generated/LineChart.h
index e7862965676740ca4b0f21e0ad5a94170aa05042..7650c6a856bd9112966086c7ff682e87d8ceafe9 100644
--- a/src/ui/generated/LineChart.h
+++ b/src/ui/generated/LineChart.h
@@ -11,15 +11,15 @@
 #define LINECHART_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QGroupBox>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QScrollArea>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QScrollArea>
+#include <QVBoxLayout>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/ui/generated/MAVLinkSettingsWidget.h b/src/ui/generated/MAVLinkSettingsWidget.h
index 946caefcc97fee0ad0a4dd8d2cc15e401b1e1617..a8681e4a667d07bec25d026abfbc63760a33f8d2 100644
--- a/src/ui/generated/MAVLinkSettingsWidget.h
+++ b/src/ui/generated/MAVLinkSettingsWidget.h
@@ -11,14 +11,14 @@
 #define MAVLINKSETTINGSWIDGET_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QCheckBox>
-#include <QtGui/QHeaderView>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QHeaderView>
+#include <QSpacerItem>
+#include <QVBoxLayout>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/ui/generated/MapWidget.h b/src/ui/generated/MapWidget.h
index 48b2b99b5daaa203a9c2769a909e049383d955db..a66d11c064c580aec4041593435a78e2a1413536 100644
--- a/src/ui/generated/MapWidget.h
+++ b/src/ui/generated/MapWidget.h
@@ -11,11 +11,11 @@
 #define MAPWIDGET_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QHeaderView>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QHeaderView>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/ui/generated/ObjectDetectionView.h b/src/ui/generated/ObjectDetectionView.h
index fb30568fa8519f26c208f64b306de51be4cb5501..2da502c1bcb6e9011dd2ff311251c8ffc4fa92e6 100644
--- a/src/ui/generated/ObjectDetectionView.h
+++ b/src/ui/generated/ObjectDetectionView.h
@@ -11,15 +11,15 @@
 #define OBJECTDETECTIONVIEW_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QGridLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QListWidget>
-#include <QtGui/QPushButton>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QGridLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QListWidget>
+#include <QPushButton>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/ui/generated/ParameterInterface.h b/src/ui/generated/ParameterInterface.h
index 593c68ff269e85debe7ce4933d3adfed65cabec5..d18431da26082c0aa8632efbac955c427e0d474b 100644
--- a/src/ui/generated/ParameterInterface.h
+++ b/src/ui/generated/ParameterInterface.h
@@ -11,18 +11,18 @@
 #define PARAMETERINTERFACE_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QComboBox>
-#include <QtGui/QGridLayout>
-#include <QtGui/QGroupBox>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QStackedWidget>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QComboBox>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QStackedWidget>
+#include <QVBoxLayout>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/ui/generated/QGCSensorSettingsWidget.h b/src/ui/generated/QGCSensorSettingsWidget.h
index 19b4f624a80713670580877377da727b8d097d15..96fa1bea6c50ca63c70df98b3ee6aac035d8172a 100644
--- a/src/ui/generated/QGCSensorSettingsWidget.h
+++ b/src/ui/generated/QGCSensorSettingsWidget.h
@@ -11,16 +11,16 @@
 #define QGCSENSORSETTINGSWIDGET_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QCheckBox>
-#include <QtGui/QGridLayout>
-#include <QtGui/QGroupBox>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHeaderView>
+#include <QLabel>
+#include <QPushButton>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/ui/generated/UASControl.h b/src/ui/generated/UASControl.h
index 92cf42a24da116710d6dac2709c6c96c98058c18..f9a8cdee31cc45f8c4d06798c91eff1eb0864e2b 100644
--- a/src/ui/generated/UASControl.h
+++ b/src/ui/generated/UASControl.h
@@ -11,16 +11,16 @@
 #define UASCONTROL_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QComboBox>
-#include <QtGui/QGridLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QComboBox>
+#include <QGridLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QPushButton>
+#include <QSpacerItem>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/ui/generated/UASInfo.h b/src/ui/generated/UASInfo.h
index a1bc94c71ffcf3c93f75664113650ac9cc9d0c08..ebb7bfd7527d45f230cc665d7d01f22f5353014d 100644
--- a/src/ui/generated/UASInfo.h
+++ b/src/ui/generated/UASInfo.h
@@ -11,16 +11,16 @@
 #define UASINFO_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QFrame>
-#include <QtGui/QGridLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QProgressBar>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QFrame>
+#include <QGridLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QProgressBar>
+#include <QSpacerItem>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/ui/generated/UASList.h b/src/ui/generated/UASList.h
index 35b06349f922057f6a9a7f973bd60dcfa135039c..63a00af52f007dba290dbd45b56edf1d75ab3a1c 100644
--- a/src/ui/generated/UASList.h
+++ b/src/ui/generated/UASList.h
@@ -11,11 +11,11 @@
 #define UASLIST_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QHeaderView>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QHeaderView>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/ui/generated/UASView.h b/src/ui/generated/UASView.h
index 1f8e91ebf722f5c44208d49d8b3a9790a4066353..a30ece7c2dcf6eda37fe6fdc56cdbb6eb3f12e5c 100644
--- a/src/ui/generated/UASView.h
+++ b/src/ui/generated/UASView.h
@@ -11,19 +11,19 @@
 #define UASVIEW_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QGridLayout>
-#include <QtGui/QGroupBox>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QProgressBar>
-#include <QtGui/QPushButton>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QToolButton>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QProgressBar>
+#include <QPushButton>
+#include <QSpacerItem>
+#include <QToolButton>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/ui/generated/WatchdogControl.h b/src/ui/generated/WatchdogControl.h
index ec169ffd52fc89909187ef5b131907a256c81190..c864e860860edbf0dfff6c1a0a3dd9721132e3b5 100644
--- a/src/ui/generated/WatchdogControl.h
+++ b/src/ui/generated/WatchdogControl.h
@@ -11,13 +11,13 @@
 #define WATCHDOGCONTROL_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QHeaderView>
+#include <QLabel>
+#include <QVBoxLayout>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/ui/generated/WatchdogProcessView.h b/src/ui/generated/WatchdogProcessView.h
index ad5a60dddfa80853dbcb97fc98fd2c3ca30a5c1b..fff4589f36147700b1c889747c01a24fcde54b39 100644
--- a/src/ui/generated/WatchdogProcessView.h
+++ b/src/ui/generated/WatchdogProcessView.h
@@ -11,14 +11,14 @@
 #define WATCHDOGPROCESSVIEW_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QToolButton>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QToolButton>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/ui/generated/WatchdogView.h b/src/ui/generated/WatchdogView.h
index 2c9fbc44eadcc4de91ce2d2aa2b6183485c23f71..0a56712440b1aa28f7fb59900fa21f9c867ffd0b 100644
--- a/src/ui/generated/WatchdogView.h
+++ b/src/ui/generated/WatchdogView.h
@@ -11,13 +11,13 @@
 #define WATCHDOGVIEW_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QGridLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QGridLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/ui/generated/WaypointList.h b/src/ui/generated/WaypointList.h
index da933424010be19e26949c884fa1c20510a966bc..72df6ece185e62453407b61d36263bf444fb5293 100644
--- a/src/ui/generated/WaypointList.h
+++ b/src/ui/generated/WaypointList.h
@@ -11,18 +11,18 @@
 #define WAYPOINTLIST_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QGridLayout>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
-#include <QtGui/QScrollArea>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QToolButton>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QGridLayout>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QPushButton>
+#include <QScrollArea>
+#include <QSpacerItem>
+#include <QToolButton>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/ui/generated/WaypointView.h b/src/ui/generated/WaypointView.h
index 09cb6580d0cc75976e48b90c7922234580c7bf7a..b4cffa42589a2a14564832feeedc40c36a421c28 100644
--- a/src/ui/generated/WaypointView.h
+++ b/src/ui/generated/WaypointView.h
@@ -11,20 +11,20 @@
 #define WAYPOINTVIEW_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QCheckBox>
-#include <QtGui/QDoubleSpinBox>
-#include <QtGui/QGridLayout>
-#include <QtGui/QGroupBox>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QSpinBox>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QDoubleSpinBox>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QPushButton>
+#include <QSpacerItem>
+#include <QSpinBox>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/ui/generated/XMLCommProtocolWidget.h b/src/ui/generated/XMLCommProtocolWidget.h
index 1ac464298be9d3c654d017899395f98c81355ac7..274f8177bd4ab88f8ecb573c492deee5cf2211b4 100644
--- a/src/ui/generated/XMLCommProtocolWidget.h
+++ b/src/ui/generated/XMLCommProtocolWidget.h
@@ -11,17 +11,17 @@
 #define XMLCOMMPROTOCOLWIDGET_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QGridLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QPlainTextEdit>
-#include <QtGui/QPushButton>
-#include <QtGui/QTextEdit>
-#include <QtGui/QTreeView>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QGridLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QPlainTextEdit>
+#include <QPushButton>
+#include <QTextEdit>
+#include <QTreeView>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/ui/uas/UASView.h b/src/ui/uas/UASView.h
index 70eb11202d6ea7310c0c09cf844a5c1164d74218..218f3a89584cee8fe0864bf976c197c55007d6be 100644
--- a/src/ui/uas/UASView.h
+++ b/src/ui/uas/UASView.h
@@ -32,7 +32,7 @@ This file is part of the QGROUNDCONTROL project
 #ifndef UASVIEW_H
 #define UASVIEW_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include <QString>
 #include <QTimer>
 #include <QMouseEvent>
diff --git a/src/ui/watchdog/WatchdogProcessView.h b/src/ui/watchdog/WatchdogProcessView.h
index 0c5718fe77cb7fb1b513a0c56e1317615d20e88e..2cc9c4a12ce4a1fba8684a8eecdcdf187026c201 100644
--- a/src/ui/watchdog/WatchdogProcessView.h
+++ b/src/ui/watchdog/WatchdogProcessView.h
@@ -31,7 +31,7 @@ This file is part of the QGROUNDCONTROL project
 #ifndef WATCHDOGPROCESSVIEW_H
 #define WATCHDOGPROCESSVIEW_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include <QMap>
 
 namespace Ui
diff --git a/src/ui/watchdog/WatchdogView.h b/src/ui/watchdog/WatchdogView.h
index 84822d20f6ac95cf7392a6ca283fffc2eb49f4b7..4dbabf3925141ddf10eda12e85a009ca3dc6db59 100644
--- a/src/ui/watchdog/WatchdogView.h
+++ b/src/ui/watchdog/WatchdogView.h
@@ -31,7 +31,7 @@ This file is part of the QGROUNDCONTROL project
 #ifndef WATCHDOGVIEW_H
 #define WATCHDOGVIEW_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 namespace Ui
 {