diff --git a/modules/com_engine/src/cpp/ActiveXServer.cpp b/modules/com_engine/src/cpp/ActiveXServer.cpp
index 4b2d3720a7..6d9ea3c665 100644
--- a/modules/com_engine/src/cpp/ActiveXServer.cpp
+++ b/modules/com_engine/src/cpp/ActiveXServer.cpp
@@ -8,7 +8,6 @@
 // LICENCE_BLOCK_END
 //=============================================================================
 #include <Ole2.h>
-#include <atlconv.h>
 #include "ActiveXServer.hpp"
 #include "Error.hpp"
 #include "i18n.hpp"
@@ -17,6 +16,7 @@
 //=============================================================================
 namespace Nelson {
 //=============================================================================
+#define W2OLE(x) ((LPOLESTR)(x))
 ComHandleObject*
 ActiveXServer(const std::wstring& progId, const std::wstring& machine)
 {
diff --git a/modules/com_engine/src/cpp/ComHelpers.cpp b/modules/com_engine/src/cpp/ComHelpers.cpp
index d8e47e49d1..ef6801a470 100644
--- a/modules/com_engine/src/cpp/ComHelpers.cpp
+++ b/modules/com_engine/src/cpp/ComHelpers.cpp
@@ -9,12 +9,12 @@
 //=============================================================================
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#include <atlconv.h>
 #include "ComHelpers.hpp"
 #include "StringHelpers.hpp"
 //=============================================================================
 namespace Nelson {
 //=============================================================================
+#define W2OLE(x) ((LPOLESTR)(x))
 bool
 isMethodCom(IDispatch* pDisp, std::wstring methodToSearch)
 {
diff --git a/modules/com_engine/src/cpp/invokeCOM.cpp b/modules/com_engine/src/cpp/invokeCOM.cpp
index c6cfad4a55..74335861ca 100644
--- a/modules/com_engine/src/cpp/invokeCOM.cpp
+++ b/modules/com_engine/src/cpp/invokeCOM.cpp
@@ -8,11 +8,11 @@
 // LICENCE_BLOCK_END
 //=============================================================================
 #include <stdexcept>
-#include <atlconv.h>
 #include "invokeCOM.hpp"
 #include "Error.hpp"
 #include "i18n.hpp"
 //=============================================================================
+#define W2OLE(x) ((LPOLESTR)(x))
 bool
 invokeCom(int autoType, VARIANT* pvResult, std::wstring& errorMessage, IDispatch* pDisp,
     std::wstring propertyName, int cArgs, VARIANT* pArgs)
diff --git a/modules/com_engine/src/cpp/invokeComHandleObject.cpp b/modules/com_engine/src/cpp/invokeComHandleObject.cpp
index 8e302da986..1610d7f419 100644
--- a/modules/com_engine/src/cpp/invokeComHandleObject.cpp
+++ b/modules/com_engine/src/cpp/invokeComHandleObject.cpp
@@ -9,7 +9,6 @@
 //=============================================================================
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
-#include <atlconv.h>
 #include "invokeComHandleObject.hpp"
 #include "ComHandleObject.hpp"
 #include "Error.hpp"
diff --git a/modules/com_engine/src/include/VariantConversionHelpers.hpp b/modules/com_engine/src/include/VariantConversionHelpers.hpp
index cf9692d047..9f2a32d1a2 100644
--- a/modules/com_engine/src/include/VariantConversionHelpers.hpp
+++ b/modules/com_engine/src/include/VariantConversionHelpers.hpp
@@ -11,6 +11,8 @@
 //=============================================================================
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
+#include <oaidl.h>
+#include <oleauto.h>
 #include "ArrayOf.hpp"
 #include "nlsCom_engine_exports.h"
 //=============================================================================