diff --git a/performance.c b/performance.c
index 7c0383e94d..fa86685d17 100644
--- a/performance.c
+++ b/performance.c
@@ -14,6 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdio.h>
 #include "performance.h"
 #include "general.h"
 
diff --git a/performance/performance_android.h b/performance/performance_android.h
index 6326a06af7..93f15e205e 100644
--- a/performance/performance_android.h
+++ b/performance/performance_android.h
@@ -30,6 +30,7 @@
 
 #include <sys/cdefs.h>
 #include <stdint.h>
+#include "../retroarch_logger.h"
 
 typedef enum {
     ANDROID_CPU_FAMILY_UNKNOWN = 0,
diff --git a/retroarch_logger.h b/retroarch_logger.h
index 887c4e13c9..c8fa9ef7aa 100644
--- a/retroarch_logger.h
+++ b/retroarch_logger.h
@@ -130,7 +130,7 @@
 #endif
 #endif
 
-#ifndef RARCH_WARN
+#ifndef RARCH_WARN_OUTPUT
 #if defined(ANDROID) && defined(HAVE_LOGGER)
 #define  RARCH_WARN_OUTPUT(...)  __android_log_print(ANDROID_LOG_INFO, "stderr [WARN] :: ", __VA_ARGS__)
 #elif defined(IS_SALAMANDER)