diff --git a/src/qt/qt_vmmanager_details.cpp b/src/qt/qt_vmmanager_details.cpp
index 23fe5377e..a834e35f8 100644
--- a/src/qt/qt_vmmanager_details.cpp
+++ b/src/qt/qt_vmmanager_details.cpp
@@ -26,6 +26,8 @@
 extern bool windows_is_light_theme();
 #endif
 
+using namespace VMManager;
+
 VMManagerDetails::VMManagerDetails(QWidget *parent) :
     QWidget(parent), ui(new Ui::VMManagerDetails) {
     ui->setupUi(this);
diff --git a/src/qt/qt_vmmanager_detailsection.cpp b/src/qt/qt_vmmanager_detailsection.cpp
index bd080e00c..ce42ae281 100644
--- a/src/qt/qt_vmmanager_detailsection.cpp
+++ b/src/qt/qt_vmmanager_detailsection.cpp
@@ -21,6 +21,7 @@
 #include <QPushButton>
 
 const QString VMManagerDetailSection::sectionSeparator = ";";
+using namespace VMManager;
 
 VMManagerDetailSection::
 VMManagerDetailSection(const QString &sectionName)
diff --git a/src/qt/qt_vmmanager_detailsection.hpp b/src/qt/qt_vmmanager_detailsection.hpp
index 2eb63685a..7619a476c 100644
--- a/src/qt/qt_vmmanager_detailsection.hpp
+++ b/src/qt/qt_vmmanager_detailsection.hpp
@@ -60,7 +60,7 @@ public:
 
     ~VMManagerDetailSection() override;
 
-    void addSection(const QString &name, const QString &value, Display::Name displayField = Display::Name::Unknown);
+    void addSection(const QString &name, const QString &value, VMManager::Display::Name displayField = VMManager::Display::Name::Unknown);
     void clear();
 
     CollapseButton *collapseButton;
diff --git a/src/qt/qt_vmmanager_system.cpp b/src/qt/qt_vmmanager_system.cpp
index 08853feab..7ab7e43ca 100644
--- a/src/qt/qt_vmmanager_system.cpp
+++ b/src/qt/qt_vmmanager_system.cpp
@@ -51,6 +51,8 @@ extern "C" {
 #include <86box/mouse.h>
 }
 
+using namespace VMManager;
+
 VMManagerSystem::VMManagerSystem(const QString &sysconfig_file)  {
 
     // The 86Box configuration file
diff --git a/src/qt/qt_vmmanager_system.hpp b/src/qt/qt_vmmanager_system.hpp
index ab2069617..6ac0a7635 100644
--- a/src/qt/qt_vmmanager_system.hpp
+++ b/src/qt/qt_vmmanager_system.hpp
@@ -34,6 +34,8 @@ inline uint qHash(const T &t, uint seed) { \
     return ::qHash(static_cast<typename std::underlying_type<T>::type>(t), seed); \
 }
 
+namespace VMManager {
+Q_NAMESPACE
 namespace Display {
 Q_NAMESPACE
 enum class Name {
@@ -58,11 +60,12 @@ enum class Name {
 Q_ENUM_NS(Name)
 QHASH_FOR_CLASS_ENUM(Name)
 }
+}
 
 class VMManagerSystem : public QWidget {
     Q_OBJECT
 
-    typedef QHash<Display::Name, QString> display_table_t;
+    typedef QHash<VMManager::Display::Name, QString> display_table_t;
     typedef QHash <QString, QHash <QString, QString>> config_hash_t;
 
 public:
@@ -127,7 +130,7 @@ public:
 
     bool window_obscured;
 
-    QString getDisplayValue(Display::Name key);
+    QString getDisplayValue(VMManager::Display::Name key);
     QFileInfoList getScreenshots();
 
     inline bool operator==(const VMManagerSystem &rhs) const