diff --git a/.gitmodules b/.gitmodules
index c919986a..e1d5070f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,3 +8,6 @@
 [submodule "deps/asio"]
 	path = deps/asio
 	url = https://github.com/chriskohlhoff/asio.git
+[submodule "deps/pdcurses"]
+	path = deps/pdcurses
+	url = git://git.code.sf.net/p/pdcurses/code
diff --git a/deps/pdcurses b/deps/pdcurses
new file mode 160000
index 00000000..d4f3231c
--- /dev/null
+++ b/deps/pdcurses
@@ -0,0 +1 @@
+Subproject commit d4f3231c6ee62efb7f63d666617098a8c70d1b28
diff --git a/premake5.lua b/premake5.lua
index eaacfbed..d5251c50 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -84,8 +84,8 @@ workspace "iw4x"
 		pchsource "src/STDInclude.cpp" -- real path
 
 		-- Dependency on zlib, json11 and asio
-		links { "zlib", "json11" }
-		includedirs { "./deps/zlib", "./deps/json11", "./deps/asio/asio/include"  }
+		links { "zlib", "json11", "pdcurses" }
+		includedirs { "./deps/zlib", "./deps/json11", "./deps/pdcurses", "./deps/asio/asio/include"  }
 
 		-- Virtual paths
 		if not _OPTIONS["no-new-structure"] then
@@ -159,3 +159,20 @@ workspace "iw4x"
 
 			-- always build as static lib, as json11 doesn't export anything
 			kind "StaticLib"
+			
+			
+		-- pdcurses
+		project "pdcurses"
+			language "C++"
+			includedirs { "./deps/pdcurses/"  }
+
+			files
+			{
+				"./deps/pdcurses/pdcurses/*.c"
+			}
+
+			-- not our code, ignore POSIX usage warnings for now
+			warnings "Off"
+
+			-- always build as static lib, as pdcurses doesn't export anything
+			kind "StaticLib"
diff --git a/src/Components/Modules/Exception.cpp b/src/Components/Modules/Exception.cpp
index 5ec0d6ae..d5559ce5 100644
--- a/src/Components/Modules/Exception.cpp
+++ b/src/Components/Modules/Exception.cpp
@@ -78,7 +78,7 @@ namespace Components
 				}
 
 				if(!(i % 2)) command.append(Utils::VA("wait 250;disconnect;wait 750;", mapname)); // Test a disconnect
-				else command.append(Utils::VA("wait 500;", mapname));                            // Test direct map switch
+				else command.append(Utils::VA("wait 500;", mapname));                             // Test direct map switch
 				command.append(Utils::VA("map %s;", mapname));
 
 				i++, current++;
diff --git a/src/STDInclude.hpp b/src/STDInclude.hpp
index 5809378e..63e8ab4b 100644
--- a/src/STDInclude.hpp
+++ b/src/STDInclude.hpp
@@ -29,12 +29,18 @@
 #include <future>
 
 // Submodules
+#pragma warning(push)
+#pragma warning(disable: 4005)
+
 #define ZLIB_CONST
 #define ASIO_STANDALONE
 #include <zlib.h>
+#include <curses.h>
 //#include <asio.hpp>
 #include <json11.hpp>
 
+#pragma warning(pop)
+
 // Version number
 #include <version.hpp>