diff --git a/reactos/boot/freeldr/freeldr/CMakeLists.txt b/reactos/boot/freeldr/freeldr/CMakeLists.txt
index db983054447..7f92a7735ca 100644
--- a/reactos/boot/freeldr/freeldr/CMakeLists.txt
+++ b/reactos/boot/freeldr/freeldr/CMakeLists.txt
@@ -148,12 +148,12 @@ else()
 #TBD
 endif()
 
-if(NOT MSVC AND CMAKE_VERSION VERSION_GREATER 2.8.7)
+if((NOT MSVC) AND (CMAKE_VERSION VERSION_GREATER 2.8.7))
     add_library(freeldr_common OBJECT ${FREELDR_COMMON_SOURCE})
 else()
     add_library(freeldr_common ${FREELDR_COMMON_SOURCE})
-    add_dependencies(freeldr_common bugcodes)
 endif()
+add_dependencies(freeldr_common bugcodes)
 
 if(ARCH STREQUAL "i386" AND NOT MSVC)
     list(APPEND FREELDR_BASE_SOURCE arch/i386/multiboot.S)
@@ -168,12 +168,9 @@ if(NOT MSVC)
     list(APPEND FREELDR_BASE_SOURCE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.def)
 endif()
 
-
-if(NOT MSVC AND CMAKE_VERSION VERSION_GREATER 2.8.7)
+if((NOT MSVC) AND (CMAKE_VERSION VERSION_GREATER 2.8.7))
     add_library(freeldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE})
-    add_dependencies(freeldr_pe bugcodes)
     add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE})
-    add_dependencies(freeldr_pe_dbg bugcodes)
 else()
     add_library(freeldr_pe SHARED ${FREELDR_BASE_SOURCE})
     add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE})
@@ -231,11 +228,9 @@ if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64")
     list(APPEND SETUPLDR_SOURCE windows/setupldr.c)
 endif()
 
-if(NOT MSVC AND CMAKE_VERSION VERSION_GREATER 2.8.7)
+if((NOT MSVC) AND (CMAKE_VERSION VERSION_GREATER 2.8.7))
     add_library(setupldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
-    add_dependencies(setupldr_pe bugcodes)
     add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
-    add_dependencies(setupldr_pe_dbg bugcodes)
 else()
     add_library(setupldr_pe SHARED ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
     add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
@@ -265,7 +260,7 @@ if(ARCH STREQUAL "i386")
     target_link_libraries(setupldr_pe_dbg mini_hal)
 endif()
 
-if(MSVC OR NOT CMAKE_VERSION VERSION_GREATER 2.8.7)
+if(MSVC OR (NOT CMAKE_VERSION VERSION_GREATER 2.8.7))
     target_link_libraries(setupldr_pe freeldr_common)
     target_link_libraries(setupldr_pe_dbg freeldr_common)
 endif()