diff --git a/input/input_sensor.c b/input/input_sensor.c
index e5a97d8af0..1cae2b1e0f 100644
--- a/input/input_sensor.c
+++ b/input/input_sensor.c
@@ -14,6 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "input_sensor.h"
+
 #include "../driver.h"
 
 /**
diff --git a/libretro-db/query.c b/libretro-db/query.c
index f4440a4999..8bf7b3226f 100644
--- a/libretro-db/query.c
+++ b/libretro-db/query.c
@@ -8,12 +8,13 @@
 #include <ctype.h>
 #include <string.h>
 
-#include "libretrodb.h"
-
-#include "rmsgpack_dom.h"
 #include <compat/fnmatch.h>
 #include <compat/strl.h>
 
+#include "libretrodb.h"
+#include "query.h"
+#include "rmsgpack_dom.h"
+
 #define MAX_ERROR_LEN 256
 #undef  MAX_ARGS
 #define MAX_ARGS 50
diff --git a/record/record_driver.c b/record/record_driver.c
index 4497f11fe7..57d5673ca6 100644
--- a/record/record_driver.c
+++ b/record/record_driver.c
@@ -18,6 +18,8 @@
 
 #include <file/file_path.h>
 
+#include "record_driver.h"
+
 #include "../driver.h"
 #include "../general.h"
 #include "../msg_hash.h"
diff --git a/record/record_driver.h b/record/record_driver.h
index 54e5eb0f3f..2584208261 100644
--- a/record/record_driver.h
+++ b/record/record_driver.h
@@ -149,6 +149,8 @@ void recording_dump_frame(const void *data, unsigned width,
 
 bool recording_deinit(void);
 
+void find_record_driver(void);
+
 /**
  * recording_init:
  *