diff --git a/src/register/hei_hardware_register.hpp b/src/register/hei_hardware_register.hpp
index 74e3fa2..8ff876a 100755
--- a/src/register/hei_hardware_register.hpp
+++ b/src/register/hei_hardware_register.hpp
@@ -10,10 +10,11 @@
  * persist as long as prd object model survives.
  */
 
-#include <iipscr.h>
-#include <iipbits.h>
+#include <hei_includes.hpp>
+#include <register/hei_register.hpp>
+#include <util/hei_bit_string.hpp>
+
 #include <prdfHomRegisterAccess.H>
-#include <prdfTrace.H>
 
 namespace libhei
 {