diff --git a/plugins/PadNull/CMakeLists.txt b/plugins/PadNull/CMakeLists.txt
index 18b1b6c15e..bc77be1893 100644
--- a/plugins/PadNull/CMakeLists.txt
+++ b/plugins/PadNull/CMakeLists.txt
@@ -24,7 +24,6 @@ set(PadNullLinuxSources
 
 # PadNull Linux headers
 set(PadNullLinuxHeaders
-	Linux/Config.h
 	Linux/PadLinux.h)
 
 # PadNull Windows sources
diff --git a/plugins/PadNull/Linux/Config.cpp b/plugins/PadNull/Linux/Config.cpp
index 3ca1393581..7ec96e4e65 100644
--- a/plugins/PadNull/Linux/Config.cpp
+++ b/plugins/PadNull/Linux/Config.cpp
@@ -17,12 +17,10 @@
  */
 
 #include <string>
-using namespace std;
 
 #include "Pad.h"
-#include "Config.h"
 
-extern string s_strIniPath;
+extern std::string s_strIniPath;
 PluginConf Ini;
 
 EXPORT_C_(void) PADabout()
diff --git a/plugins/PadNull/Linux/Config.h b/plugins/PadNull/Linux/Config.h
deleted file mode 100644
index 415f496f1d..0000000000
--- a/plugins/PadNull/Linux/Config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*  PadNull
- *  Copyright (C) 2004-2010 PCSX2 Team
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-void SaveConf();
-void LoadConf();
-void SysMessage(char *fmt, ...);
diff --git a/plugins/PadNull/Pad.h b/plugins/PadNull/Pad.h
index 22123e7fcf..d502f8188c 100644
--- a/plugins/PadNull/Pad.h
+++ b/plugins/PadNull/Pad.h
@@ -28,12 +28,6 @@
 #include "PadLinux.h"
 #endif
 
-/*#ifdef _MSC_VER
-#define EXPORT_C_(type) extern "C" __declspec(dllexport) type CALLBACK
-#else
-#define EXPORT_C_(type) extern "C" type
-#endif*/
-
 #ifdef _MSC_VER
 #define EXPORT_C_(type) extern "C" type CALLBACK
 #else
@@ -52,7 +46,6 @@ extern FILE *padLog;
 extern keyEvent event;
 
 extern void __Log(char *fmt, ...);
-extern void SysMessage(char *fmt, ...);
 extern void SaveConfig();
 extern void LoadConfig();
 
diff --git a/plugins/PadNull/Windows/PadWin.h b/plugins/PadNull/Windows/PadWin.h
index 506fdccb18..ddc698f382 100644
--- a/plugins/PadNull/Windows/PadWin.h
+++ b/plugins/PadNull/Windows/PadWin.h
@@ -13,12 +13,11 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PADLINUX_H__
-#define __PADLINUX_H__
+#ifndef PADWIN_H
+#define PADWIN_H
 
 #include "../Pad.h"
 #include <windows.h>
-#include <windowsx.h>
 
 void _PadUpdate(int pad);
 s32  _PADOpen(void *pDsp);
diff --git a/plugins/PadNull/Windows/Win32.cpp b/plugins/PadNull/Windows/Win32.cpp
index be6af77bf4..7803d64b73 100644
--- a/plugins/PadNull/Windows/Win32.cpp
+++ b/plugins/PadNull/Windows/Win32.cpp
@@ -13,26 +13,13 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
 #include <windows.h>
-#include <windowsx.h>
-
 
 #include "resource.h"
 #include "../Pad.h"
 
 HINSTANCE hInst;
 
-void SysMessage(char *fmt, ...) {
-	va_list list;
-	char tmp[512];
-
-	va_start(list,fmt);
-	vsprintf(tmp,fmt,list);
-	va_end(list);
-	MessageBox(0, tmp, "Pad Plugin Msg", 0);
-}
-
 BOOL CALLBACK ConfigureDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
 
 	switch(uMsg) {