From 7d0bf3e3c4c1dec01a5d297154769aa92faf657f Mon Sep 17 00:00:00 2001
From: Robbert van der Helm <mail@robbertvanderhelm.nl>
Date: Fri, 6 Mar 2020 18:44:15 +0100
Subject: [PATCH] Further clean up the Boost hacks

This way we can also finally split up the src/common/* files into
headers and implementations.
---
 src/common/communication.h    | 3 +++
 src/common/logging.h          | 3 +++
 src/wine-host/plugin-bridge.h | 2 --
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/common/communication.h b/src/common/communication.h
index 7523a091..820be9b8 100644
--- a/src/common/communication.h
+++ b/src/common/communication.h
@@ -24,6 +24,9 @@
 #include <bitsery/traits/vector.h>
 #include <vestige/aeffect.h>
 
+#ifdef __WINE__
+#include "../wine-host/boost-fix.h"
+#endif
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/local/stream_protocol.hpp>
 #include <cinttypes>
diff --git a/src/common/logging.h b/src/common/logging.h
index 111b0fc3..fd3e9091 100644
--- a/src/common/logging.h
+++ b/src/common/logging.h
@@ -16,6 +16,9 @@
 
 #pragma once
 
+#ifdef __WINE__
+#include "../wine-host/boost-fix.h"
+#endif
 #include <boost/process/environment.hpp>
 #include <fstream>
 #include <iostream>
diff --git a/src/wine-host/plugin-bridge.h b/src/wine-host/plugin-bridge.h
index e009c6c3..df289caa 100644
--- a/src/wine-host/plugin-bridge.h
+++ b/src/wine-host/plugin-bridge.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#include "boost-fix.h"
-
 #define NOMINMAX
 #define NOSERVICE
 #define NOMCX