diff --git a/.ecode/project_build.json b/.ecode/project_build.json
index de37913ca..5314f13d0 100644
--- a/.ecode/project_build.json
+++ b/.ecode/project_build.json
@@ -2,7 +2,7 @@
   "ecode-linux": {
     "build": [
       {
-        "args": "--with-debug-symbols --with-text-shaper gmake",
+        "args": "--with-debug-symbols --disable-static-build --with-text-shaper gmake",
         "command": "premake4",
         "working_dir": "${project_root}"
       },
@@ -496,4 +496,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/eepp/system/platform/win/conditionimpl.hpp b/src/eepp/system/platform/win/conditionimpl.hpp
index 58d00243b..53e8b602b 100644
--- a/src/eepp/system/platform/win/conditionimpl.hpp
+++ b/src/eepp/system/platform/win/conditionimpl.hpp
@@ -5,7 +5,12 @@
 
 #if EE_PLATFORM == EE_PLATFORM_WIN
 
-#include <eepp/system/platform/win/muteximpl.hpp>
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+
+#include <eepp/system/mutex.hpp>
 
 namespace EE { namespace System { namespace Platform {
 
@@ -38,7 +43,7 @@ class ConditionImpl {
 	int mConditionnedVar;
 
 	HANDLE mCond;
-	MutexImpl mMutex;
+	Mutex mMutex;
 };
 
 }}} // namespace EE::System::Platform