diff --git a/libretro-db/libretrodb.h b/libretro-db/libretrodb.h
index 45573814c0..9526116bb0 100644
--- a/libretro-db/libretrodb.h
+++ b/libretro-db/libretrodb.h
@@ -7,14 +7,14 @@
 #else
 #include <unistd.h>
 #endif
+
+#include "query.h"
 #include "rmsgpack_dom.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef struct libretrodb_query libretrodb_query_t;
-
 typedef struct libretrodb libretrodb_t;
 
 typedef struct libretrodb_cursor libretrodb_cursor_t;
diff --git a/libretro-db/query.h b/libretro-db/query.h
index a0cd84e3c3..98214e88a0 100644
--- a/libretro-db/query.h
+++ b/libretro-db/query.h
@@ -2,6 +2,9 @@
 #define __LIBRETRODB_QUERY_H__
 
 #include "libretrodb.h"
+#include "rmsgpack_dom.h"
+
+typedef struct libretrodb_query libretrodb_query_t;
 
 void libretrodb_query_inc_ref(libretrodb_query_t *q);