3 files changed, 4 insertions, 5 deletions

diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 682bcaf456..12d5f435b7 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -86,6 +86,7 @@
 #ifdef IAUDIO_X5
 #include "ds2411.h"
 #endif
+#include "hwcompat.h"
 
 #ifndef SIMULATOR
 static bool dbg_list(char *title, int count, int selection_size,
@@ -405,8 +406,8 @@ static bool dbg_hw_info(void)
 {
 #if CONFIG_CPU == SH7034
     char buf[32];
-    int bitmask = *(unsigned short*)0x20000fc;
-    int rom_version = *(unsigned short*)0x20000fe;
+    int bitmask = HW_MASK;
+    int rom_version = ROM_VERSION;
     unsigned manu, id; /* flash IDs */
     bool got_id; /* flag if we managed to get the flash IDs */
     unsigned rom_crc = 0xffffffff; /* CRC32 of the boot ROM */
@@ -564,7 +565,7 @@ static bool dbg_hw_info(void)
     char buf[32];
     int button;
     int currval = 0;
-    int rom_version = *(unsigned short*)0x20000fe;
+    int rom_version = ROM_VERSION;
     unsigned manu, id; /* flash IDs */
     bool got_id; /* flag if we managed to get the flash IDs */
     unsigned rom_crc = 0xffffffff; /* CRC32 of the boot ROM */
diff --git a/apps/menu.c b/apps/menu.c
index 26edbb040c..6340185e07 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #include "config.h"
 
-#include "hwcompat.h"
 #include "lcd.h"
 #include "font.h"
 #include "backlight.h"
diff --git a/apps/settings.c b/apps/settings.c
index b0e84619a6..b6eb9a4f64 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -46,7 +46,6 @@
 #include "icons.h"
 #include "font.h"
 #include "peakmeter.h"
-#include "hwcompat.h"
 #endif
 #include "lang.h"
 #include "language.h"