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/util/hei_includes.hpp b/src/util/hei_includes.hpp
new file mode 100644
index 0000000..e927074
--- /dev/null
+++ b/src/util/hei_includes.hpp
@@ -0,0 +1,35 @@
+#pragma once
+
+// The purpose of this file is to include common headers that will be used
+// internally throughout this library. It is advised not to include this in any
+// headers that are installed externally to avoid ballooning the number of
+// headers that are externally exposed.
+
+// Standard library includes
+#include <assert.h>
+#include <inttypes.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#include <algorithm>
+#include <map>
+#include <memory>
+#include <vector>
+
+// Library includes
+#include <hei_chip.hpp>
+#include <hei_types.hpp>
+#include <hei_user_interface.hpp>
+
+// Common macros used throughout this library
+#define HEI_ASSERT(expression) assert(expression)
+
+#define HEI_ERR(...)                                                           \
+    {                                                                          \
+        libhei::hei_err((char*)__VA_ARGS__);                                   \
+    }
+
+#define HEI_INF(...)                                                           \
+    {                                                                          \
+        libhei::hei_inf((char*)__VA_ARGS__);                                   \
+    }