Merged hei_macros.hpp and hei_includes.hpp

Change-Id: Ieaddde93b376066bd7e7e970c15fcb6700c449ad
Signed-off-by: Zane Shelley <zshelle@us.ibm.com>
diff --git a/test/simulator/sim_hardware_access.cpp b/test/simulator/sim_hardware_access.cpp
index e4fdd19..25cc8bd 100644
--- a/test/simulator/sim_hardware_access.cpp
+++ b/test/simulator/sim_hardware_access.cpp
@@ -7,7 +7,7 @@
 
 #include <endian.h>
 
-#include <hei_macros.hpp>
+#include <hei_includes.hpp>
 #include <hei_user_interface.hpp>
 
 namespace libhei