diff --git a/src/xrCore/Debug/dxerr.cpp b/src/xrCore/Debug/dxerr.cpp
index 1ce07bee27d..f80b02c7bb6 100644
--- a/src/xrCore/Debug/dxerr.cpp
+++ b/src/xrCore/Debug/dxerr.cpp
@@ -21,8 +21,9 @@
 #include <d3d9.h>
 #include <audiodefs.h>
 #include <dsound.h>
-
+#ifndef DIRECTINPUT_VERSION
 #define DIRECTINPUT_VERSION 0x800
+#endif
 #include <dinput.h>
 #include <dinputd.h>
 #endif
@@ -136,6 +137,11 @@ const CHAR* WINAPI DXGetErrorStringA( _In_ HRESULT hr )
 #undef CHK_ERR_WIN32A
 #undef CHK_ERR_WIN32_ONLY
 
+#undef CHK_ERRA_W
+#undef CHK_ERR_W
+#undef CHK_ERRA_A
+#undef CHK_ERR_A
+
 #define  CHK_ERRA_W(hrchk) \
         case hrchk: \
              wcscpy_s( desc, count, L#hrchk );