diff --git a/Toy b/Toy
index 14710de..8498864 160000
--- a/Toy
+++ b/Toy
@@ -1 +1 @@
-Subproject commit 14710dec90bcd6b3ece516315bb80d494cd01385
+Subproject commit 8498864dde6ab11bda8ed8b6d0bf09a4c4de0af0
diff --git a/core/common.c b/core/core_common.c
similarity index 91%
rename from core/common.c
rename to core/core_common.c
index 443f2b2..232b8db 100644
--- a/core/common.c
+++ b/core/core_common.c
@@ -1,4 +1,4 @@
-#include "common.h"
+#include "core_common.h"
 
 STATIC_ASSERT(sizeof(char) == 1);
 STATIC_ASSERT(sizeof(short) == 2);
diff --git a/core/common.h b/core/core_common.h
similarity index 86%
rename from core/common.h
rename to core/core_common.h
index 7376fb4..2a7a9a9 100644
--- a/core/common.h
+++ b/core/core_common.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <SDL2/SDL.h>
+#include <SDL2/SDL_image.h>
+
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/core/engine.h b/core/engine.h
index 50a7a2f..15e0235 100644
--- a/core/engine.h
+++ b/core/engine.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "common.h"
+#include "core_common.h"
 #include "engine_node.h"
 #include "interpreter.h"
 
 #include "literal_array.h"
 #include "literal_dictionary.h"
 
-#include <SDL2/SDL.h>
+#include "core_common.h"
 
 #include <sys/time.h>
 
diff --git a/core/engine_node.h b/core/engine_node.h
index 07b1c16..f433042 100644
--- a/core/engine_node.h
+++ b/core/engine_node.h
@@ -1,12 +1,11 @@
 #pragma once
 
-#include "common.h"
+#include "core_common.h"
 
 #include "literal_dictionary.h"
 #include "interpreter.h"
 
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_image.h>
+#include "core_common.h"
 
 #define OPAQUE_TAG_ENGINE_NODE 1
 
diff --git a/core/lib_input.c b/core/lib_input.c
index 2dbc6f1..1abe256 100644
--- a/core/lib_input.c
+++ b/core/lib_input.c
@@ -3,8 +3,7 @@
 #include "memory.h"
 
 #include "engine.h"
-
-#include <SDL2/SDL.h>
+#include "core_common.h"
 
 static int nativeMapInputEventToKey(Interpreter* interpreter, LiteralArray* arguments, LiteralDictionary* symKeyEventsPtr, char* fnName) {
 	//checks
diff --git a/core/repl_tools.h b/core/repl_tools.h
index 9ef421a..877f1f2 100644
--- a/core/repl_tools.h
+++ b/core/repl_tools.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common.h"
+#include "core_common.h"
 
 char* readFile(char* path, size_t* fileSize);
 void writeFile(char* path, unsigned char* bytes, size_t size);