diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12dd07e5085..3583b78b894 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -336,14 +336,12 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
     add_subdirectory(sdk/include/reactos/mc)
     add_subdirectory(sdk/include/asm)
 
-    if(NO_ROSSYM)
+    if(ARCH MATCHES "64$")
+        include(sdk/cmake/baseaddress64.cmake)  
+    elseif(NO_ROSSYM)
         include(sdk/cmake/baseaddress_dwarf.cmake)
     elseif(MSVC)
-        if (ARCH STREQUAL "amd64")
-            include(sdk/cmake/baseaddress_msvc_x64.cmake)
-        else()
-            include(sdk/cmake/baseaddress_msvc.cmake)
-        endif()
+        include(sdk/cmake/baseaddress_msvc.cmake)
     else()
         include(sdk/cmake/baseaddress.cmake)
     endif()
diff --git a/sdk/cmake/baseaddress_msvc_x64.cmake b/sdk/cmake/baseaddress64.cmake
similarity index 100%
rename from sdk/cmake/baseaddress_msvc_x64.cmake
rename to sdk/cmake/baseaddress64.cmake