diff --git a/src/chip_data/hei_chip_data_stream.hpp b/src/chip_data/hei_chip_data_stream.hpp
index 25b8635..8b59fe9 100755
--- a/src/chip_data/hei_chip_data_stream.hpp
+++ b/src/chip_data/hei_chip_data_stream.hpp
@@ -20,9 +20,10 @@
 **/
 
 #include <endian.h>
-#include <hei_includes.hpp>
 #include <string.h>
 
+#include <hei_includes.hpp>
+
 namespace libhei
 {
 
diff --git a/src/hei_includes.hpp b/src/hei_includes.hpp
index 0b33436..2f225f1 100644
--- a/src/hei_includes.hpp
+++ b/src/hei_includes.hpp
@@ -7,8 +7,9 @@
  */
 
 // Standard library includes
-#include <stdlib.h>
 #include <stdint.h>
+#include <stdlib.h>
+
 #include <map>
 #include <vector>
 
diff --git a/src/isolator/hei_isolation_node.hpp b/src/isolator/hei_isolation_node.hpp
index 3fc8a37..e2ab485 100644
--- a/src/isolator/hei_isolation_node.hpp
+++ b/src/isolator/hei_isolation_node.hpp
@@ -2,8 +2,8 @@
 
 #include <hei_includes.hpp>
 #include <hei_isolation_data.hpp>
-#include <register/hei_register.hpp>
 #include <register/hei_hardware_register.hpp>
+#include <register/hei_register.hpp>
 #include <util/hei_bit_string.hpp>
 #include <util/hei_flyweight.hpp>
 
diff --git a/src/isolator/hei_isolator.cpp b/src/isolator/hei_isolator.cpp
index 45ca647..75dfb96 100644
--- a/src/isolator/hei_isolator.cpp
+++ b/src/isolator/hei_isolator.cpp
@@ -1,6 +1,6 @@
 
-#include <isolator/hei_isolator.hpp>
 #include <isolator/hei_isolation_node.hpp>
+#include <isolator/hei_isolator.hpp>
 #include <register/hei_hardware_register.hpp>
 #include <util/hei_flyweight.hpp>
 
diff --git a/src/util/hei_bit_string.cpp b/src/util/hei_bit_string.cpp
index 25443a6..24de34e 100755
--- a/src/util/hei_bit_string.cpp
+++ b/src/util/hei_bit_string.cpp
@@ -2,9 +2,8 @@
  *  @brief BitString and BitStringBuffer class definitions
  */
 
-#include <util/hei_bit_string.hpp>
-
 #include <hei_user_defines.hpp>
+#include <util/hei_bit_string.hpp>
 
 #include <algorithm>
 
diff --git a/src/util/hei_flyweight.hpp b/src/util/hei_flyweight.hpp
index cd56d82..de0f055 100644
--- a/src/util/hei_flyweight.hpp
+++ b/src/util/hei_flyweight.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <algorithm>
 #include <vector>
 
diff --git a/test/bit_string_test.cpp b/test/bit_string_test.cpp
index 8745911..e24a550 100644
--- a/test/bit_string_test.cpp
+++ b/test/bit_string_test.cpp
@@ -1,5 +1,6 @@
 #include <hei_user_defines.hpp>
 #include <util/hei_bit_string.hpp>
+
 #include "gtest/gtest.h"
 
 using namespace libhei;
diff --git a/test/hei_user_defines.hpp b/test/hei_user_defines.hpp
index eec606d..2ba5b8b 100644
--- a/test/hei_user_defines.hpp
+++ b/test/hei_user_defines.hpp
@@ -6,8 +6,8 @@
  *        will be used throughout this library.
  */
 
-#include <stdio.h>
 #include <assert.h>
+#include <stdio.h>
 
 #define HEI_INF(...) \
     { \
diff --git a/test/simulator/hei_sim_user_interface.cpp b/test/simulator/hei_sim_user_interface.cpp
index 073ae22..ad27981 100644
--- a/test/simulator/hei_sim_user_interface.cpp
+++ b/test/simulator/hei_sim_user_interface.cpp
@@ -1,6 +1,5 @@
-#include <hei_user_interface.hpp>
-
 #include <hei_includes.hpp>
+#include <hei_user_interface.hpp>
 
 namespace libhei
 {