diff --git a/atari800/src/cartridge.c b/atari800/src/cartridge.c
index 9957192..390af97 100644
--- a/atari800/src/cartridge.c
+++ b/atari800/src/cartridge.c
@@ -28,6 +28,7 @@
 #include <string.h>
 
 #include "atari.h"
+#include "crc32.h"
 #include "binload.h" /* BINLOAD_loading_basic */
 #include "cartridge.h"
 #include "memory.h"
diff --git a/atari800/src/util.h b/atari800/src/util.h
index 08cd975..14c7e2a 100644
--- a/atari800/src/util.h
+++ b/atari800/src/util.h
@@ -12,6 +12,9 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 
 /* String functions ------------------------------------------------------ */
 
diff --git a/libretro/core-mapper.c b/libretro/core-mapper.c
index 68943cf..c631da2 100644
--- a/libretro/core-mapper.c
+++ b/libretro/core-mapper.c
@@ -1,6 +1,8 @@
 #include "libretro.h"
 #include "libretro-core.h"
 #include "retroscreen.h"
+#include "platform.h"
+#include "vkbd.h"
 //CORE VAR
 #ifdef _WIN32
 char slash = '\\';
@@ -80,6 +82,7 @@ int STAT_BASEY;
 
 /*static*/ retro_input_state_t input_state_cb;
 static retro_input_poll_t input_poll_cb;
+extern void retro_audio_cb( short l, short r);
 
 
 void retro_set_input_state(retro_input_state_t cb)