diff --git a/AI/BattleAI/BattleAI.cbp b/AI/BattleAI/BattleAI.cbp
index 60423bd42..6f7dfa9a4 100644
--- a/AI/BattleAI/BattleAI.cbp
+++ b/AI/BattleAI/BattleAI.cbp
@@ -58,6 +58,9 @@
 			<Add option="-Wno-sign-compare" />
 			<Add option="-Wno-unused-parameter" />
 			<Add option="-Wno-overloaded-virtual" />
+			<Add option="-DBOOST_SYSTEM_NO_DEPRECATED" />
+			<Add option="-D_WIN32_WINNT=0x0501" />
+			<Add option="-D_WIN32" />
 			<Add directory="$(#boost.include)" />
 			<Add directory="../../include" />
 		</Compiler>
diff --git a/AI/EmptyAI/EmptyAI.cbp b/AI/EmptyAI/EmptyAI.cbp
index a3bc5061a..003d432c5 100644
--- a/AI/EmptyAI/EmptyAI.cbp
+++ b/AI/EmptyAI/EmptyAI.cbp
@@ -57,6 +57,8 @@
 			<Add option="-Wno-unused-parameter" />
 			<Add option="-Wno-overloaded-virtual" />
 			<Add option="-fpermissive" />
+			<Add option="-D_WIN32_WINNT=0x0501" />
+			<Add option="-D_WIN32" />
 			<Add directory="$(#boost.include)" />
 			<Add directory="../../include" />
 		</Compiler>
diff --git a/AI/StupidAI/StupidAI.cbp b/AI/StupidAI/StupidAI.cbp
index 57bab73cd..dc5f3a377 100644
--- a/AI/StupidAI/StupidAI.cbp
+++ b/AI/StupidAI/StupidAI.cbp
@@ -43,7 +43,9 @@
 			<Add option="-Wno-unused-parameter" />
 			<Add option="-Wno-overloaded-virtual" />
 			<Add option="-DBOOST_THREAD_USE_LIB" />
+			<Add option="-DBOOST_SYSTEM_NO_DEPRECATED" />
 			<Add option="-D_WIN32_WINNT=0x0501" />
+			<Add option="-D_WIN32" />
 			<Add directory="$(#boost.include)" />
 			<Add directory="../../include" />
 		</Compiler>
diff --git a/AI/VCAI/VCAI.cbp b/AI/VCAI/VCAI.cbp
index bc8d5de69..9566d9c4d 100644
--- a/AI/VCAI/VCAI.cbp
+++ b/AI/VCAI/VCAI.cbp
@@ -65,7 +65,9 @@
 			<Add option="-Wno-unused-parameter" />
 			<Add option="-Wno-overloaded-virtual" />
 			<Add option="-DBOOST_THREAD_USE_LIB" />
+			<Add option="-DBOOST_SYSTEM_NO_DEPRECATED" />
 			<Add option="-D_WIN32_WINNT=0x0501" />
+			<Add option="-D_WIN32" />
 			<Add option="-DFL_CPP11" />
 			<Add directory="$(#boost.include)" />
 			<Add directory="../../include" />
diff --git a/Global.h b/Global.h
index b661afa91..6cdac9471 100644
--- a/Global.h
+++ b/Global.h
@@ -155,6 +155,7 @@ static_assert(sizeof(bool) == 1, "Bool needs to be 1 byte in size.");
 #endif
 
 #include <boost/algorithm/string.hpp>
+#include <boost/any.hpp>
 #include <boost/cstdint.hpp>
 #include <boost/current_function.hpp>
 #include <boost/crc.hpp>
@@ -172,7 +173,6 @@ static_assert(sizeof(bool) == 1, "Bool needs to be 1 byte in size.");
 #include <boost/logic/tribool.hpp>
 #include <boost/optional.hpp>
 #include <boost/optional/optional_io.hpp>
-#include <boost/program_options.hpp>
 #include <boost/range/adaptor/filtered.hpp>
 #include <boost/range/adaptor/reversed.hpp>
 #include <boost/range/algorithm.hpp>
diff --git a/client/CMT.cpp b/client/CMT.cpp
index 87935bf52..71de901e9 100644
--- a/client/CMT.cpp
+++ b/client/CMT.cpp
@@ -2,6 +2,9 @@
 //
 #include "StdInc.h"
 #include <SDL_mixer.h>
+
+#include <boost/program_options.hpp>
+
 #include "gui/SDL_Extensions.h"
 #include "CGameInfo.h"
 #include "mapHandler.h"
diff --git a/scripting/erm/ERM.cbp b/scripting/erm/ERM.cbp
index c278fc5d9..5786475fa 100644
--- a/scripting/erm/ERM.cbp
+++ b/scripting/erm/ERM.cbp
@@ -61,6 +61,9 @@
 			<Add option="-Wno-sign-compare" />
 			<Add option="-Wno-unused-parameter" />
 			<Add option="-Wno-overloaded-virtual" />
+			<Add option="-DBOOST_SYSTEM_NO_DEPRECATED" />
+			<Add option="-D_WIN32_WINNT=0x0501" />
+			<Add option="-D_WIN32" />
 			<Add directory="$(#boost.include)" />
 			<Add directory="../../include" />
 		</Compiler>
diff --git a/server/CVCMIServer.h b/server/CVCMIServer.h
index 5443d355e..34aa3c6f3 100644
--- a/server/CVCMIServer.h
+++ b/server/CVCMIServer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-
+#include <boost/program_options.hpp>
 
 /*
  * CVCMIServer.h, part of VCMI engine
@@ -97,4 +97,4 @@ public:
 	void startListeningThread(CConnection * pc);
 };
 
-extern boost::program_options::variables_map cmdLineOptions;
+extern boost::program_options::variables_map cmdLineOptions;
diff --git a/test/Test.cbp b/test/Test.cbp
index 2846c5d78..43a929950 100644
--- a/test/Test.cbp
+++ b/test/Test.cbp
@@ -47,6 +47,8 @@
 			<Add option="-Wno-unused-parameter" />
 			<Add option="-Wno-overloaded-virtual" />
 			<Add option="-Wno-unused-local-typedefs" />
+			<Add option="-D_WIN32_WINNT=0x0501" />
+			<Add option="-D_WIN32" />
 			<Add directory="$(#zlib.include)" />
 			<Add directory="$(#boost.include)" />
 			<Add directory="../include" />