diff --git a/3rdparty/SoundTouch/SoundTouch.cbp b/3rdparty/SoundTouch/SoundTouch.cbp
index fd5849934e..f80ce863cb 100644
--- a/3rdparty/SoundTouch/SoundTouch.cbp
+++ b/3rdparty/SoundTouch/SoundTouch.cbp
@@ -18,22 +18,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -45,8 +29,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/3rdparty/bzip2/bzip2.cbp b/3rdparty/bzip2/bzip2.cbp
index b7a49c1245..d90fd1308f 100644
--- a/3rdparty/bzip2/bzip2.cbp
+++ b/3rdparty/bzip2/bzip2.cbp
@@ -18,22 +18,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -45,8 +29,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/3rdparty/zlib/zlib.cbp b/3rdparty/zlib/zlib.cbp
index 8003438de7..507c6cb6d8 100644
--- a/3rdparty/zlib/zlib.cbp
+++ b/3rdparty/zlib/zlib.cbp
@@ -19,6 +19,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -30,18 +43,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/common/build/Utilities/Utilities.cbp b/common/build/Utilities/Utilities.cbp
index 3c869978a3..0537ff1ca7 100644
--- a/common/build/Utilities/Utilities.cbp
+++ b/common/build/Utilities/Utilities.cbp
@@ -63,6 +63,7 @@
+
@@ -108,6 +109,7 @@
+
diff --git a/common/build/x86emitter/x86emitter.cbp b/common/build/x86emitter/x86emitter.cbp
index 08807950a8..be01fea9ad 100644
--- a/common/build/x86emitter/x86emitter.cbp
+++ b/common/build/x86emitter/x86emitter.cbp
@@ -63,6 +63,7 @@
+
@@ -109,6 +110,7 @@
+
diff --git a/common/include/PS2Eext.h b/common/include/PS2Eext.h
index 61c9c339d5..d36525cd7d 100644
--- a/common/include/PS2Eext.h
+++ b/common/include/PS2Eext.h
@@ -35,7 +35,7 @@
//#include "PS2Edefs.h"
-static void __forceinline SysMessage(const char *fmt, ...);
+static void SysMessage(const char *fmt, ...);
static void __forceinline PluginNullConfigure(std::string desc, s32 &log);
static void __forceinline PluginNullAbout(const char *aboutText);
@@ -155,7 +155,7 @@ struct PluginConf
#ifdef __LINUX__
-static void __forceinline SysMessage(const char *fmt, ...)
+static void SysMessage(const char *fmt, ...)
{
va_list list;
char msg[512];
diff --git a/plugins/CDVDnull/Linux/CDVDnull.cbp b/plugins/CDVDnull/Linux/CDVDnull.cbp
index f3ce002311..47e51d6601 100644
--- a/plugins/CDVDnull/Linux/CDVDnull.cbp
+++ b/plugins/CDVDnull/Linux/CDVDnull.cbp
@@ -26,6 +26,7 @@
+
diff --git a/plugins/FWnull/Linux/FWnull.cbp b/plugins/FWnull/Linux/FWnull.cbp
index 8920396532..fac2ccac79 100644
--- a/plugins/FWnull/Linux/FWnull.cbp
+++ b/plugins/FWnull/Linux/FWnull.cbp
@@ -22,6 +22,7 @@
+
@@ -41,10 +42,10 @@
-
-
+
+
diff --git a/plugins/GSnull/Linux/GSnull.cbp b/plugins/GSnull/Linux/GSnull.cbp
index 14e5c84be4..161072847d 100644
--- a/plugins/GSnull/Linux/GSnull.cbp
+++ b/plugins/GSnull/Linux/GSnull.cbp
@@ -26,6 +26,7 @@
+
diff --git a/plugins/PadNull/Linux/PadNull.cbp b/plugins/PadNull/Linux/PadNull.cbp
index 3367f53e66..4ff56e801a 100644
--- a/plugins/PadNull/Linux/PadNull.cbp
+++ b/plugins/PadNull/Linux/PadNull.cbp
@@ -26,6 +26,7 @@
+
diff --git a/plugins/SPU2null/Linux/SPU2null.cbp b/plugins/SPU2null/Linux/SPU2null.cbp
index dec9eb6ba3..e52313aa83 100644
--- a/plugins/SPU2null/Linux/SPU2null.cbp
+++ b/plugins/SPU2null/Linux/SPU2null.cbp
@@ -29,6 +29,7 @@
+
diff --git a/plugins/USBnull/Linux/USBnull.cbp b/plugins/USBnull/Linux/USBnull.cbp
index 571406ee1a..d06fdb2b58 100644
--- a/plugins/USBnull/Linux/USBnull.cbp
+++ b/plugins/USBnull/Linux/USBnull.cbp
@@ -26,6 +26,7 @@
+
diff --git a/plugins/dev9null/Linux/Dev9null.cbp b/plugins/dev9null/Linux/Dev9null.cbp
index da535e31f2..73c5f32209 100644
--- a/plugins/dev9null/Linux/Dev9null.cbp
+++ b/plugins/dev9null/Linux/Dev9null.cbp
@@ -26,6 +26,7 @@
+
diff --git a/plugins/onepad/Linux/OnePad.cbp b/plugins/onepad/Linux/OnePad.cbp
index eb7a0ea69b..5b98d1c267 100644
--- a/plugins/onepad/Linux/OnePad.cbp
+++ b/plugins/onepad/Linux/OnePad.cbp
@@ -26,6 +26,7 @@
+
diff --git a/plugins/spu2-x/src/Linux/Config.cpp b/plugins/spu2-x/src/Linux/Config.cpp
index d7b87ff0b1..0f20dac0ff 100644
--- a/plugins/spu2-x/src/Linux/Config.cpp
+++ b/plugins/spu2-x/src/Linux/Config.cpp
@@ -45,7 +45,7 @@ bool EffectsDisabled = false;
int ReverbBoost = 0;
// OUTPUT
-u32 OutputModule = FindOutputModuleById( PortaudioOut->GetIdent() );
+u32 OutputModule = 0;
int SndOutLatencyMS = 160;
bool timeStretchEnabled = true;
bool asyncMixingEnabled = false;
diff --git a/plugins/spu2-x/src/Linux/SPU2-X.cbp b/plugins/spu2-x/src/Linux/SPU2-X.cbp
index 9ea9140bd9..78419593be 100644
--- a/plugins/spu2-x/src/Linux/SPU2-X.cbp
+++ b/plugins/spu2-x/src/Linux/SPU2-X.cbp
@@ -27,6 +27,7 @@
+
diff --git a/plugins/spu2-x/src/spu2sys.cpp b/plugins/spu2-x/src/spu2sys.cpp
index 208df15262..e21f572d87 100644
--- a/plugins/spu2-x/src/spu2sys.cpp
+++ b/plugins/spu2-x/src/spu2sys.cpp
@@ -57,7 +57,7 @@ __forceinline s16 * __fastcall GetMemPtr(u32 addr)
return (_spu2mem+addr);
}
-__forceinline s16 __fastcall spu2M_Read( u32 addr )
+s16 __fastcall spu2M_Read( u32 addr )
{
return *GetMemPtr( addr & 0xfffff );
}
@@ -1428,7 +1428,7 @@ static RegWriteHandler * const tbl_reg_writes[0x401] =
};
-__forceinline void SPU2_FastWrite( u32 rmem, u16 value )
+void SPU2_FastWrite( u32 rmem, u16 value )
{
tbl_reg_writes[(rmem&0x7ff)/2]( value );
}
diff --git a/plugins/zerogs/opengl/Linux/ZeroGS.cbp b/plugins/zerogs/opengl/Linux/ZeroGS.cbp
index 6f87c2f69a..457a979214 100644
--- a/plugins/zerogs/opengl/Linux/ZeroGS.cbp
+++ b/plugins/zerogs/opengl/Linux/ZeroGS.cbp
@@ -30,6 +30,7 @@
+
diff --git a/plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp b/plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp
index 7a412bf2ce..20aa16a5ef 100644
--- a/plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp
+++ b/plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp
@@ -34,6 +34,7 @@
+
@@ -50,6 +51,7 @@
+