--- libopenmpt-0.4.0+release.autotools.original/libopenmpt/libopenmpt_modplug_cpp.cpp	2018-08-30 15:03:30.000000000 +0200
+++ libopenmpt-0.4.0+release.autotools/libopenmpt/libopenmpt_modplug_cpp.cpp	2018-12-24 20:07:59.972914902 +0100
@@ -51,8 +51,6 @@
 /* libmodplug C++ header is broken for MSVC DLL builds */
 #define MODPLUG_STATIC
 #endif /* _MSC_VER */
-#include "libmodplug/stdafx.h"
-#include "libmodplug/sndfile.h"
 
 #ifdef _MSC_VER
 #define LIBOPENMPT_MODPLUG_API
@@ -60,6 +58,11 @@
 #define LIBOPENMPT_MODPLUG_API LIBOPENMPT_API_HELPER_EXPORT
 #endif /* _MSC_VER */
 
+class LIBOPENMPT_MODPLUG_API CSoundFile;
+
+#include "libmodplug/stdafx.h"
+#include "libmodplug/sndfile.h"
+
 namespace {
 template <class T>
 void Clear( T & x )