diff --git a/src/chip_data/hei_chip_data_stream.hpp b/src/chip_data/hei_chip_data_stream.hpp
index 33d03a3..1ca28af 100644
--- a/src/chip_data/hei_chip_data_stream.hpp
+++ b/src/chip_data/hei_chip_data_stream.hpp
@@ -3,7 +3,7 @@
 #include <endian.h>
 #include <string.h>
 
-#include <hei_includes.hpp>
+#include <util/hei_includes.hpp>
 
 namespace libhei
 {
diff --git a/src/isolator/hei_isolation_node.hpp b/src/isolator/hei_isolation_node.hpp
index 053cd1c..ebb1850 100644
--- a/src/isolator/hei_isolation_node.hpp
+++ b/src/isolator/hei_isolation_node.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <hei_includes.hpp>
 #include <hei_isolation_data.hpp>
 #include <register/hei_hardware_register.hpp>
+#include <util/hei_includes.hpp>
 
 namespace libhei
 {
diff --git a/src/isolator/hei_isolator.cpp b/src/isolator/hei_isolator.cpp
index 902fbe6..f431cb3 100644
--- a/src/isolator/hei_isolator.cpp
+++ b/src/isolator/hei_isolator.cpp
@@ -1,10 +1,10 @@
 
-#include <hei_includes.hpp>
 #include <isolator/hei_isolation_node.hpp>
 #include <isolator/hei_isolator.hpp>
 #include <register/hei_operator_register.hpp>
 #include <register/hei_scom_register.hpp>
 #include <util/hei_flyweight.hpp>
+#include <util/hei_includes.hpp>
 
 namespace libhei
 {
diff --git a/src/register/hei_hardware_register.cpp b/src/register/hei_hardware_register.cpp
index 2aa1544..56a1afd 100644
--- a/src/register/hei_hardware_register.cpp
+++ b/src/register/hei_hardware_register.cpp
@@ -1,7 +1,7 @@
 #include <hei_bit_string.hpp>
-#include <hei_includes.hpp>
 #include <hei_user_interface.hpp>
 #include <register/hei_hardware_register.hpp>
+#include <util/hei_includes.hpp>
 
 namespace libhei
 {
diff --git a/src/register/hei_hardware_register.hpp b/src/register/hei_hardware_register.hpp
index fedece0..fb39d1e 100644
--- a/src/register/hei_hardware_register.hpp
+++ b/src/register/hei_hardware_register.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <hei_bit_string.hpp>
-#include <hei_includes.hpp>
 #include <register/hei_register.hpp>
+#include <util/hei_includes.hpp>
 
 namespace libhei
 {
diff --git a/src/register/hei_register.hpp b/src/register/hei_register.hpp
index ff630f3..23692e5 100644
--- a/src/register/hei_register.hpp
+++ b/src/register/hei_register.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <hei_bit_string.hpp>
-#include <hei_includes.hpp>
+#include <util/hei_includes.hpp>
 
 namespace libhei
 {
diff --git a/src/util/hei_bit_string.cpp b/src/util/hei_bit_string.cpp
index 9129663..53a4d4c 100644
--- a/src/util/hei_bit_string.cpp
+++ b/src/util/hei_bit_string.cpp
@@ -3,7 +3,7 @@
  */
 
 #include <hei_bit_string.hpp>
-#include <hei_includes.hpp>
+#include <util/hei_includes.hpp>
 
 #include <algorithm>
 
diff --git a/src/hei_includes.hpp b/src/util/hei_includes.hpp
similarity index 100%
rename from src/hei_includes.hpp
rename to src/util/hei_includes.hpp
diff --git a/test/simulator/sim_hardware_access.cpp b/test/simulator/sim_hardware_access.cpp
index d0625cc..370b92f 100644
--- a/test/simulator/sim_hardware_access.cpp
+++ b/test/simulator/sim_hardware_access.cpp
@@ -7,8 +7,8 @@
 
 #include <endian.h>
 
-#include <hei_includes.hpp>
 #include <hei_user_interface.hpp>
+#include <util/hei_includes.hpp>
 
 namespace libhei
 {