diff --git a/dll/AxHost/RdpAxHostWnd.cpp b/dll/AxHost/RdpAxHostWnd.cpp
index b35f8da..9c7266d 100644
--- a/dll/AxHost/RdpAxHostWnd.cpp
+++ b/dll/AxHost/RdpAxHostWnd.cpp
@@ -488,7 +488,7 @@ class CRdpAxHostWnd : public IUnknown
 
         // Add Zoom submenu to the system menu
         ::AppendMenu(hSysMenu, MF_SEPARATOR, 0, NULL);
-        ::AppendMenu(hSysMenu, MF_POPUP, (UINT_PTR)hZoomMenu, _T("Zoom"));
+        ::AppendMenu(hSysMenu, MF_POPUP, (::UINT_PTR)hZoomMenu, _T("Zoom"));
 
         ::AppendMenu(hSysMenu, MF_STRING | ToMenuCheckFlag(m_smartSizing), SYSCOMMAND_SMART_SIZING_ID, _T("Smart Sizing"));
 
diff --git a/dll/AxHost/RdpWinMain.cpp b/dll/AxHost/RdpWinMain.cpp
index f58b569..723e9ec 100644
--- a/dll/AxHost/RdpWinMain.cpp
+++ b/dll/AxHost/RdpWinMain.cpp
@@ -20,7 +20,7 @@ static LPWSTR ProcessAxHostCommandLine(LPWSTR lpCmdLine, bool* axHost)
     return cmdLine;
 }
 
-int WINAPI MsRdpEx_WinMain(
+int MsRdpEx_WinMain(
     _In_ HINSTANCE hInstance,
     _In_opt_ HINSTANCE hPrevInstance,
     _In_ LPWSTR lpCmdLine,
diff --git a/dll/AxHost/RdpWinMain.h b/dll/AxHost/RdpWinMain.h
index 07596c1..bf3b5b8 100644
--- a/dll/AxHost/RdpWinMain.h
+++ b/dll/AxHost/RdpWinMain.h
@@ -3,6 +3,10 @@
 
 #include <MsRdpEx/MsRdpEx.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int MsRdpEx_WinMain(
     HINSTANCE hInstance,
     HINSTANCE hPrevInstance,
@@ -10,4 +14,8 @@ int MsRdpEx_WinMain(
     int nCmdShow,
     const char* axName);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* MSRDPEX_WIN_MAIN_H */