diff --git a/src/register/hei_hardware_register.cpp b/src/register/hei_hardware_register.cpp
index 3ee4297..c354228 100755
--- a/src/register/hei_hardware_register.cpp
+++ b/src/register/hei_hardware_register.cpp
@@ -13,6 +13,7 @@
 #include <register/hei_hardware_register.hpp>
 #include <util/hei_bit_string.hpp>
 
+#if 0
 #include <iipchip.h>
 #include <prdfMain.H>
 #include <prdfRasServices.H>
@@ -46,9 +47,12 @@
 //---------------------------------------------------------------------
 
 // --------------------------------------------------------------------
+#endif
+
 namespace libhei
 {
 
+#if 0
 // ---------------------------------------------------------------------
 
 void HardwareRegister::SetBitString( const BitString *bs )
@@ -274,6 +278,7 @@
 {
     return !( *this < i_rightRegister );
 }
+#endif
 
 } // end namespace libhei
 
diff --git a/src/register/hei_hardware_register.hpp b/src/register/hei_hardware_register.hpp
index ddea721..a60b2bd 100755
--- a/src/register/hei_hardware_register.hpp
+++ b/src/register/hei_hardware_register.hpp
@@ -14,18 +14,23 @@
 #include <register/hei_register.hpp>
 #include <util/hei_bit_string.hpp>
 
+#if 0
 #include <prdfHomRegisterAccess.H>
+#endif
 
 namespace libhei
 {
 
+#if 0
 // Forward References
 class CHIP_CLASS;
 class MopsRegisterAccess;
 class ExtensibleChip;
+#endif
 
 class HardwareRegister : public Register
 {
+#if 0
   public:
 
     /**
@@ -212,6 +217,7 @@
     uint64_t        iv_scomAddress;   // scom address associated with regiser
     AccessLevel     iv_operationType; // Operation supported (RO, WO, or RW)
 
+#endif
 };
 
 } // end namespace libhei
diff --git a/test/simulator/meson.build b/test/simulator/meson.build
index 87b675b..b53dce5 100644
--- a/test/simulator/meson.build
+++ b/test/simulator/meson.build
@@ -1,6 +1,7 @@
 sim_sources = [
     'hei_sim_main.cpp',
     '../../src/isolator/hei_isolator.cpp',
+    '../../src/register/hei_hardware_register.cpp',
     '../../src/util/hei_bit_string.cpp',
 ]