diff --git a/gfx/common/drm_common.c b/gfx/common/drm_common.c
index 1ef8a26a45..9f446f92da 100644
--- a/gfx/common/drm_common.c
+++ b/gfx/common/drm_common.c
@@ -71,7 +71,7 @@ bool drm_get_connector(int fd)
 
    RARCH_LOG("[DRM]: Found %d connectors.\n", g_drm_resources->count_connectors);
 
-   for (i = 0; i < g_drm_resources->count_connectors; i++)
+   for (i = 0; (int)i < g_drm_resources->count_connectors; i++)
    {
       drmModeConnectorPtr conn = drmModeGetConnector(
             fd, g_drm_resources->connectors[i]);
@@ -92,7 +92,7 @@ bool drm_get_connector(int fd)
 
    monitor_index = 0;
 
-   for (i = 0; i < g_drm_resources->count_connectors; i++)
+   for (i = 0; (int)i < g_drm_resources->count_connectors; i++)
    {
       g_drm_connector = drmModeGetConnector(fd,
             g_drm_resources->connectors[i]);
@@ -123,7 +123,7 @@ bool drm_get_encoder(int fd)
 {
    unsigned i;
 
-   for (i = 0; i < g_drm_resources->count_encoders; i++)
+   for (i = 0; (int)i < g_drm_resources->count_encoders; i++)
    {
       g_drm_encoder = drmModeGetEncoder(fd, g_drm_resources->encoders[i]);
 
@@ -143,7 +143,7 @@ bool drm_get_encoder(int fd)
       return false;
    }
 
-   for (i = 0; i < g_drm_connector->count_modes; i++)
+   for (i = 0; (int)i < g_drm_connector->count_modes; i++)
    {
       RARCH_LOG("[DRM]: Mode %d: (%s) %d x %d, %u Hz\n",
             i,
diff --git a/gfx/common/drm_common.h b/gfx/common/drm_common.h
index 33c040f5be..cb2bb360e8 100644
--- a/gfx/common/drm_common.h
+++ b/gfx/common/drm_common.h
@@ -33,7 +33,7 @@ extern uint32_t g_connector_id;
 extern int g_drm_fd;
 extern uint32_t g_crtc_id;
 
-struct pollfd g_drm_fds;
+extern struct pollfd g_drm_fds;
 
 extern drmModeConnector *g_drm_connector;
 extern drmModeModeInfo *g_drm_mode;
diff --git a/runloop.c b/runloop.c
index 90c0c2a816..1b03ee9404 100644
--- a/runloop.c
+++ b/runloop.c
@@ -37,6 +37,7 @@
 
 #include "input/keyboard_line.h"
 #include "input/input_common.h"
+#include "input/input_driver.h"
 
 #ifdef HAVE_MENU
 #include "menu/menu.h"