diff --git a/src/wine-host/boost-fix.h b/src/wine-host/boost-fix.h
index bd82b480..764760bb 100644
--- a/src/wine-host/boost-fix.h
+++ b/src/wine-host/boost-fix.h
@@ -23,11 +23,13 @@
 // it's running under a WIN32 environment. If anyone knows a better way to do
 // this, please let me know!
 
+#pragma push_macro("__MINGW32__")
 #pragma push_macro("WIN32")
 #pragma push_macro("_WIN32")
 #pragma push_macro("__WIN32__")
 #pragma push_macro("_WIN64")
 
+#undef __MINGW32__
 #undef WIN32
 #undef _WIN32
 #undef __WIN32__
@@ -38,9 +40,11 @@
 // included here, but including headers from the detail directory directly
 // didn't sound like a great idea.
 
+#include <boost/predef.h>
 #include <boost/asio/basic_socket_streambuf.hpp>
 // #include <boost/asio/detail/timer_queue_ptime.hpp>
 
+#pragma pop_macro("__MINGW32__")
 #pragma pop_macro("WIN32")
 #pragma pop_macro("_WIN32")
 #pragma pop_macro("__WIN32__")
diff --git a/src/wine-host/bridges/group.cpp b/src/wine-host/bridges/group.cpp
index 2f421c47..350e400b 100644
--- a/src/wine-host/bridges/group.cpp
+++ b/src/wine-host/bridges/group.cpp
@@ -16,6 +16,8 @@
 
 #include "group.h"
 
+#include "../boost-fix.h"
+
 #include <unistd.h>
 #include <boost/asio/read_until.hpp>
 #include <boost/process/environment.hpp>
diff --git a/src/wine-host/bridges/vst3.cpp b/src/wine-host/bridges/vst3.cpp
index cafad935..817dd545 100644
--- a/src/wine-host/bridges/vst3.cpp
+++ b/src/wine-host/bridges/vst3.cpp
@@ -16,3 +16,5 @@
 
 #include "vst3.h"
 
+// TODO: Do something with this, I just wanted to get the build working
+#include <public.sdk/source/vst/hosting/module_win32.cpp>
diff --git a/src/wine-host/bridges/vst3.h b/src/wine-host/bridges/vst3.h
index 768a86af..e50f13e6 100644
--- a/src/wine-host/bridges/vst3.h
+++ b/src/wine-host/bridges/vst3.h
@@ -1,4 +1,3 @@
-
 // yabridge: a Wine VST bridge
 // Copyright (C) 2020  Robbert van der Helm
 //