7 files changed, 58 insertions, 15 deletions
diff --git a/src/platforms/posix/posixChildProcess.cpp b/src/platforms/posix/posixChildProcess.cpp
index 68ef021e..a05942da 100644
--- a/src/platforms/posix/posixChildProcess.cpp
+++ b/src/platforms/posix/posixChildProcess.cpp
@@ -21,6 +21,12 @@
 // the GNU General Public License cover the whole combination.
 //
 
+#include "vmime/config.hpp"
+
+
+#if VMIME_PLATFORM_IS_POSIX && VMIME_HAVE_FILESYSTEM_FEATURES
+
+
 #include "vmime/platforms/posix/posixChildProcess.hpp"
 #include "vmime/platforms/posix/posixFile.hpp"
 
@@ -394,3 +400,6 @@ void posixChildProcess::waitForFinish()
 } // platforms
 } // vmime
 
+
+#endif // VMIME_PLATFORM_IS_POSIX && VMIME_HAVE_FILESYSTEM_FEATURES
+
diff --git a/src/platforms/posix/posixFile.cpp b/src/platforms/posix/posixFile.cpp
index 4087a21f..2f67a2be 100644
--- a/src/platforms/posix/posixFile.cpp
+++ b/src/platforms/posix/posixFile.cpp
@@ -21,6 +21,12 @@
 // the GNU General Public License cover the whole combination.
 //
 
+#include "vmime/config.hpp"
+
+
+#if VMIME_PLATFORM_IS_POSIX && VMIME_HAVE_FILESYSTEM_FEATURES
+
+
 #include "vmime/platforms/posix/posixFile.hpp"
 
 #include <unistd.h>
@@ -38,9 +44,6 @@
 #include "vmime/exception.hpp"
 
 
-#if VMIME_HAVE_FILESYSTEM_FEATURES
-
-
 namespace vmime {
 namespace platforms {
 namespace posix {
@@ -621,4 +624,4 @@ void posixFileSystemFactory::reportError(const vmime::utility::path& path, const
 } // vmime
 
 
-#endif // VMIME_HAVE_FILESYSTEM_FEATURES
+#endif // VMIME_PLATFORM_IS_POSIX && VMIME_HAVE_FILESYSTEM_FEATURES
diff --git a/src/platforms/posix/posixHandler.cpp b/src/platforms/posix/posixHandler.cpp
index 2c113072..8629b1e2 100644
--- a/src/platforms/posix/posixHandler.cpp
+++ b/src/platforms/posix/posixHandler.cpp
@@ -21,6 +21,12 @@
 // the GNU General Public License cover the whole combination.
 //
 
+#include "vmime/config.hpp"
+
+
+#if VMIME_PLATFORM_IS_POSIX
+
+
 #include "vmime/platforms/posix/posixHandler.hpp"
 
 #include <time.h>
@@ -258,3 +264,6 @@ void posixHandler::wait() const
 } // posix
 } // platforms
 } // vmime
+
+
+#endif // VMIME_PLATFORM_IS_POSIX
diff --git a/src/platforms/posix/posixSocket.cpp b/src/platforms/posix/posixSocket.cpp
index f280dadc..6fcbd118 100644
--- a/src/platforms/posix/posixSocket.cpp
+++ b/src/platforms/posix/posixSocket.cpp
@@ -21,6 +21,12 @@
 // the GNU General Public License cover the whole combination.
 //
 
+#include "vmime/config.hpp"
+
+
+#if VMIME_PLATFORM_IS_POSIX && VMIME_HAVE_MESSAGING_FEATURES
+
+
 #include "vmime/platforms/posix/posixSocket.hpp"
 #include "vmime/platforms/posix/posixHandler.hpp"
 
@@ -37,9 +43,6 @@
 #include "vmime/exception.hpp"
 
 
-#if VMIME_HAVE_MESSAGING_FEATURES
-
-
 namespace vmime {
 namespace platforms {
 namespace posix {
@@ -493,4 +496,4 @@ ref <vmime::net::socket> posixSocketFactory::create(ref <vmime::net::timeoutHand
 } // vmime
 
 
-#endif // VMIME_HAVE_MESSAGING_FEATURES
+#endif // VMIME_PLATFORM_IS_POSIX && VMIME_HAVE_MESSAGING_FEATURES
diff --git a/src/platforms/windows/windowsFile.cpp b/src/platforms/windows/windowsFile.cpp
index 5da786e5..7a70d364 100644
--- a/src/platforms/windows/windowsFile.cpp
+++ b/src/platforms/windows/windowsFile.cpp
@@ -21,6 +21,12 @@
 // the GNU General Public License cover the whole combination.
 //
 
+#include "vmime/config.hpp"
+
+
+#if VMIME_PLATFORM_IS_WINDOWS && VMIME_HAVE_FILESYSTEM_FEATURES
+
+
 #include "vmime/platforms/windows/windowsFile.hpp"
 
 #include <windows.h>
@@ -30,9 +36,6 @@
 #include "vmime/utility/stringUtils.hpp"
 
 
-#if VMIME_HAVE_FILESYSTEM_FEATURES
-
-
 namespace vmime {
 namespace platforms {
 namespace windows {
@@ -546,4 +549,5 @@ void windowsFileWriterOutputStream::flush()
 } // vmime
 
 
-#endif // VMIME_HAVE_FILESYSTEM_FEATURES
+#endif // VMIME_PLATFORM_IS_WINDOWS && VMIME_HAVE_FILESYSTEM_FEATURES
+
diff --git a/src/platforms/windows/windowsHandler.cpp b/src/platforms/windows/windowsHandler.cpp
index 1a37c839..1ed4025b 100644
--- a/src/platforms/windows/windowsHandler.cpp
+++ b/src/platforms/windows/windowsHandler.cpp
@@ -21,9 +21,14 @@
 // the GNU General Public License cover the whole combination.
 //
 
-#include "vmime/platforms/windows/windowsHandler.hpp"
 #include "vmime/config.hpp"
 
+
+#if VMIME_PLATFORM_IS_WINDOWS
+
+
+#include "vmime/platforms/windows/windowsHandler.hpp"
+
 #include <time.h>
 #include <locale.h>
 #include <process.h>
@@ -270,3 +275,7 @@ void windowsHandler::wait() const
 } // posix
 } // platforms
 } // vmime
+
+
+#endif // VMIME_PLATFORM_IS_WINDOWS
+
diff --git a/src/platforms/windows/windowsSocket.cpp b/src/platforms/windows/windowsSocket.cpp
index 430c8ea0..27cbcaa7 100644
--- a/src/platforms/windows/windowsSocket.cpp
+++ b/src/platforms/windows/windowsSocket.cpp
@@ -21,13 +21,18 @@
 // the GNU General Public License cover the whole combination.
 //
 
+#include "vmime/config.hpp"
+
+
+#if VMIME_PLATFORM_IS_WINDOWS && VMIME_HAVE_MESSAGING_FEATURES
+
+
 #pragma warning(disable: 4267)
 
 #include "vmime/platforms/windows/windowsSocket.hpp"
 
 #include "vmime/exception.hpp"
 
-#if VMIME_HAVE_MESSAGING_FEATURES
 
 namespace vmime {
 namespace platforms {
@@ -193,4 +198,5 @@ ref <vmime::net::socket> windowsSocketFactory::create(ref <vmime::net::timeoutHa
 } // vmime
 
 
-#endif // VMIME_HAVE_MESSAGING_FEATURES
+#endif // VMIME_PLATFORM_IS_WINDOWS && VMIME_HAVE_MESSAGING_FEATURES
+