diff --git a/src/hei_includes.hpp b/src/hei_includes.hpp
index 61791f4..40bdfc7 100644
--- a/src/hei_includes.hpp
+++ b/src/hei_includes.hpp
@@ -1,18 +1,33 @@
 #pragma once
 
-/**
- * @file  hei_includes.hpp
- * @brief The purpose of this file is to include common headers that will be
- *        used throughout this library.
- */
+// 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 <map>
 #include <vector>
 
-// Internal includes
+// 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__);                                   \
+    }