diff --git a/app/src/controller.c b/app/src/controller.c
index 468885f6..f698ebc8 100644
--- a/app/src/controller.c
+++ b/app/src/controller.c
@@ -1,5 +1,7 @@
 #include "controller.h"
 
+#include <SDL2/SDL_assert.h>
+#include "config.h"
 #include "lockutil.h"
 #include "log.h"
 
@@ -66,7 +68,7 @@ static int run_controller(void *data) {
         }
         struct control_event event;
 #ifdef BUILD_DEBUG
-        bool non_empty = control_event_queue_take(&controller->queue, &event);
+        SDL_bool non_empty = control_event_queue_take(&controller->queue, &event);
         SDL_assert(non_empty);
 #else
         control_event_queue_take(&controller->queue, &event);
diff --git a/app/src/file_handler.c b/app/src/file_handler.c
index 39175d55..f47372c1 100644
--- a/app/src/file_handler.c
+++ b/app/src/file_handler.c
@@ -1,6 +1,8 @@
 #include "file_handler.h"
 
 #include <string.h>
+#include <SDL2/SDL_assert.h>
+#include "config.h"
 #include "command.h"
 #include "device.h"
 #include "lockutil.h"
@@ -166,7 +168,7 @@ static int run_file_handler(void *data) {
         }
         struct request *req;
 #ifdef BUILD_DEBUG
-        bool non_empty = request_queue_take(&file_handler->queue, &req);
+        SDL_bool non_empty = request_queue_take(&file_handler->queue, &req);
         SDL_assert(non_empty);
 #else
         request_queue_take(&file_handler->queue, &req);