diff --git a/.gitmodules b/.gitmodules
index 8401b320..34167e28 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -14,3 +14,6 @@
 [submodule "src/3rdparty/pegtl"]
 	path = src/3rdparty/pegtl
 	url = ../../lolengine/pegtl.git
+[submodule "src/3rdparty/mingw-std-threads"]
+	path = src/3rdparty/mingw-std-threads
+	url = ../../lolengine/mingw-std-threads.git
diff --git a/build/autotools/m4/lol-conf.m4 b/build/autotools/m4/lol-conf.m4
index d7b0eb0a..2135ca25 100644
--- a/build/autotools/m4/lol-conf.m4
+++ b/build/autotools/m4/lol-conf.m4
@@ -72,22 +72,13 @@ AC_TRY_LINK([], [],
 AC_LANG_POP(C++)
 
 
-dnl  Use mingw threads if necessary
-if true; then
-  LOL_CFLAGS="$LOL_CFLAGS -I\$(lol_srcdir)/external/mingw-std-threads-0.0.ac5c9e3b/include/"
-fi
-
-
-dnl  Use pegtl? Yes, always
-if true; then
-  LOL_CFLAGS="$LOL_CFLAGS -I\$(lol_srcdir)/src/3rdparty/pegtl"
-fi
-
+dnl
+dnl  Activate some header-only libraries
+dnl
 
-dnl  Use Imgui? Yes, always
-if true; then
-  LOL_CFLAGS="$LOL_CFLAGS -I\$(lol_srcdir)/src/3rdparty/imgui"
-fi
+LOL_CFLAGS="$LOL_CFLAGS -I\$(lol_srcdir)/src/3rdparty/mingw-std-threads"
+LOL_CFLAGS="$LOL_CFLAGS -I\$(lol_srcdir)/src/3rdparty/pegtl"
+LOL_CFLAGS="$LOL_CFLAGS -I\$(lol_srcdir)/src/3rdparty/imgui"
 
 
 dnl  Use NativeClient?
diff --git a/external b/external
index 406ad093..b83ca550 160000
--- a/external
+++ b/external
@@ -1 +1 @@
-Subproject commit 406ad09301126c1d80c08179973589fe8930162c
+Subproject commit b83ca55097a337ba19f5f8ff66cd1a972f0965c0
diff --git a/src/3rdparty/mingw-std-threads b/src/3rdparty/mingw-std-threads
new file mode 160000
index 00000000..b7e670d9
--- /dev/null
+++ b/src/3rdparty/mingw-std-threads
@@ -0,0 +1 @@
+Subproject commit b7e670d91d33b7ce5836c6255d37e69f17eb3687