diff --git a/src/register/prdfHomRegisterAccess.C b/src/register/prdfHomRegisterAccess.C
index 8b6f811..8c3cab6 100755
--- a/src/register/prdfHomRegisterAccess.C
+++ b/src/register/prdfHomRegisterAccess.C
@@ -30,25 +30,22 @@
 //----------------------------------------------------------------------
 //  Includes
 //----------------------------------------------------------------------
-#define prdfHomRegisterAccess_C
+
+#include <hei_includes.hpp>
+#include <util/hei_bit_string.hpp>
 
 #include <prdfHomRegisterAccess.H>
 #include <prdf_service_codes.H>
-#include <iipbits.h>
 #include <prdfMain.H>
 #include <prdfPlatServices.H>
 #include <prdfGlobal.H>
 #include <prdfErrlUtil.H>
-#include <prdfTrace.H>
 
 #ifdef __HOSTBOOT_RUNTIME
 #include <pm_common_ext.H>
 #include <p9_stop_api.H>
 #endif
 
-#undef prdfHomRegisterAccess_C
-
-
 using namespace TARGETING;
 
 namespace PRDF