diff --git a/modules/rostests/apitests/apphelp/register.cpp b/modules/rostests/apitests/apphelp/register.cpp
index fb093cc594d..146dc8cf373 100644
--- a/modules/rostests/apitests/apphelp/register.cpp
+++ b/modules/rostests/apitests/apphelp/register.cpp
@@ -7,7 +7,7 @@
 
 #include <ntstatus.h>
 #define WIN32_NO_STATUS
-#include <windows.h>
+#include <windef.h>
 #include <ntndk.h>
 #include <atlbase.h>
 #include <strsafe.h>
diff --git a/sdk/include/xdk/ntbasedef.h b/sdk/include/xdk/ntbasedef.h
index 67ddadcfcf8..a40ee83e573 100644
--- a/sdk/include/xdk/ntbasedef.h
+++ b/sdk/include/xdk/ntbasedef.h
@@ -343,7 +343,7 @@ typedef void *HANDLE, **PHANDLE;
  typedef char CHAR;
  typedef short SHORT;
 
- #if defined(__ROS_LONG64__) && !defined(_M_AMD64)
+ #if defined(__ROS_LONG64__)
   typedef int LONG;
  #else
   typedef long LONG;