diff --git a/plugins/CDVDiso/src/Windows/svnrev.h b/plugins/CDVDiso/src/Windows/svnrev.h
deleted file mode 100755
index d0992dc800..0000000000
--- a/plugins/CDVDiso/src/Windows/svnrev.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// svnrev_template.h --> svnrev.h
-//
-// This file acts as a template for the automatic SVN revision/version tag.
-// It is used by the utility SubWCrev.exe to create an "svnrev.h" file for
-// whichever project is being compiled (as indicated by command line options
-// passed to SubWCRev.exe during the project's pre-build step).
-//
-// The SubWCRev.exe utility is part of TortoiseSVN and requires several DLLs
-// installed by TortoiseSVN, so it will only be available if you have TortoiseSVN
-// installed on your system.  If you do not have it installed, a generic template
-// is used instead (see svnrev_generic.h).  Having TortoiseSVN is handy but not
-// necessary.  If you do not have it installed, everything will still compile
-// fine except without the SVN revision tagged to the application/dll version.
-//
-// TortoiseSVN can be downloaded from http://tortoisesvn.tigris.org
-
-#define SVN_REV 798
-#define SVN_MODS 1
\ No newline at end of file
diff --git a/plugins/FWnull/Linux/Config.cpp b/plugins/FWnull/Linux/Config.cpp
index 515914ca1b..5cd7583574 100644
--- a/plugins/FWnull/Linux/Config.cpp
+++ b/plugins/FWnull/Linux/Config.cpp
@@ -29,12 +29,18 @@ using namespace std;
 #include "FW.h"
 #include "Config.h"
 
+ #ifdef __cplusplus
 extern "C"
 {
-#include "interface.h"
+#endif
+
 #include "support.h"
-//#include "callbacks.h"
+#include "callbacks.h"
+#include "interface.h"
+
+#ifdef __cplusplus
 }
+#endif
 
 GtkWidget *MsgDlg, *About, *Conf;
 extern string s_strIniPath;
diff --git a/plugins/FWnull/Makefile.am b/plugins/FWnull/Makefile.am
index 708c80c51b..60060ae259 100644
--- a/plugins/FWnull/Makefile.am
+++ b/plugins/FWnull/Makefile.am
@@ -28,6 +28,7 @@ FW.h Linux/Config.h Linux/Linux.h
 libFWnull_a_SOURCES += \
 Linux/interface.h Linux/support.c  \
 Linux/interface.c Linux/support.h \
-Linux/callbacks.c Linux/callbacks.h 
+Linux/callbacks.h 
+#Linux/callbacks.c 
 
 #SUBDIRS = Linux
\ No newline at end of file
diff --git a/plugins/FWnull/build.sh b/plugins/FWnull/build.sh
index e45a9a3793..c2df048482 100644
--- a/plugins/FWnull/build.sh
+++ b/plugins/FWnull/build.sh
@@ -29,9 +29,4 @@ fi
 if [ $? -ne 0 ]
 then
 exit 1
-fi
-
-if [ -s cfgFWnull ] && [ -s libFWnull.so ]
-then
-cp cfgFWnull libFWnull.so ${PCSX2PLUGINS}
-fi
+fi
\ No newline at end of file
diff --git a/plugins/SPU2null/configure.ac b/plugins/SPU2null/configure.ac
index 59ffe18988..2cc0ffb87d 100644
--- a/plugins/SPU2null/configure.ac
+++ b/plugins/SPU2null/configure.ac
@@ -1,6 +1,6 @@
-AC_INIT(SPU2null, 0.5,arcum42@gmail.com)
+AC_INIT(SPU2null, 0.71,arcum42@gmail.com)
 
-AM_INIT_AUTOMAKE(SPU2null,0.8)
+AM_INIT_AUTOMAKE(SPU2null,0.71)
 
 AC_PROG_CC([gcc g++ cl KCC CC cxx cc++ xlC aCC c++])
 AC_PROG_CXX([gcc g++ cl KCC CC cxx cc++ xlC aCC c++])
@@ -13,8 +13,8 @@ dnl necessary for compiling assembly
 AM_PROG_AS
 
 AC_SUBST(SPU2null_CURRENT, 0)
-AC_SUBST(SPU2null_REVISION, 8)
-AC_SUBST(SPU2null_AGE, 0)
+AC_SUBST(SPU2null_REVISION, 7)
+AC_SUBST(SPU2null_AGE, 1)
 AC_SUBST(SPU2null_RELEASE,[$SPU2null_CURRENT].[$SPU2null_REVISION].[$SPU2null_AGE])
 AC_SUBST(SPU2null_SONAME,libSPU2null.so.[$SPU2null_CURRENT].[$SPU2null_REVISION].[$SPU2null_AGE])
 
diff --git a/plugins/USBnull/Linux/Config.cpp b/plugins/USBnull/Linux/Config.cpp
index 1456f2e2d6..f7b43f4852 100644
--- a/plugins/USBnull/Linux/Config.cpp
+++ b/plugins/USBnull/Linux/Config.cpp
@@ -26,12 +26,18 @@
 #include <string>
 using namespace std;
 
+ #ifdef __cplusplus
 extern "C"
 {
-#include "interface.h"
+#endif
+
 #include "support.h"
-//#include "callbacks.h"
+#include "callbacks.h"
+#include "interface.h"
+
+#ifdef __cplusplus
 }
+#endif
 
 #include "USB.h"
 
diff --git a/plugins/USBnull/Makefile.am b/plugins/USBnull/Makefile.am
index d4241d3ad0..838ab78919 100644
--- a/plugins/USBnull/Makefile.am
+++ b/plugins/USBnull/Makefile.am
@@ -28,6 +28,7 @@ USB.h Linux/Config.h Linux/Linux.h
 libUSBnull_a_SOURCES += \
 Linux/interface.h Linux/support.c  \
 Linux/interface.c Linux/support.h \
-Linux/callbacks.c Linux/callbacks.h 
+Linux/callbacks.h 
+#Linux/callbacks.c 
 
 #SUBDIRS = Linux
\ No newline at end of file
diff --git a/plugins/USBnull/build.sh b/plugins/USBnull/build.sh
index 65d48eb346..9965413fd5 100644
--- a/plugins/USBnull/build.sh
+++ b/plugins/USBnull/build.sh
@@ -30,8 +30,3 @@ if [ $? -ne 0 ]
 then
 exit 1
 fi
-
-#if [ -s cfgFWnull ] && [ -s libUSBnull.so ]
-#then
-#cp cfgFWnull libFWnull.so ${PCSX2PLUGINS}
-#fi
diff --git a/plugins/USBnull/configure.ac b/plugins/USBnull/configure.ac
index 226e7f2036..4a5de1dc8d 100644
--- a/plugins/USBnull/configure.ac
+++ b/plugins/USBnull/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(USBnull, 0.5,arcum42@gmail.com)
+AC_INIT(USBnull, 0.6,arcum42@gmail.com)
 
 AM_INIT_AUTOMAKE(USBnull,0.6)
 
diff --git a/plugins/dev9null/configure.ac b/plugins/dev9null/configure.ac
index f2573aa6d2..a14ec42970 100644
--- a/plugins/dev9null/configure.ac
+++ b/plugins/dev9null/configure.ac
@@ -13,7 +13,7 @@ dnl necessary for compiling assembly
 AM_PROG_AS
 
 AC_SUBST(DEV9null_CURRENT, 0)
-AC_SUBST(DEV9null_REVISION, 8)
+AC_SUBST(DEV9null_REVISION, 4)
 AC_SUBST(DEV9null_AGE, 0)
 AC_SUBST(DEV9null_RELEASE,[$DEV9null_CURRENT].[$DEV9null_REVISION].[$DEV9null_AGE])
 AC_SUBST(DEV9null_SONAME,libDEV9null.so.[$DEV9null_CURRENT].[$DEV9null_REVISION].[$DEV9null_AGE])