diff --git a/smocore/include/deviceManager/device.h b/smocore/include/deviceManager/device.h
index 8bda166..d21836c 100644
--- a/smocore/include/deviceManager/device.h
+++ b/smocore/include/deviceManager/device.h
@@ -13,9 +13,6 @@ namespace device {
 class Device
 {
 public:
-    std::string deviceIdentifier;
-    std::vector<std::shared_ptr<DeviceAttachmentSpec>> deviceAttachmentSpecs;
-
     Device(const std::string& identifier) : deviceIdentifier(identifier) {}
 
     std::string stringify() const
@@ -28,6 +25,10 @@ public:
         }
         return os.str();
     }
+
+public:
+	std::string deviceIdentifier;
+	std::vector<std::shared_ptr<DeviceAttachmentSpec>> deviceAttachmentSpecs;
 };
 
 } // namespace device
diff --git a/smocore/include/deviceManager/deviceManager.h b/smocore/include/deviceManager/deviceManager.h
index d63740f..5512c47 100644
--- a/smocore/include/deviceManager/deviceManager.h
+++ b/smocore/include/deviceManager/deviceManager.h
@@ -7,9 +7,9 @@
 #include <opts.h>
 #include <utility>
 #include <iostream>
+#include <functional>
 #include <user/deviceAttachmentSpec.h>
 #include <deviceManager/device.h>
-#include <functional>
 
 namespace smo {
 namespace device {