diff --git a/Source/PluginSpecs/PluginSpecs.h b/Source/PluginSpecs/PluginSpecs.h
index 6a25752e33..45055f1015 100644
--- a/Source/PluginSpecs/PluginSpecs.h
+++ b/Source/PluginSpecs/PluginSpecs.h
@@ -11,6 +11,7 @@
 #define EXPORT	__declspec(dllexport)
 #define CALL	__cdecl
 #else
+#define __cdecl
 #define EXPORT	__attribute__ ((visibility("default")))
 #define CALL
 #endif
@@ -26,7 +27,6 @@
 #define FALSE 0 
 #endif
 
-#define __cdecl
 
 // simulate something that looks like win32
 // long term, kill these
@@ -67,6 +67,35 @@ typedef struct
     void *messageLogger;
 } PLUGIN_GLOBALS;
 
+///////////////////////////////////////////////////////////////////////////////
+// GLOBAL I N T E R F A C E ///////////////////////////////////////////////////
+// ____________________________________________________________________________
+// Function: GetDllInfo
+// Purpose:  This function allows the emulator to gather information
+//           about the DLL by filling in the PluginInfo structure.
+// input:    A pointer to a PLUGIN_INFO structure that needs to be
+//           filled by the function. (see def above)
+// output:   none
+//
+EXPORT void CALL GetDllInfo(PLUGIN_INFO* _pPluginInfo);
+
+// ___________________________________________________________________________
+// Function: DllConfig
+// Purpose:  This function is optional function that is provided
+//           to allow the user to configure the DLL
+// input:    A handle to the window that calls this function
+// output:   none
+//
+EXPORT void CALL DllConfig(void *_hParent);
+
+// ___________________________________________________________________________
+// Function: DllDebugger
+// Purpose:  Open the debugger
+// input:    a handle to the window that calls this function
+// output:   none
+//
+EXPORT void CALL DllDebugger(void *_hParent, bool Show);
+    
 #if defined(__cplusplus)
 }
 #endif
diff --git a/Source/PluginSpecs/pluginspecs_dsp.h b/Source/PluginSpecs/pluginspecs_dsp.h
index edf7c01fc1..8a6a240156 100644
--- a/Source/PluginSpecs/pluginspecs_dsp.h
+++ b/Source/PluginSpecs/pluginspecs_dsp.h
@@ -30,41 +30,6 @@ typedef struct
 	TAudioGetStreaming		pGetAudioStreaming;
 } DSPInitialize;
 
-// __________________________________________________________________________________________________
-// Function: GetDllInfo
-// Purpose:  This function allows the emulator to gather information
-//           about the DLL by filling in the PluginInfo structure.
-// input:    a pointer to a PLUGIN_INFO structure that needs to be
-//           filled by the function. (see def above)
-// output:   none
-//
-EXPORT void CALL GetDllInfo(PLUGIN_INFO* _pPluginInfo);
-
-// __________________________________________________________________________________________________
-// Function: DllConfig
-// Purpose:  This function is optional function that is provided
-//           to allow the user to configure the DLL
-// input:    a handle to the window that calls this function
-// output:   none
-//
-EXPORT void CALL DllConfig(HWND _hParent);
-
-// __________________________________________________________________________________________________
-// Function: DllDebugger
-// Purpose:  Open the debugger
-// input:    a handle to the window that calls this function
-// output:   none
-//
-EXPORT void CALL DllDebugger(HWND _hParent, bool Show);
-
-// __________________________________________________________________________________________________
-// Function: DSP_Initialize
-// Purpose:  
-// input:    DSPInitialize
-// output:   none
-//
-EXPORT void CALL DSP_Initialize(DSPInitialize _dspInitialize);
-
 // __________________________________________________________________________________________________
 // Function: DSP_Shutdown
 // Purpose:  This function is called when the emulator is shutting down
diff --git a/Source/PluginSpecs/pluginspecs_pad.h b/Source/PluginSpecs/pluginspecs_pad.h
index bf205cd1cd..0dfd6af645 100644
--- a/Source/PluginSpecs/pluginspecs_pad.h
+++ b/Source/PluginSpecs/pluginspecs_pad.h
@@ -53,35 +53,7 @@ typedef struct
 } SPADStatus;
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////
-// I N T E R F A C E ////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// __________________________________________________________________________________________________
-// Function: GetDllInfo
-// Purpose:  This function allows the emulator to gather information
-//           about the DLL by filling in the PluginInfo structure.
-// input:    A pointer to a PLUGIN_INFO structure that needs to be
-//           filled by the function. (see def above)
-// output:   none
-//
-EXPORT void CALL GetDllInfo(PLUGIN_INFO* _pPluginInfo);
-
-// __________________________________________________________________________________________________
-// Function: DllConfig
-// Purpose:  This function is optional function that is provided
-//           to allow the user to configure the DLL
-// input:    A handle to the window that calls this function
-// output:   none
-//
-EXPORT void CALL DllConfig(HWND _hParent);
-
-// __________________________________________________________________________________________________
-// Function: DllDebugger
-// Purpose:  Open the debugger
-// input:    a handle to the window that calls this function
-// output:   none
-//
-EXPORT void CALL DllDebugger(HWND _hParent, bool Show);
+// I N T E R F A C E ///////////////////////////////////////////////////////////
 
 // __________________________________________________________________________________________________
 // Function: 
diff --git a/Source/PluginSpecs/pluginspecs_video.h b/Source/PluginSpecs/pluginspecs_video.h
index 463ba1dcf8..37bbf98a74 100644
--- a/Source/PluginSpecs/pluginspecs_video.h
+++ b/Source/PluginSpecs/pluginspecs_video.h
@@ -78,38 +78,6 @@ typedef struct
 // I N T E R F A C E ////////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 
-// __________________________________________________________________________________________________
-// Function: GetDllInfo
-// Purpose:  This function allows the emulator to gather information
-//           about the DLL by filling in the PluginInfo structure.
-// input:    a pointer to a PLUGIN_INFO structure that needs to be
-//           filled by the function. (see def above)
-// output:   none
-//
-//
-#ifndef _WIN32 
-#define _CDECLCALL 
-#endif
-
-EXPORT void CALL GetDllInfo(PLUGIN_INFO* _pPluginInfo);
-
-// __________________________________________________________________________________________________
-// Function: DllConfig
-// Purpose:  This function is optional function that is provided
-//           to allow the user to configure the DLL
-// input:    a handle to the window that calls this function
-// output:   none
-//
-EXPORT void CALL DllConfig(HWND _hParent);
-
-// __________________________________________________________________________________________________
-// Function: DllDebugger
-// Purpose:  Open the debugger
-// input:    a handle to the window that calls this function
-// output:   none
-//
-EXPORT void CALL DllDebugger(HWND _hParent, bool Show);
-
 // __________________________________________________________________________________________________
 // Function: Video_Initialize
 // Purpose:
diff --git a/Source/PluginSpecs/pluginspecs_wiimote.h b/Source/PluginSpecs/pluginspecs_wiimote.h
index 9ba08baf08..03a218d319 100644
--- a/Source/PluginSpecs/pluginspecs_wiimote.h
+++ b/Source/PluginSpecs/pluginspecs_wiimote.h
@@ -46,33 +46,6 @@ typedef struct
 // I N T E R F A C E ////////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 
-// __________________________________________________________________________________________________
-// Function: GetDllInfo
-// Purpose:  This function allows the emulator to gather information
-//           about the DLL by filling in the PluginInfo structure.
-// input:    a pointer to a PLUGIN_INFO structure that needs to be
-//           filled by the function. (see def above)
-// output:   none
-//
-EXPORT void CALL GetDllInfo(PLUGIN_INFO* _pPluginInfo);
-
-// __________________________________________________________________________________________________
-// Function: DllConfig
-// Purpose:  This function is optional function that is provided
-//           to allow the user to configure the DLL
-// input:    a handle to the window that calls this function
-// output:   none
-//
-EXPORT void CALL DllConfig(HWND _hParent);
-
-// __________________________________________________________________________________________________
-// Function: DllDebugger
-// Purpose:  Open the debugger
-// input:    a handle to the window that calls this function
-// output:   none
-//
-EXPORT void CALL DllDebugger(HWND _hParent, bool Show);
-
 // __________________________________________________________________________________________________
 // Function: 
 // Purpose: