diff --git a/MiniEngine.h b/MiniEngine.h
index 9844c5f..6d93321 100644
--- a/MiniEngine.h
+++ b/MiniEngine.h
@@ -1,31 +1,10 @@
 #pragma once
-
-#ifdef _MSC_VER
-/// Visual Studio (VC++ Compiler)
-#include <SDL.h>
-#undef main
-#include <SDL_image.h>
-#include <SDL_ttf.h>
-#include <SDL_mixer.h>
-
-/// VC++ does not implied C++ exception. Use this to ignore compile warning on this.
-#pragma warning (disable:4290)
-#else
-/// CodeBlocks (MinGW Compiler)
-#include <SDL2/SDL.h>
-#undef main
-#include <SDL2/SDL_image.h>
-#include <SDL2/SDL_ttf.h>
-#include <SDL2/SDL_mixer.h>
-#endif
-
+#include "MiniEngine_Config.h"
 #include <string>
 #include <memory>
 #include <functional>
 #include <vector>
 
-#define _DECL_DEPRECATED [[deprecated]]
-
 namespace MiniEngine
 {
 
diff --git a/MiniEngine_Config.h b/MiniEngine_Config.h
new file mode 100644
index 0000000..df13523
--- /dev/null
+++ b/MiniEngine_Config.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#ifdef _MSC_VER
+/// Visual Studio (VC++ Compiler)
+#include <SDL.h>
+#undef main
+#include <SDL_image.h>
+#include <SDL_ttf.h>
+#include <SDL_mixer.h>
+
+/// VC++ does not implied C++ exception. Use this to ignore compile warning on this.
+#pragma warning (disable:4290)
+#else
+/// CodeBlocks (MinGW Compiler)
+#include <SDL2/SDL.h>
+#undef main
+#include <SDL2/SDL_image.h>
+#include <SDL2/SDL_ttf.h>
+#include <SDL2/SDL_mixer.h>
+
+#endif /// End of #ifdef _MSC_VER
+
+#define _DECL_DEPRECATED [[deprecated]]
diff --git a/MiniEngine_Event.h b/MiniEngine_Event.h
index 9a136db..0f44f23 100644
--- a/MiniEngine_Event.h
+++ b/MiniEngine_Event.h
@@ -1,7 +1,8 @@
 #pragma once
-#include "MiniEngine.h"
+#include "MiniEngine_Config.h"
 #include <map>
 #include <list>
+#include <functional>
 
 typedef SDL_Event Event;
 typedef decltype(Event::type) _SDLEventType_;