Reduce includes

src/globalshortcuts/globalshortcut-win.cpp

@@ -18,16 +18,10 @@
  */
 
 #include <QtGlobal>
-#include <QObject>
-#include <QAbstractEventDispatcher>
 #include <QByteArray>
 
 #include <qt_windows.h>
 
-#include "core/logging.h"
-
-#include "globalshortcuts.h"
-#include "globalshortcutbackend.h"
 #include "globalshortcut.h"
 #include "keymapper_win.h"
 

src/globalshortcuts/globalshortcut-x11.cpp

@@ -20,20 +20,14 @@
 #include "config.h"
 
 #include <QtGlobal>
-#include <QApplication>
-#include <QObject>
-#include <QAbstractEventDispatcher>
-#include <QDataStream>
+#include <QMap>
 #include <QVector>
 #include <QByteArray>
+#include <QString>
 #include <QX11Info>
 #include <QKeySequence>
-#include <QtAlgorithms>
+#include <QFlags>
 
-#include "core/logging.h"
-
-#include "globalshortcuts.h"
-#include "globalshortcutbackend.h"
 #include "globalshortcut.h"
 #include "keymapper_x11.h"
 

src/globalshortcuts/globalshortcut.cpp

@@ -21,15 +21,14 @@
 
 #include <QtGlobal>
 #include <QObject>
-#include <QApplication>
 #include <QAbstractEventDispatcher>
 #include <QPair>
 #include <QHash>
+#include <QFlags>
 #include <QtDebug>
 
 #include "core/logging.h"
 
-#include "globalshortcutbackend.h"
 #include "globalshortcut.h"
 
 GlobalShortcut *GlobalShortcut::initialized_ = nullptr;

src/globalshortcuts/globalshortcut.h

@@ -22,7 +22,6 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QAbstractNativeEventFilter>
@@ -31,6 +30,7 @@
 #include <QVector>
 #include <QHash>
 #include <QByteArray>
+#include <QString>
 
 class GlobalShortcutBackend;
 

src/globalshortcuts/globalshortcutbackend-gsd.cpp

@@ -30,6 +30,8 @@
 #include <QDBusMessage>
 #include <QDBusPendingCallWatcher>
 #include <QDBusPendingReply>
+#include <QAction>
+#include <QtDebug>
 
 #include "core/closure.h"
 #include "core/logging.h"

src/globalshortcuts/globalshortcutbackend-gsd.h

@@ -23,17 +23,12 @@
 
 #include "config.h"
 
-
 #include <QObject>
-#include <QtGlobal>
-#include <QPair>
-#include <QVector>
-#include <QHash>
 #include <QString>
-#include <QDBusPendingCallWatcher>
 
 #include "globalshortcutbackend.h"
 
+class QDBusPendingCallWatcher;
 class GlobalShortcuts;
 class OrgGnomeSettingsDaemonMediaKeysInterface;
 

src/globalshortcuts/globalshortcutbackend-system.cpp

@@ -23,9 +23,10 @@
 
 #include "core/logging.h"
 
-#include <QtGlobal>
 #include <QObject>
+#include <QMap>
 #include <QAction>
+#include <QKeySequence>
 #include <QtAlgorithms>
 
 #include "globalshortcuts.h"

src/globalshortcuts/globalshortcutbackend-system.h

@@ -24,15 +24,13 @@
 
 #include "core/logging.h"
 
-
 #include <QObject>
-#include <QtGlobal>
-#include <QAction>
 #include <QList>
-#include <QKeySequence>
+#include <QString>
 
 #include "globalshortcutbackend.h"
 
+class QAction;
 class GlobalShortcuts;
 class GlobalShortcut;
 

src/globalshortcuts/globalshortcutbackend.h

@@ -23,11 +23,7 @@
 
 #include "config.h"
 
-
-#include <QtGlobal>
 #include <QObject>
-#include <QPair>
-#include <QHash>
 #include <QString>
 
 class GlobalShortcuts;

src/globalshortcuts/globalshortcutgrabber.cpp

@@ -23,18 +23,17 @@
 #include <QDialog>
 #include <QWidget>
 #include <QString>
-#include <QStringBuilder>
 #include <QLabel>
 #include <QKeySequence>
-#include <QtEvents>
+#include <QDialogButtonBox>
+#include <QEvent>
+#include <QShowEvent>
+#include <QHideEvent>
+#include <QKeyEvent>
 
 #include "globalshortcutgrabber.h"
 #include "ui_globalshortcutgrabber.h"
 
-class QShowEvent;
-class QHideEvent;
-class QKeyEvent;
-
 GlobalShortcutGrabber::GlobalShortcutGrabber(QWidget *parent)
     : QDialog(parent), ui_(new Ui::GlobalShortcutGrabber) {
   ui_->setupUi(this);

src/globalshortcuts/globalshortcutgrabber.h

@@ -23,14 +23,12 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QWidget>
 #include <QDialog>
 #include <QList>
 #include <QString>
 #include <QKeySequence>
-#include <QtEvents>
 
 class QEvent;
 class QHideEvent;

src/globalshortcuts/globalshortcuts.cpp

@@ -34,8 +34,6 @@
 #include <QX11Info>
 #endif
 
-#include "core/logging.h"
-
 #include "globalshortcuts.h"
 #include "globalshortcutbackend.h"
 

src/globalshortcuts/globalshortcuts.h

@@ -24,18 +24,15 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QWidget>
 #include <QMap>
 #include <QString>
-#include <QAction>
-#include <QShortcut>
 #include <QKeySequence>
 #include <QSettings>
 
-#include "globalshortcut.h"
-
+class QShortcut;
+class QAction;
 class GlobalShortcutBackend;
 
 class GlobalShortcuts : public QWidget {