diff --git a/build.rb b/build.rb
index 58d3d474c2..b9538a2aa1 100755
--- a/build.rb
+++ b/build.rb
@@ -22,7 +22,7 @@ $pcsx2_prefix = " --prefix #{$main_dir}"
 $plugins_prefix = " --prefix #{$plugin_install_dir}"
 
 $plugin_list=["CDVDnull",  "dev9null", "FWnull", "USBnull", "SPU2null", "zerogs", "zzogl", "zeropad", "zerospu2", "PeopsSPU2", "CDVDiso", "CDVDisoEFP",  "CDVDlinuz"]
-$full_plugin_list=["CDVDnull",  "dev9null", "FWnull", "USBnull", "SPU2null", "zerogs", "zzogl", "zeropad", "zerospu2", "PeopsSPU2", "CDVDiso", "CDVDisoEFP",  "CDVDlinuz","GSnull","PadNull"]
+$full_plugin_list=["CDVDnull",  "dev9null", "FWnull", "USBnull", "SPU2null", "zerogs", "zzogl", "zeropad", "zerospu2", "PeopsSPU2", "CDVDiso", "CDVDisoEFP",  "CDVDlinuz","GSnull","PadNull","wxpad"]
 
 $pcsx2_build_types = {
 	"dev" => " --enable-devbuild ",
diff --git a/pcsx2/x86/iR5900Misc.cpp b/pcsx2/x86/iR5900Misc.cpp
index e496a1d311..28bdae4b03 100644
--- a/pcsx2/x86/iR5900Misc.cpp
+++ b/pcsx2/x86/iR5900Misc.cpp
@@ -8,7 +8,7 @@
 namespace R5900 {
 namespace Dynarec {
 
-// R5900 branch hepler!
+// R5900 branch helper!
 // Recompiles code for a branch test and/or skip, complete with delay slot
 // handling.  Note, for "likely" branches use iDoBranchImm_Likely instead, which
 // handles delay slots differently.
diff --git a/pcsx2/x86/microVU_Compile.inl b/pcsx2/x86/microVU_Compile.inl
index aa0f9ab271..439c42d26b 100644
--- a/pcsx2/x86/microVU_Compile.inl
+++ b/pcsx2/x86/microVU_Compile.inl
@@ -290,7 +290,7 @@ microVUt(void) mVUtestCycles(mV) {
 // Recompiler
 //------------------------------------------------------------------
 
-microVUt(void*) mVUcompile(microVU* mVU, u32 startPC, uptr pState) {
+void* mVUcompile(microVU* mVU, u32 startPC, uptr pState) {
 	
 	using namespace x86Emitter;
 	microBlock*	pBlock	 = NULL;
diff --git a/pcsx2/x86/microVU_Execute.inl b/pcsx2/x86/microVU_Execute.inl
index 3017e0636a..8d34b48000 100644
--- a/pcsx2/x86/microVU_Execute.inl
+++ b/pcsx2/x86/microVU_Execute.inl
@@ -84,7 +84,7 @@ microVUt(void) mVUdispatcherA(mV) {
 }
 
 // Generates the code to exit from recompiled blocks
-microVUt(void) mVUdispatcherB(mV) {
+void mVUdispatcherB(mV) {
 	mVU->exitFunct = x86Ptr;
 
 	// Load EE's MXCSR state
diff --git a/pcsx2/x86/sVU_zerorec.cpp b/pcsx2/x86/sVU_zerorec.cpp
index 95aedcc6f7..67af485fc2 100644
--- a/pcsx2/x86/sVU_zerorec.cpp
+++ b/pcsx2/x86/sVU_zerorec.cpp
@@ -98,7 +98,7 @@ extern void (*recVU_LOWER_OPCODE[128])(VURegs* VU, s32 info);
 
 // Let's tempt fate by defining two different constants with almost identical names
 #define INST_DUMMY_			0x8000
-#define INST_DUMMY			0x83c0
+#define INST_DUMMY				0x83c0
 
 #define VFFREE_INVALID0     0x80000000 // (vffree[i]&0xf) is invalid
 
@@ -955,7 +955,7 @@ static int _recbranchAddr(u32 vucode)
 static VuInstruction SuperVUFlushInst()
 {
 	VuInstruction inst;
-	// don't need to raed q/p
+	// don't need to read q/p
 	inst.type = INST_DUMMY_;//|INST_Q_READ|INST_P_READ;
 	return inst;
 }
diff --git a/plugins/PadNull/Pad.h b/plugins/PadNull/Pad.h
index 4f391f5c25..fb24ff72ca 100644
--- a/plugins/PadNull/Pad.h
+++ b/plugins/PadNull/Pad.h
@@ -21,15 +21,8 @@
 
 #include <stdio.h>
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif 
 #define PADdefs
 #include "PS2Edefs.h"
-#ifdef __cplusplus
-}
-#endif
 
 #ifdef _WIN32
 #include "PadWin.h"