diff --git a/core/src/bindings/bind_storage.c b/core/src/bindings/bind_storage.c
index 8cc084dc6..fcf45c46a 100644
--- a/core/src/bindings/bind_storage.c
+++ b/core/src/bindings/bind_storage.c
@@ -32,10 +32,11 @@ static int tolua_storage_create(lua_State * L)
   const char *type = tolua_tostring(L, 2, "rb");
   gamedata *data = (gamedata *)calloc(1, sizeof(gamedata));
   storage *store = (storage *)calloc(1, sizeof(storage));
+  FILE * F;
 
   data->store = store;
 
-  FILE *F = fopen(filename, type);
+  F = fopen(filename, type);
   if (strchr(type, 'r')) {
     fread(&data->version, sizeof(int), 1, F);
     fseek(F, sizeof(int), SEEK_CUR);
diff --git a/core/src/gmtool.c b/core/src/gmtool.c
index 6f3e334fc..fa78ce298 100644
--- a/core/src/gmtool.c
+++ b/core/src/gmtool.c
@@ -9,8 +9,8 @@
  */
 
 #include <platform.h>
-#include <curses.h>
 #include <util/bool.h>
+#include <curses.h>
 
 #include <kernel/config.h>