diff --git a/src/locationlabs/qmapobjectview_p.h b/src/locationlabs/qmapobjectview_p.h
index 5477ca7230c81f1d7ac1fb8380296f995b423a46..80f923fd6d1844ec4890b84894541385ba2f67f2 100644
--- a/src/locationlabs/qmapobjectview_p.h
+++ b/src/locationlabs/qmapobjectview_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QGEOMAPLAYER_P_H
-#define QGEOMAPLAYER_P_H
+#ifndef QMAPOBJECTVIEW_P_H
+#define QMAPOBJECTVIEW_P_H
 
 //
 //  W A R N I N G
@@ -52,6 +52,8 @@
 #include <QQmlComponent>
 #include <QVector>
 
+QT_BEGIN_NAMESPACE
+
 class QQmlDelegateModel;
 class QMapObjectViewPrivate;
 class QQmlChangeSet;
@@ -108,4 +110,6 @@ protected:
     QVector<QPointer<QGeoMapObject>> m_userAddedMapObjects; // A third list containing the objects dynamically added through addMapObject
 };
 
-#endif // QGEOMAPLAYER_P_H
+QT_END_NAMESPACE
+
+#endif // QMAPOBJECTVIEW_P_H
diff --git a/src/locationlabs/qmapobjectview_p_p.h b/src/locationlabs/qmapobjectview_p_p.h
index af6bdf8f95a6616053298988923606955850a55c..bbee557e73ddd5fbda9592ddbb2e2472d567fb56 100644
--- a/src/locationlabs/qmapobjectview_p_p.h
+++ b/src/locationlabs/qmapobjectview_p_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QGEOMAPLAYER_P_P_H
-#define QGEOMAPLAYER_P_P_H
+#ifndef QMAPOBJECTVIEW_P_P_H
+#define QMAPOBJECTVIEW_P_P_H
 
 
 //
@@ -54,6 +54,8 @@
 #include <QVector>
 #include <QQmlComponent>
 
+QT_BEGIN_NAMESPACE
+
 class QQmlDelegateModel;
 class QGeoMap;
 class Q_LOCATION_PRIVATE_EXPORT QMapObjectViewPrivate : public QGeoMapObjectPrivate
@@ -78,4 +80,6 @@ public:
     QGeoMapObjectPrivate *clone() override;
 };
 
-#endif // QGEOMAPLAYER_P_P_H
+QT_END_NAMESPACE
+
+#endif // QMAPOBJECTVIEW_P_P_H