diff --git a/include/state-machine_pool.hpp b/include/state-machine_pool.hpp
index 9e33e11..973b1a0 100644
--- a/include/state-machine_pool.hpp
+++ b/include/state-machine_pool.hpp
@@ -1,7 +1,7 @@
 #ifndef STATEMACHINE_POOL_HPP
 #define STATEMACHINE_POOL_HPP
 
-#include <state_machine.hpp>
+#include "state_machine.hpp"
 
 template<typename StateOwnerType>
 class StateMachinePool {
diff --git a/include/state_factory.hpp b/include/state_factory.hpp
index b6359d0..ec051af 100644
--- a/include/state_factory.hpp
+++ b/include/state_factory.hpp
@@ -2,7 +2,8 @@
 #define STATE_FACTORY_HPP
 
 #include <memory>
-#include <state.hpp>
+
+#include "state.hpp"
 
 
 template <typename OwnerType>
diff --git a/include/state_machine.hpp b/include/state_machine.hpp
index 8bfe412..66381ce 100644
--- a/include/state_machine.hpp
+++ b/include/state_machine.hpp
@@ -3,9 +3,11 @@
 
 #include <string>
 #include <memory>
-#include <nlohmann/json.hpp>
 #include <vector>
-#include <state_factory.hpp>
+
+#include <nlohmann/json.hpp>
+
+#include "state_factory.hpp"
 
 using json = nlohmann::json;
 
diff --git a/include/state_system.hpp b/include/state_system.hpp
index 417375d..3f8b892 100644
--- a/include/state_system.hpp
+++ b/include/state_system.hpp
@@ -1,8 +1,8 @@
 #ifndef STATE_SYSTEM_HPP
 #define STATE_SYSTEM_HPP
 
-#include <state_machine.hpp>
-#include <state-machine_pool.hpp>
+#include "state_machine.hpp"
+#include "state-machine_pool.hpp"
 
 class StateSystem {
     public: