diff --git a/frontend/frontend.h b/frontend/frontend.h
index 8a3e458ea4..3d53174255 100644
--- a/frontend/frontend.h
+++ b/frontend/frontend.h
@@ -21,11 +21,8 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#include <boolean.h>
 #include <retro_common_api.h>
 
-#include "frontend_driver.h"
-
 RETRO_BEGIN_DECLS
 
 /**
diff --git a/frontend/frontend_salamander.c b/frontend/frontend_salamander.c
index fe3880ff47..a8581aab09 100644
--- a/frontend/frontend_salamander.c
+++ b/frontend/frontend_salamander.c
@@ -26,6 +26,10 @@
 #include <string/stdstring.h>
 #include <compat/strl.h>
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 #include "frontend_driver.h"
 #include "../defaults.h"
 #include "../verbosity.h"