diff --git a/libs/backends/wavesaudio/wavesapi/miscutils/MinMaxUtilities.h b/libs/backends/wavesaudio/wavesapi/MiscUtils/MinMaxUtilities.h
similarity index 97%
rename from libs/backends/wavesaudio/wavesapi/miscutils/MinMaxUtilities.h
rename to libs/backends/wavesaudio/wavesapi/MiscUtils/MinMaxUtilities.h
index 560e274ae3..d6a86ff93e 100644
--- a/libs/backends/wavesaudio/wavesapi/miscutils/MinMaxUtilities.h
+++ b/libs/backends/wavesaudio/wavesapi/MiscUtils/MinMaxUtilities.h
@@ -9,6 +9,10 @@
 #include "BasicTypes/WUMathConsts.h"
 #include "WavesPublicAPI/wstdint.h"
 
+#ifdef __GNUC__
+#undef round
+#endif
+
 // New accelerated templates
 #if defined ( __cplusplus ) && !defined (__WUMinMax)
 #define __WUMinMax   // Also defined in Nativepr.h
@@ -30,12 +34,18 @@ template<class T> inline T WUMinMax(const T &Smallest, const T &Biggest, const T
 	}
  */	
 // Absolute value
+
 #ifdef PLATFORM_WINDOWS
 	#include <math.h>
+
+#ifndef __GNUC__
 #define __abs(x)	abs(x) 
 #define __labs(x)	labs(x)
 #define __fabs(x)	fabs(x)
 #endif
+
+#endif
+
 #ifdef __GNUC__
 	#include <iostream> // why don't know makes it work need to check
 	#include <cstdlib>
diff --git a/libs/backends/wavesaudio/wavesapi/miscutils/UMicroseconds.cpp b/libs/backends/wavesaudio/wavesapi/MiscUtils/UMicroseconds.cpp
similarity index 100%
rename from libs/backends/wavesaudio/wavesapi/miscutils/UMicroseconds.cpp
rename to libs/backends/wavesaudio/wavesapi/MiscUtils/UMicroseconds.cpp
diff --git a/libs/backends/wavesaudio/wavesapi/miscutils/UMicroseconds.h b/libs/backends/wavesaudio/wavesapi/MiscUtils/UMicroseconds.h
similarity index 100%
rename from libs/backends/wavesaudio/wavesapi/miscutils/UMicroseconds.h
rename to libs/backends/wavesaudio/wavesapi/MiscUtils/UMicroseconds.h
diff --git a/libs/backends/wavesaudio/wavesapi/miscutils/WCFixedString.h b/libs/backends/wavesaudio/wavesapi/MiscUtils/WCFixedString.h
similarity index 100%
rename from libs/backends/wavesaudio/wavesapi/miscutils/WCFixedString.h
rename to libs/backends/wavesaudio/wavesapi/MiscUtils/WCFixedString.h
diff --git a/libs/backends/wavesaudio/wavesapi/miscutils/WUErrors.h b/libs/backends/wavesaudio/wavesapi/MiscUtils/WUErrors.h
similarity index 100%
rename from libs/backends/wavesaudio/wavesapi/miscutils/WUErrors.h
rename to libs/backends/wavesaudio/wavesapi/MiscUtils/WUErrors.h
diff --git a/libs/backends/wavesaudio/wavesapi/miscutils/pthread_utils.h b/libs/backends/wavesaudio/wavesapi/MiscUtils/pthread_utils.h
similarity index 100%
rename from libs/backends/wavesaudio/wavesapi/miscutils/pthread_utils.h
rename to libs/backends/wavesaudio/wavesapi/MiscUtils/pthread_utils.h
diff --git a/libs/backends/wavesaudio/wavesapi/miscutils/safe_delete.h b/libs/backends/wavesaudio/wavesapi/MiscUtils/safe_delete.h
similarity index 100%
rename from libs/backends/wavesaudio/wavesapi/miscutils/safe_delete.h
rename to libs/backends/wavesaudio/wavesapi/MiscUtils/safe_delete.h
diff --git a/libs/backends/wavesaudio/wavesapi/threads/WCThreadSafe.cpp b/libs/backends/wavesaudio/wavesapi/Threads/WCThreadSafe.cpp
similarity index 100%
rename from libs/backends/wavesaudio/wavesapi/threads/WCThreadSafe.cpp
rename to libs/backends/wavesaudio/wavesapi/Threads/WCThreadSafe.cpp
diff --git a/libs/backends/wavesaudio/wavesapi/threads/WCThreadSafe.h b/libs/backends/wavesaudio/wavesapi/Threads/WCThreadSafe.h
similarity index 100%
rename from libs/backends/wavesaudio/wavesapi/threads/WCThreadSafe.h
rename to libs/backends/wavesaudio/wavesapi/Threads/WCThreadSafe.h
diff --git a/libs/backends/wavesaudio/wavesapi/wavespublicapi/1.0/WavesPublicAPI_Defines.h b/libs/backends/wavesaudio/wavesapi/WavesPublicAPI/1.0/WavesPublicAPI_Defines.h
similarity index 100%
rename from libs/backends/wavesaudio/wavesapi/wavespublicapi/1.0/WavesPublicAPI_Defines.h
rename to libs/backends/wavesaudio/wavesapi/WavesPublicAPI/1.0/WavesPublicAPI_Defines.h
diff --git a/libs/backends/wavesaudio/wavesapi/wavespublicapi/WTErr.h b/libs/backends/wavesaudio/wavesapi/WavesPublicAPI/WTErr.h
similarity index 100%
rename from libs/backends/wavesaudio/wavesapi/wavespublicapi/WTErr.h
rename to libs/backends/wavesaudio/wavesapi/WavesPublicAPI/WTErr.h
diff --git a/libs/backends/wavesaudio/wavesapi/wavespublicapi/wstdint.h b/libs/backends/wavesaudio/wavesapi/WavesPublicAPI/wstdint.h
similarity index 99%
rename from libs/backends/wavesaudio/wavesapi/wavespublicapi/wstdint.h
rename to libs/backends/wavesaudio/wavesapi/WavesPublicAPI/wstdint.h
index 0daebdaed0..e00f889404 100644
--- a/libs/backends/wavesaudio/wavesapi/wavespublicapi/wstdint.h
+++ b/libs/backends/wavesaudio/wavesapi/WavesPublicAPI/wstdint.h
@@ -20,7 +20,7 @@
 #endif
 
 #if (defined (PLATFORM_WINDOWS) || defined(WIN32) || defined(WIN64))
-#if (_MSC_VER > 1600) || defined(__MINGW64__)
+#if (_MSC_VER > 1600) || defined(__MINGW64__) || defined(__MINGW32__)
     // Taken from MSDN official page:
     // In Visual Studio 2010 _MSC_VER  is defined as 1600, In Visual Studio 2012 _MSC_VER  is defined as 1700.
     #include <stdint.h>
diff --git a/libs/backends/wavesaudio/wavesapi/devicemanager/IncludeWindows.h b/libs/backends/wavesaudio/wavesapi/devicemanager/IncludeWindows.h
index 31158a7fe0..2b5dc5b7aa 100644
--- a/libs/backends/wavesaudio/wavesapi/devicemanager/IncludeWindows.h
+++ b/libs/backends/wavesaudio/wavesapi/devicemanager/IncludeWindows.h
@@ -23,8 +23,8 @@
 #define NOMINMAX // DO NOT REMOVE NOMINMAX - DOING SO CAUSES CONFLICTS WITH STD INCLUDES (<limits> ...)
 #endif
 
-#include <WinSock2.h>
-#include <Windows.h>
+#include <winsock2.h>
+#include <windows.h>
 #include <objbase.h>
 #endif // #if PLATFORM_WINDOWS 
 #endif // #ifndef __IncludeWindows_h__
diff --git a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp
index 1c7149f78a..69b677b025 100644
--- a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp
+++ b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp
@@ -16,7 +16,7 @@
 #include <list>
 using namespace wvNS;
 #include "IncludeWindows.h"
-#include <MMSystem.h>
+#include <mmsystem.h>
 #include "pa_asio.h"
 #include "asio.h"
 
diff --git a/libs/backends/wavesaudio/wscript b/libs/backends/wavesaudio/wscript
index c1ff717d10..f083128e84 100644
--- a/libs/backends/wavesaudio/wscript
+++ b/libs/backends/wavesaudio/wscript
@@ -52,14 +52,14 @@ def build(bld):
             'wavesapi/refmanager/WCRefManager.cpp',
             'wavesapi/devicemanager/WCMRAudioDeviceManager.cpp',
             'wavesapi/devicemanager/WCMRNativeAudio.cpp',
-            'wavesapi/threads/WCThreadSafe.cpp',
+            'wavesapi/Threads/WCThreadSafe.cpp',
             'portmidi/src/pm_common/pmutil.c',
             'portmidi/src/pm_common/portmidi.c'
             ]
 
     if bld.env['build_target'] == 'mingw':
         platform_dependent = [
-                        'wavesapi/miscutils/UMicroseconds.cpp',
+                        'wavesapi/MiscUtils/UMicroseconds.cpp',
                         'wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp',
                         'portmidi/src/pm_win/pmwin.c',
                         'portmidi/src/pm_win/pmwinmm.c',
@@ -80,10 +80,10 @@ def build(bld):
     obj.includes = ['.',
            'wavesapi',
            'wavesapi/refmanager',
-           'wavesapi/wavespublicapi',
+           'wavesapi/WavesPublicAPI',
            'wavesapi/devicemanager',
-           'wavesapi/miscutils',
-           'wavesapi/threads',
+           'wavesapi/MiscUtils',
+           'wavesapi/Threads',
            'portmidi',
            'portmidi/src/pm_common'
             ]
diff --git a/libs/backends/wscript b/libs/backends/wscript
index a8629253f5..7923a34c94 100644
--- a/libs/backends/wscript
+++ b/libs/backends/wscript
@@ -31,7 +31,7 @@ def backend_list():
         else:
             backends = [ ]
 
-    if sys.platform == 'darwin' or sys.platform == 'mingw' or sys.platform == 'msvc' or Options.options.dist_target == 'mingw':
+    if sys.platform == 'darwin' or sys.platform == 'mingw' or sys.platform == 'msvc': # or Options.options.dist_target == 'mingw':
         backends += [ 'wavesaudio' ]
 
     return backends