diff --git a/firmware/export/si4700.h b/firmware/export/si4700.h
index debc176ec5..06a87c484f 100644
--- a/firmware/export/si4700.h
+++ b/firmware/export/si4700.h
@@ -24,6 +24,7 @@
 
 #ifndef _SI4700_H_
 #define _SI4700_H_
+#include <stdint.h>
 
 #define HAVE_RADIO_REGION
 #define HAVE_RADIO_RSSI
diff --git a/firmware/export/tuner.h b/firmware/export/tuner.h
index db6ee15844..6fedc0f785 100644
--- a/firmware/export/tuner.h
+++ b/firmware/export/tuner.h
@@ -94,7 +94,7 @@ extern const struct fm_region_data fm_region_data[TUNER_NUM_REGIONS];
 
 #if CONFIG_TUNER
 
-#ifdef CONFIG_TUNER_MULTI
+#if !defined(SIMULATOR) && defined(CONFIG_TUNER_MULTI)
 extern int tuner_detect_type(void);
 extern int (*tuner_set)(int setting, int value);
 extern int (*tuner_get)(int setting);
@@ -138,7 +138,7 @@ extern int (*tuner_get)(int setting);
 #include "ipod_remote_tuner.h"
 #endif
 
-#ifdef SIMULATOR
+#if defined(SIMULATOR)
 #undef tuner_set
 int tuner_set(int setting, int value);
 #undef tuner_get