diff --git a/dll/MsRdpEx.cpp b/dll/MsRdpEx.cpp
index 176ea20..c215b76 100644
--- a/dll/MsRdpEx.cpp
+++ b/dll/MsRdpEx.cpp
@@ -9,11 +9,11 @@
 
 #include <MsRdpEx/Detours.h>
 
+#include "RdpDvcClient.h"
+
 #include <stdarg.h>
 #include <comutil.h>
 
-#include "RdpDvcClient.h"
-
 static HMODULE g_hModule = NULL;
 
 static bool g_AxHookEnabled = true;
@@ -93,13 +93,13 @@ HRESULT STDAPICALLTYPE MsRdpEx_DllGetClassObject(REFCLSID rclsid, REFIID riid, L
     return DllGetClassObject(rclsid, riid, ppv);
 }
 
-HRESULT DllRegisterServer()
+HRESULT STDAPICALLTYPE DllRegisterServer()
 {
     MsRdpEx_LogPrint(DEBUG, "DllRegisterServer");
     return S_OK;
 }
 
-HRESULT DllUnregisterServer()
+HRESULT STDAPICALLTYPE DllUnregisterServer()
 {
     MsRdpEx_LogPrint(DEBUG, "DllUnregisterServer");
     return S_OK;
diff --git a/dll/RdpDvcClient.h b/dll/RdpDvcClient.h
index 472321a..158d05d 100644
--- a/dll/RdpDvcClient.h
+++ b/dll/RdpDvcClient.h
@@ -3,11 +3,6 @@
 
 #include "MsRdpEx.h"
 
-#include <comdef.h>
-#include <atlbase.h>
-#include <oleidl.h>
-#include <commctrl.h>
-
 #include <tsvirtualchannels.h>
 
 class CRdpDvcClient :
@@ -80,8 +75,6 @@ class CRdpDvcPlugin :
     IWTSVirtualChannel* m_pChannel = NULL;
 };
 
-extern "C" const GUID CLSID_IMsRdpExDVCPlugin;
-
 HRESULT STDAPICALLTYPE DllGetClassObject_DvcPlugin(REFCLSID rclsid, REFIID riid, LPVOID* ppv, void* instance);
 
 #endif /* MSRDPEX_DVC_CLIENT_H */