6 files changed, 12 insertions, 7 deletions
diff --git a/src/common/qdbusactiongroup.cpp b/src/common/qdbusactiongroup.cpp
index d25f2de..5a9e0bd 100644
--- a/src/common/qdbusactiongroup.cpp
+++ b/src/common/qdbusactiongroup.cpp
@@ -21,9 +21,9 @@
 #include "qstateaction.h"
 #include "converter.h"
 
-#include <QDebug>
-
+extern "C" {
 #include <gio/gio.h>
+}
 
 /*!
     \qmlclass QDBusActionGroup
diff --git a/src/common/qdbusactiongroup.h b/src/common/qdbusactiongroup.h
index 2bd0a15..518f78c 100644
--- a/src/common/qdbusactiongroup.h
+++ b/src/common/qdbusactiongroup.h
@@ -23,8 +23,7 @@
 #include "qdbusobject.h"
 
 #include <QObject>
-#include <QAction>
-#include <QSet>
+#include <QVariant>
 
 class QStateAction;
 
diff --git a/src/common/qdbusmenumodel.cpp b/src/common/qdbusmenumodel.cpp
index 354b10b..88a6084 100644
--- a/src/common/qdbusmenumodel.cpp
+++ b/src/common/qdbusmenumodel.cpp
@@ -18,7 +18,6 @@
  */
 
 #include "qdbusmenumodel.h"
-#include <QDebug>
 
 /*!
     \qmlclass QDBusMenuModel
diff --git a/src/common/qdbusmenumodel.h b/src/common/qdbusmenumodel.h
index 2660ffe..fdf23f7 100644
--- a/src/common/qdbusmenumodel.h
+++ b/src/common/qdbusmenumodel.h
@@ -23,7 +23,9 @@
 #include "qdbusobject.h"
 #include "qmenumodel.h"
 
+extern "C" {
 #include <gio/gio.h>
+}
 
 class QDBusMenuModel : public QMenuModel, public QDBusObject
 {
diff --git a/src/common/qdbusobject.h b/src/common/qdbusobject.h
index a3cef38..ef2b42f 100644
--- a/src/common/qdbusobject.h
+++ b/src/common/qdbusobject.h
@@ -20,9 +20,11 @@
 #ifndef QDBUSOBJECT_H
 #define QDBUSOBJECT_H
 
-#include <QObject>
-
+extern "C" {
 #include <gio/gio.h>
+}
+
+#include <QString>
 
 #include "dbus-enums.h"
 
diff --git a/src/common/qmenumodel.h b/src/common/qmenumodel.h
index 598efd6..7520480 100644
--- a/src/common/qmenumodel.h
+++ b/src/common/qmenumodel.h
@@ -21,7 +21,10 @@
 #define QMENUMODEL_H
 
 #include <QAbstractListModel>
+
+extern "C" {
 #include <gio/gio.h>
+}
 
 class QMenuModel : public QAbstractListModel
 {