diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a0bcd96b55..1854c4cb0b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -200,20 +200,6 @@ else()
 
     add_custom_target(buildno_header ALL DEPENDS ${REACTOS_BINARY_DIR}/include/reactos/buildno.h)
 
-    file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib)
-
-    list(APPEND OUTPUT_FILES
-        ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib/dib8gen.c
-        ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib/dib16gen.c
-        ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib/dib32gen.c)
-
-    add_custom_command(
-        OUTPUT ${OUTPUT_FILES}
-        COMMAND native-gendib ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib
-        DEPENDS native-gendib)
-
-    add_custom_target(gendib_generated ALL DEPENDS ${OUTPUT_FILES})
-
     file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs)
 
     #bootcd and livecd
diff --git a/subsystems/win32/win32k/CMakeLists.txt b/subsystems/win32/win32k/CMakeLists.txt
index 1e819e70e36..6de96b591c3 100644
--- a/subsystems/win32/win32k/CMakeLists.txt
+++ b/subsystems/win32/win32k/CMakeLists.txt
@@ -13,6 +13,17 @@ add_definitions(
     -DLANGPACK
     -D_WIN32K_)
 
+file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dib)
+
+list(APPEND GENDIB_FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/dib/dib8gen.c
+    ${CMAKE_CURRENT_BINARY_DIR}/dib/dib16gen.c
+    ${CMAKE_CURRENT_BINARY_DIR}/dib/dib32gen.c)
+
+add_custom_command(
+    OUTPUT ${GENDIB_FILES}
+    COMMAND native-gendib ${CMAKE_CURRENT_BINARY_DIR}/dib)
+
 list(APPEND SOURCE
     dib/alphablend.c
     dib/dib1bpp.c
@@ -149,15 +160,8 @@ list(APPEND SOURCE
     stubs/stubs.c
     stubs/umpdstubs.c
     win32k.rc)
-    
-list(APPEND GENDIB_GENERATED
-    ${CMAKE_CURRENT_BINARY_DIR}/dib/dib8gen.c
-    ${CMAKE_CURRENT_BINARY_DIR}/dib/dib16gen.c
-    ${CMAKE_CURRENT_BINARY_DIR}/dib/dib32gen.c)
 
-set_source_files_properties(${GENDIB_GENERATED} PROPERTIES GENERATED TRUE)
-
-list(APPEND SOURCE ${GENDIB_GENERATED})
+list(APPEND SOURCE ${GENDIB_FILES})
 
 if(ARCH MATCHES i386)
 list(APPEND SOURCE