1 files changed, 10 insertions, 7 deletions
diff --git a/plugins/ShellExt/src/stdafx.h b/plugins/ShellExt/src/stdafx.h
index b01486b518..14bc44366d 100644
--- a/plugins/ShellExt/src/stdafx.h
+++ b/plugins/ShellExt/src/stdafx.h
@@ -8,9 +8,7 @@
 #include <string.h>
 #include <stddef.h>
 
-#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
-
 #include <m_system.h>
 #include <m_protocols.h>
 #include <m_protosvc.h>
@@ -45,10 +43,15 @@ void    InvokeThreadServer();
 int     IsCOMRegistered();
 HRESULT RemoveCOMRegistryEntries();
 
-extern  HINSTANCE hInst;
-extern  HANDLE hLogger;
-extern  bool bIsVistaPlus;
-extern  int DllFactoryCount, DllObjectCount;
+struct CMPlugin : public PLUGIN<CMPlugin>
+{
+	CMPlugin() :
+		PLUGIN<CMPlugin>(SHLExt_Name)
+	{}
+};
+
+extern bool bIsVistaPlus;
+extern int DllFactoryCount, DllObjectCount;
 
 int OnOptionsInit(WPARAM wParam, LPARAM lParam);
 
@@ -57,7 +60,7 @@ int OnOptionsInit(WPARAM wParam, LPARAM lParam);
 #endif
 
 #ifdef LOG_ENABLED
-void logA(const char *format, ...);
+#define logA g_plugin.debugLogA
 #else
 #define logA(A, ...) 
 #endif