diff --git a/src/register/hei_hardware_register.cpp b/src/register/hei_hardware_register.cpp
index a582cae..c8cc1dc 100755
--- a/src/register/hei_hardware_register.cpp
+++ b/src/register/hei_hardware_register.cpp
@@ -9,10 +9,11 @@
 //  Includes
 //----------------------------------------------------------------------
 
+#include <hei_includes.hpp>
+#include <register/hei_hardware_register.hpp>
+#include <util/hei_bit_string.hpp>
+
 #include <iipchip.h>
-#include <prdfScomRegister.H>
-#include <iipconst.h>
-#include <iipbits.h>
 #include <prdfMain.H>
 #include <prdfRasServices.H>
 #include <prdfRegisterCache.H>
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
 {
diff --git a/src/register/hei_operator_register.hpp b/src/register/hei_operator_register.hpp
index 14875b4..748280c 100755
--- a/src/register/hei_operator_register.hpp
+++ b/src/register/hei_operator_register.hpp
@@ -2,7 +2,8 @@
 
 #include <algorithm>
 
-#include <iipscr.h>
+#include <register/hei_register.hpp>
+
 #include <prdrCommon.H>
 
 namespace libhei
diff --git a/src/register/hei_register.cpp b/src/register/hei_register.cpp
index 3e28a86..ac31f91 100755
--- a/src/register/hei_register.cpp
+++ b/src/register/hei_register.cpp
@@ -15,11 +15,9 @@
 /*  Includes                                                          */
 /*--------------------------------------------------------------------*/
 
-#include <iipbits.h>
-#include <iipscr.h>
-#include <iipconst.h>
-
-#include <prdfAssert.h>
+#include <hei_includes.hpp>
+#include <register/hei_register.hpp>
+#include <util/hei_bit_string.hpp>
 
 namespace libhei
 {
diff --git a/src/register/hei_register.hpp b/src/register/hei_register.hpp
index e03e819..be769f3 100755
--- a/src/register/hei_register.hpp
+++ b/src/register/hei_register.hpp
@@ -17,11 +17,11 @@
 //  Includes
 //----------------------------------------------------------------------
 
-#include <iipbits.h>
-#include <iipconst.h>
+#include <hei_includes.hpp>
+#include <util/hei_bit_string.hpp>
+
 #include <iipsdbug.h>
 #include <prdfMain.H>
-#include <prdfTrace.H>
 
 namespace libhei
 {
diff --git a/src/register/iipCaptureData.h b/src/register/iipCaptureData.h
index e65e94d..7f2d7a0 100755
--- a/src/register/iipCaptureData.h
+++ b/src/register/iipCaptureData.h
@@ -78,9 +78,8 @@
 
 #include <list>
 
-#ifndef IIPCONST_H
-#include <iipconst.h>
-#endif
+#include <hei_includes.hpp>
+
 #include <prdfPlatServices.H>
 #include <functional>  // @jl04 a Needed for the unary function in new predicate.
 
diff --git a/src/register/prdfCaptureData.C b/src/register/prdfCaptureData.C
index 3911350..6078347 100755
--- a/src/register/prdfCaptureData.C
+++ b/src/register/prdfCaptureData.C
@@ -31,9 +31,10 @@
 //  Includes
 //----------------------------------------------------------------------
 
-#include <iipbits.h>
+#include <register/hei_hardware_register.hpp>
+#include <util/hei_bit_string.hpp>
+
 #include <prdfHomRegisterAccess.H>  // dg06a
-#include <prdfScomRegister.H>
 #include <iipchip.h>
 #include <iipCaptureData.h>
 #include <string.h>
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
diff --git a/src/register/prdfRegisterCache.C b/src/register/prdfRegisterCache.C
index e7d29ff..b0fae57 100644
--- a/src/register/prdfRegisterCache.C
+++ b/src/register/prdfRegisterCache.C
@@ -23,8 +23,9 @@
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
 
+#include <hei_includes.hpp>
+
 #include <prdfRegisterCache.H>
-#include <iipconst.h>
 
 namespace PRDF
 {
diff --git a/src/register/prdfRegisterCache.H b/src/register/prdfRegisterCache.H
index be34884..995ab03 100644
--- a/src/register/prdfRegisterCache.H
+++ b/src/register/prdfRegisterCache.H
@@ -29,14 +29,14 @@
 /** @file prdfRegisterCache.H */
 
 #include <map>
-#include <iipbits.h>
+
+#include <util/hei_bit_string.hpp>
+
 #include <prdfGlobal.H>
 #include <prdfScanFacility.H>
 #include <prdfScomRegisterAccess.H>
 #include <prdfTargetFwdRef.H>
 
-class BitString;
-
 namespace PRDF
 {
 /**
diff --git a/src/register/prdfScanFacility.C b/src/register/prdfScanFacility.C
index 1607d95..547377f 100755
--- a/src/register/prdfScanFacility.C
+++ b/src/register/prdfScanFacility.C
@@ -30,16 +30,14 @@
 //----------------------------------------------------------------------
 //  Includes
 //----------------------------------------------------------------------
-#define prdfScanFacility_C
 
-#include <iipscr.h>
+#include <register/hei_register.hpp>
+
 #include <prdfScanFacility.H>
 #include <prdfFlyWeight.C>
 #include <prdfFlyWeightS.C>
 #include <prdfScomRegisterAccess.H>
 
-#undef prdfScanFacility_C
-
 namespace PRDF
 {
 
diff --git a/src/register/prdfScanFacility.H b/src/register/prdfScanFacility.H
index 02644f7..3dc333c 100755
--- a/src/register/prdfScanFacility.H
+++ b/src/register/prdfScanFacility.H
@@ -35,13 +35,14 @@
 // Includes
 //--------------------------------------------------------------------
 
+#include <register/hei_hardware_register.hpp>
+#include <register/hei_operator_register.hpp>
+
 #include <prdfFlyWeight.H>
 #include <prdfFlyWeightS.H>
 #include <vector>
 #include <prdfHomRegisterAccess.H>
-#include <prdfScomRegister.H>
 #include <prdfScomRegisterAccess.H>
-#include <prdfOperatorRegister.H>
 #include <prdfPlatServices.H>
 
 namespace PRDF
diff --git a/src/register/prdfScomRegisterAccess.H b/src/register/prdfScomRegisterAccess.H
index 17e1032..a2b6a69 100644
--- a/src/register/prdfScomRegisterAccess.H
+++ b/src/register/prdfScomRegisterAccess.H
@@ -24,8 +24,9 @@
 #ifndef __PRDF_REGISTER_
 #define __PRDF_REGISTER_
 
-#include <prdfScomRegister.H>
-#include <prdfBitString.H>
+#include <register/hei_hardware_register.hpp>
+#include <util/hei_bit_string.hpp>
+
 #include <prdfPlatServices.H>
 
 /**