diff --git a/premake-scripts/build-freetype.lua b/premake-scripts/build-freetype.lua
index 5bdfb3e..54b3e74 100644
--- a/premake-scripts/build-freetype.lua
+++ b/premake-scripts/build-freetype.lua
@@ -79,6 +79,11 @@ function m.generateproject(liboutdir, intdir)
 		path.join(rootdir, "freetype/builds/windows/ftdebug.c"),
 	}
 
+	removefiles
+	{
+		path.join(rootdir, "freetype/src/base/ftdebug.c"),
+	}
+
 	filter"system:linux"
 	files{path.join(rootdir, "freetype/builds/unix/ftsystem.c")}
 
diff --git a/premake-scripts/build-imgui-sfml.lua b/premake-scripts/build-imgui-sfml.lua
index f3c238f..b6d0e9d 100644
--- a/premake-scripts/build-imgui-sfml.lua
+++ b/premake-scripts/build-imgui-sfml.lua
@@ -1,7 +1,7 @@
 local m = {}
 
 local rootdir = path.join(path.getabsolute(path.getdirectory(_SCRIPT)), "../")
-local sfml = require("../build-sfml")
+local sfml = require("build-sfml")
 
 function m.generateproject(liboutdir, intdir)
     project"imgui-sfml"
@@ -11,29 +11,28 @@ function m.generateproject(liboutdir, intdir)
         objdir(intdir)
         warnings"Off"
 
-        defines{"IMGUI_USER_CONFIG=\"imconfig-SFML.h\""}
-
-        sfml.link()
-
-        includedirs
-        {
-            path.join(rootdir, "imgui-sfml"),
-            path.join(rootdir, "imgui"),
-        }
+        defines{"IMGUI_USER_CONFIG=\"imconfig-SFML.h\"", "SFML_STATIC"}
 
         files
         {
             path.join(rootdir, "imgui-sfml/imgui-SFML.cpp"),
         }
+        
+        includedirs
+        {
+            path.join(rootdir, "imgui-sfml"),
+            path.join(rootdir, "imgui"),
+            path.join(rootdir, "SFML/include"),
+        }
+        
+        links {"sfml"}
 end
 
 function m.config() -- use this in build imgui instead of link() to avoid circular dependency
 
     defines { "IMGUI_USER_CONFIG=\"imconfig-SFML.h\"" }
 
-    includedirs { path.join(rootdir, "imgui-sfml") }
-
-    sfml.link()
+    includedirs { path.join(rootdir, "imgui-sfml"), path.join(rootdir, "SFML/include") }
 end
 
 function m.link()
diff --git a/premake-scripts/build-imgui.lua b/premake-scripts/build-imgui.lua
index 5dd3a92..28c23d0 100644
--- a/premake-scripts/build-imgui.lua
+++ b/premake-scripts/build-imgui.lua
@@ -11,7 +11,6 @@ function m.generateproject(liboutdir, intdir)
     objdir(intdir)
     warnings"Off"
 
-    imguisfml.config() -- needed so imgui can be aware of imconfig-sfml.h
 
     includedirs
     {
@@ -25,6 +24,8 @@ function m.generateproject(liboutdir, intdir)
         path.join(rootdir, "imgui/imgui_tables.cpp"),
         path.join(rootdir, "imgui/imgui_widgets.cpp"),
     }
+
+    imguisfml.config() -- needed so imgui can be aware of imconfig-sfml.h
 end
 
 function m.link()
diff --git a/premake-scripts/build-sfml.lua b/premake-scripts/build-sfml.lua
index cb2d3a3..bc3aaab 100644
--- a/premake-scripts/build-sfml.lua
+++ b/premake-scripts/build-sfml.lua
@@ -15,12 +15,6 @@ function m.generateproject(liboutdir, intdir)
 	objdir(intdir)
 	warnings"Off"
 
-
-	freetype.link()
-	ogg.link()
-	flac.link()
-	vorbis.link()
-
 	defines
 	{
 		"SFML_STATIC",
@@ -49,7 +43,6 @@ function m.generateproject(liboutdir, intdir)
 		path.join(rootdir, "SFML/extlibs/headers/vulkan"),
 
 	}
-
 	files
 	{
 		path.join(rootdir, "SFML/include/SFML/**.hpp"),
@@ -58,6 +51,11 @@ function m.generateproject(liboutdir, intdir)
 		path.join(rootdir, "SFML/src/SFML/**.cpp"),
 	}
 
+	freetype.link()
+	ogg.link()
+	flac.link()
+	vorbis.link()
+
 	filter"system:windows"
 	removefiles
 	{
@@ -73,6 +71,8 @@ function m.generateproject(liboutdir, intdir)
 		path.join(rootdir, "SFML/src/SFML/Window/DRM/**"),
 		path.join(rootdir, "SFML/src/SFML/Window/Android/**"),
 		path.join(rootdir, "SFML/src/SFML/System/Android/**"),
+		path.join(rootdir, "SFML/src/SFML/Main/MainAndroid.cpp"),
+		path.join(rootdir, "SFML/src/SFML/Main/MainiOS.cpp"),
 	}
 
 	filter"system:linux"