2 files changed, 8 insertions, 8 deletions

diff --git a/firmware/export/hwcompat.h b/firmware/export/hwcompat.h
index bebca68a6c..2261a91a36 100644
--- a/firmware/export/hwcompat.h
+++ b/firmware/export/hwcompat.h
@@ -40,12 +40,6 @@
 #define HW_MASK (*(short *)0x020000fc)
 #endif
 
-#endif /* (CONFIG_CPU == SH7034) && !SIMULATOR */
-
-#ifdef ARCHOS_PLAYER
-bool is_new_player(void);
-#endif
-
 #ifdef CONFIG_TUNER_MULTI
 static inline int tuner_detect_type(void)
 {
@@ -53,4 +47,10 @@ static inline int tuner_detect_type(void)
 }
 #endif
 
+#endif /* (CONFIG_CPU == SH7034) && !SIMULATOR */
+
+#ifdef ARCHOS_PLAYER
+bool is_new_player(void);
+#endif
+
 #endif /* HWCOMPAT_H */
diff --git a/firmware/export/s1a0903x01.h b/firmware/export/s1a0903x01.h
index bf497628b7..f36cfffae7 100644
--- a/firmware/export/s1a0903x01.h
+++ b/firmware/export/s1a0903x01.h
@@ -33,8 +33,8 @@ int s1a0903x01_set(int setting, int value);
 int s1a0903x01_get(int setting);
 
 #ifndef CONFIG_TUNER_MULTI
-#define tuner_set s1a0903x01_get
-#define tuner_get s1a0903x01_set
+#define tuner_get s1a0903x01_get
+#define tuner_set s1a0903x01_set
 #endif
 
 #endif /* _S1A0903X01_H_ */