diff --git a/smocore/include/mind.h b/smocore/include/mind.h
index 14c7f4f..7d24aa7 100644
--- a/smocore/include/mind.h
+++ b/smocore/include/mind.h
@@ -85,8 +85,10 @@ private:
 	class MindThreadLifetimeMgmtOp;
 };
 
+namespace mind {
 // Global Mind instance will be defined in marionette.cpp
 extern std::shared_ptr<Mind> globalMind;
+} // namespace mind
 
 } // namespace smo
 
diff --git a/smocore/include/mindManager/mindManager.h b/smocore/include/mindManager/mindManager.h
index 51b7386..3b7f112 100644
--- a/smocore/include/mindManager/mindManager.h
+++ b/smocore/include/mindManager/mindManager.h
@@ -40,8 +40,6 @@ public:
 	std::vector<std::shared_ptr<Mind>> minds;
 };
 
-extern std::shared_ptr<Mind> globalMind;
-
 } // namespace mind
 } // namespace smo
 
diff --git a/smocore/include/nonNeutralQualia.h b/smocore/include/nonNeutralQualia.h
index bdbcd2b..de3a29e 100644
--- a/smocore/include/nonNeutralQualia.h
+++ b/smocore/include/nonNeutralQualia.h
@@ -3,6 +3,8 @@
 
 #include <quale.h>
 
+namespace smo {
+
 class PleasurableQuale
 : public NonNeutralQuale
 {
@@ -17,4 +19,6 @@ public:
 	virtual void eventInd(void);
 };
 
+} // namespace smo
+
 #endif
diff --git a/smocore/include/quale.h b/smocore/include/quale.h
index a919bbd..ae19ee7 100644
--- a/smocore/include/quale.h
+++ b/smocore/include/quale.h
@@ -2,8 +2,10 @@
 #define _QUALE_H
 
 #include <cstdint>
+#include <mentalEntity.h>
+#include <mentenon.h>
 #include <attentionTrigger.h>
-#include <implexa.h>
+#include <implex/implix.h>
 
 namespace smo {
 
diff --git a/smocore/senseApis/senseApiManager.cpp b/smocore/senseApis/senseApiManager.cpp
index 35940e5..0618393 100644
--- a/smocore/senseApis/senseApiManager.cpp
+++ b/smocore/senseApis/senseApiManager.cpp
@@ -9,6 +9,7 @@
 #include <asynchronousContinuation.h>
 #include <asynchronousLoop.h>
 #include <user/senseApiDesc.h>
+#include <mind.h>
 #include <deviceManager/deviceManager.h>
 
 namespace fs = std::filesystem;