diff --git a/CMakeLists.txt b/CMakeLists.txt
index b35291f7..e6dccd2f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -332,7 +332,8 @@ else()
   add_compile_definitions(HAS_TREMOR)
 endif()
 
-add_compile_definitions(BOOST_ERROR_CODE_HEADER_ONLY BOOST_ASIO_NO_TS_EXECUTORS)
+add_compile_definitions(BOOST_ERROR_CODE_HEADER_ONLY BOOST_ASIO_NO_TS_EXECUTORS
+                        BOOST_PROCESS_VERSION=1)
 
 if(WIN32)
   include(FindPackageHandleStandardArgs)
diff --git a/client/player/player.cpp b/client/player/player.cpp
index 047a9ab1..968cb723 100644
--- a/client/player/player.cpp
+++ b/client/player/player.cpp
@@ -27,7 +27,6 @@
 
 // 3rd party headers
 #ifdef SUPPORTS_VOLUME_SCRIPT
-#define BOOST_PROCESS_VERSION 1
 #include <boost/process/v1/args.hpp>
 #include <boost/process/v1/child.hpp>
 #include <boost/process/v1/detail/on_exit.hpp>
diff --git a/server/streamreader/stream_control.hpp b/server/streamreader/stream_control.hpp
index 5007f208..5cbc9217 100644
--- a/server/streamreader/stream_control.hpp
+++ b/server/streamreader/stream_control.hpp
@@ -23,8 +23,8 @@
 #include "server_settings.hpp"
 
 // 3rd party headers
-#define BOOST_PROCESS_VERSION 1
-#include <boost/asio.hpp>
+#include <boost/asio/any_io_executor.hpp>
+#include <boost/process/v1/child.hpp>
 #include <boost/process/v1/io.hpp>
 #include <boost/process/v1/start_dir.hpp>
 #include <boost/process/v1/system.hpp>