diff --git a/src/plugins/macros/actionmacrohandler.h b/src/plugins/macros/actionmacrohandler.h
index 9d3cb920867..704818cc2a4 100644
--- a/src/plugins/macros/actionmacrohandler.h
+++ b/src/plugins/macros/actionmacrohandler.h
@@ -36,10 +36,12 @@
 
 #include "imacrohandler.h"
 
-#include <QSet>
+#include <QtCore/QSet>
 
+QT_BEGIN_NAMESPACE
 class QAction;
 class QSignalMapper;
+QT_END_NAMESPACE
 
 namespace Macros {
 namespace Internal {
diff --git a/src/plugins/macros/macromanager.h b/src/plugins/macros/macromanager.h
index 9298a1e6fc0..1ba95b240a0 100644
--- a/src/plugins/macros/macromanager.h
+++ b/src/plugins/macros/macromanager.h
@@ -34,12 +34,14 @@
 #ifndef MACROSPLUGIN_MACROMANAGER_H
 #define MACROSPLUGIN_MACROMANAGER_H
 
-#include <QObject>
-#include <QMap>
-
 #include "macros_global.h"
 
+#include <QtCore/QObject>
+#include <QtCore/QMap>
+
+QT_BEGIN_NAMESPACE
 class QAction;
+QT_END_NAMESPACE
 
 namespace Macros {
 
diff --git a/src/plugins/macros/macrooptionswidget.h b/src/plugins/macros/macrooptionswidget.h
index 565c0450dea..16e17f4383b 100644
--- a/src/plugins/macros/macrooptionswidget.h
+++ b/src/plugins/macros/macrooptionswidget.h
@@ -39,7 +39,9 @@
 #include <QMap>
 #include <QStringList>
 
+QT_BEGIN_NAMESPACE
 class QTreeWidgetItem;
+QT_END_NAMESPACE
 
 
 namespace Macros {
diff --git a/src/plugins/macros/macrosettings.h b/src/plugins/macros/macrosettings.h
index 5fcae26c8b9..62466dcc092 100644
--- a/src/plugins/macros/macrosettings.h
+++ b/src/plugins/macros/macrosettings.h
@@ -34,12 +34,14 @@
 #ifndef MACROSPLUGIN_MACROSETTINGS_H
 #define MACROSPLUGIN_MACROSETTINGS_H
 
-#include <QString>
-#include <QStringList>
-#include <QMap>
-#include <QVariant>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QMap>
+#include <QtCore/QVariant>
 
+QT_BEGIN_NAMESPACE
 class QSettings;
+QT_END_NAMESPACE
 
 namespace Macros {
 namespace Internal {