diff --git a/hcore/include/director/commandList.h b/hcore/include/director/commandList.h
index bc78330..56b1464 100644
--- a/hcore/include/director/commandList.h
+++ b/hcore/include/director/commandList.h
@@ -5,6 +5,7 @@
 #include <cstdint>
 #include <mentalEntity.h>
 
+namespace hk {
 namespace director {
 
 /**
@@ -73,5 +74,6 @@ public:
 };
 
 } // namespace director
+} // namespace hk
 
 #endif // DIRECTOR_COMMANDLIST_H
diff --git a/hcore/include/director/director.h b/hcore/include/director/director.h
index 3ccf5ed..5829718 100644
--- a/hcore/include/director/director.h
+++ b/hcore/include/director/director.h
@@ -3,6 +3,7 @@
 
 #include <config.h>
 
+namespace hk {
 namespace director {
 
 class Director {
@@ -12,5 +13,6 @@ public:
 };
 
 } // namespace director
+} // namespace hk
 
 #endif // DIRECTOR_H
diff --git a/hcore/include/goal.h b/hcore/include/goal.h
index 08aef07..afdcd4b 100644
--- a/hcore/include/goal.h
+++ b/hcore/include/goal.h
@@ -14,6 +14,6 @@ private:
     simulator::Scene scene;
 };
 
-}
+} // namespace hk
 
 #endif
diff --git a/hcore/include/mentalEntity.h b/hcore/include/mentalEntity.h
index 96b5f70..c856e66 100644
--- a/hcore/include/mentalEntity.h
+++ b/hcore/include/mentalEntity.h
@@ -1,10 +1,14 @@
 #ifndef _MENTAL_ENTITY_H
 #define _MENTAL_ENTITY_H
 
+namespace hk {
+
 class MentalEntity
 {
 public:
     using Id = uint32_t;
 };
 
+} // namespace hk
+
 #endif
diff --git a/hcore/include/mind.h b/hcore/include/mind.h
index cff354d..fe93d4c 100644
--- a/hcore/include/mind.h
+++ b/hcore/include/mind.h
@@ -7,6 +7,8 @@
 #include <director/director.h>
 #include <simulator/simulator.h>
 
+namespace hk {
+
 class Mind
 {
 public:
@@ -18,4 +20,6 @@ public:
 	simulator::Simulator simulator;
 };
 
+} // namespace hk
+
 #endif
diff --git a/hcore/include/simulator/commandList.h b/hcore/include/simulator/commandList.h
index 959380c..476c855 100644
--- a/hcore/include/simulator/commandList.h
+++ b/hcore/include/simulator/commandList.h
@@ -5,6 +5,7 @@
 #include <cstdint>
 #include <mentalEntity.h>
 
+namespace hk {
 namespace simulator {
 
 /**
@@ -73,5 +74,6 @@ public:
 };
 
 } // namespace simulator
+} // namespace hk
 
 #endif // SIMULATOR_COMMANDLIST_H
diff --git a/hcore/include/simulator/scene.h b/hcore/include/simulator/scene.h
index e3ead27..ea3e15b 100644
--- a/hcore/include/simulator/scene.h
+++ b/hcore/include/simulator/scene.h
@@ -6,6 +6,7 @@
 #include <mentalEntity.h>
 #include <simulator/commandList.h>
 
+namespace hk {
 namespace simulator {
 
 class Scene
@@ -32,7 +33,8 @@ private:
     CommandList::Cursor cursor;
 };
 
-}
+} // namespace simulator
+} // namespace hk
 
 #endif
 
diff --git a/hcore/include/simulator/simulator.h b/hcore/include/simulator/simulator.h
index 741edc6..6dbf71e 100644
--- a/hcore/include/simulator/simulator.h
+++ b/hcore/include/simulator/simulator.h
@@ -4,6 +4,7 @@
 #include <config.h>
 #include <simulator/scene.h>
 
+namespace hk {
 namespace simulator {
 
 class Simulator {
@@ -19,6 +20,7 @@ private:
     Scene scene;
 };
 
-}
+} // namespace simulator
+} // namespace hk
 
 #endif // SIMULATOR_H
\ No newline at end of file