diff --git a/driver.c b/driver.c
index 8d3833388a..579921b9fc 100644
--- a/driver.c
+++ b/driver.c
@@ -722,6 +722,8 @@ void global_uninit_drivers(void)
 #ifdef HAVE_LOCATION
    if (driver.location && driver.location_data)
    {
+      if (g_extern.system.location_callback.deinitialized)
+         g_extern.system.location_callback.deinitialized();
       driver.location->free(driver.location_data);
       driver.location_data = NULL;
    }
diff --git a/gfx/context/win32_common.c b/gfx/context/win32_common.c
index 734815f658..738485005d 100644
--- a/gfx/context/win32_common.c
+++ b/gfx/context/win32_common.c
@@ -16,6 +16,7 @@
 #include "../../general.h"
 #include "../../input/keyboard_line.h"
 #include "win32_common.h"
+#include "../../input/input_common.h"
 
 LRESULT win32_handle_keyboard_event(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam)
 {