diff --git a/include/reactos/mc/CMakeLists.txt b/include/reactos/mc/CMakeLists.txt
index 7e9f83b81b9..29ab2fb840d 100644
--- a/include/reactos/mc/CMakeLists.txt
+++ b/include/reactos/mc/CMakeLists.txt
@@ -1,30 +1,74 @@
-
-MACRO (MACRO_ADD_RESOURCES)
-
- FOREACH(_in_FILE ${ARGN})
-
-   GET_FILENAME_COMPONENT(FILE ${_in_FILE} NAME_WE)
-
+   # bugcodes
    ADD_CUSTOM_COMMAND(
-     OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h
-     COMMAND native-wmc -i -H ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h -o ${REACTOS_BINARY_DIR}/include/reactos/mc/${FILE}.rc ${REACTOS_SOURCE_DIR}/include/reactos/mc/${FILE}.mc
+     OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/bugcodes.h
+     COMMAND native-wmc -i -H ${REACTOS_BINARY_DIR}/include/reactos/bugcodes.h -o ${REACTOS_BINARY_DIR}/include/reactos/mc/bugcodes.rc ${REACTOS_SOURCE_DIR}/include/reactos/mc/bugcodes.mc
      DEPENDS native-wmc
    )
 
    SET_SOURCE_FILES_PROPERTIES(
-     ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h
+     ${REACTOS_BINARY_DIR}/include/reactos/bugcodes.h
      PROPERTIES
      GENERATED TRUE
    )
-   
-   LIST(APPEND RESOURCES ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h)  
 
- ENDFOREACH(_in_FILE ${ARGN})
+   ADD_CUSTOM_TARGET(bugcodes ALL DEPENDS ${REACTOS_BINARY_DIR}/include/reactos/bugcodes.h)
 
-ENDMACRO (MACRO_ADD_RESOURCES)
+   # errcodes
+   ADD_CUSTOM_COMMAND(
+     OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/errcodes.h
+     COMMAND native-wmc -i -H ${REACTOS_BINARY_DIR}/include/reactos/errcodes.h -o ${REACTOS_BINARY_DIR}/include/reactos/mc/errcodes.rc ${REACTOS_SOURCE_DIR}/include/reactos/mc/errcodes.mc
+     DEPENDS native-wmc
+   )
 
-file(GLOB_RECURSE SOURCE "*.mc")
+   SET_SOURCE_FILES_PROPERTIES(
+     ${REACTOS_BINARY_DIR}/include/reactos/errcodes.h
+     PROPERTIES
+     GENERATED TRUE
+   )
 
-MACRO_ADD_RESOURCES(${SOURCE})
+   ADD_CUSTOM_TARGET(errcodes ALL DEPENDS ${REACTOS_BINARY_DIR}/include/reactos/errcodes.h)
 
-ADD_CUSTOM_TARGET(build_resources ALL DEPENDS ${RESOURCES})
+   # netevent
+   ADD_CUSTOM_COMMAND(
+     OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/netevent.h
+     COMMAND native-wmc -i -H ${REACTOS_BINARY_DIR}/include/reactos/netevent.h -o ${REACTOS_BINARY_DIR}/include/reactos/mc/netevent.rc ${REACTOS_SOURCE_DIR}/include/reactos/mc/netevent.mc
+     DEPENDS native-wmc
+   )
+
+   SET_SOURCE_FILES_PROPERTIES(
+     ${REACTOS_BINARY_DIR}/include/reactos/netevent.h
+     PROPERTIES
+     GENERATED TRUE
+   )
+
+   ADD_CUSTOM_TARGET(netevent ALL DEPENDS ${REACTOS_BINARY_DIR}/include/reactos/netevent.h)
+
+   # ntstatus
+   ADD_CUSTOM_COMMAND(
+     OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/ntstatus.h
+     COMMAND native-wmc -i -H ${REACTOS_BINARY_DIR}/include/reactos/ntstatus.h -o ${REACTOS_BINARY_DIR}/include/reactos/mc/ntstatus.rc ${REACTOS_SOURCE_DIR}/include/reactos/mc/ntstatus.mc
+     DEPENDS native-wmc
+   )
+
+   SET_SOURCE_FILES_PROPERTIES(
+     ${REACTOS_BINARY_DIR}/include/reactos/ntstatus.h
+     PROPERTIES
+     GENERATED TRUE
+   )
+
+   ADD_CUSTOM_TARGET(ntstatus ALL DEPENDS ${REACTOS_BINARY_DIR}/include/reactos/ntstatus.h)
+
+   # pciclass
+   ADD_CUSTOM_COMMAND(
+     OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/pciclass.h
+     COMMAND native-wmc -i -H ${REACTOS_BINARY_DIR}/include/reactos/pciclass.h -o ${REACTOS_BINARY_DIR}/include/reactos/mc/pciclass.rc ${REACTOS_SOURCE_DIR}/include/reactos/mc/pciclass.mc
+     DEPENDS native-wmc
+   )
+
+   SET_SOURCE_FILES_PROPERTIES(
+     ${REACTOS_BINARY_DIR}/include/reactos/pciclass.h
+     PROPERTIES
+     GENERATED TRUE
+   )
+
+   ADD_CUSTOM_TARGET(pciclass ALL DEPENDS ${REACTOS_BINARY_DIR}/include/reactos/pciclass.h)
\ No newline at end of file
diff --git a/lib/drivers/chew/CMakeLists.txt b/lib/drivers/chew/CMakeLists.txt
index 178ac637f8c..8f7b51762b5 100644
--- a/lib/drivers/chew/CMakeLists.txt
+++ b/lib/drivers/chew/CMakeLists.txt
@@ -1,4 +1,4 @@
 
 add_definitions(-D_NTOSKRNL_)
 add_library(chew workqueue.c)
-add_dependencies(chew build_resources)
\ No newline at end of file
+add_dependencies(chew bugcodes)
\ No newline at end of file
diff --git a/lib/drivers/csq/CMakeLists.txt b/lib/drivers/csq/CMakeLists.txt
index c05495332ef..81d1ed0e880 100644
--- a/lib/drivers/csq/CMakeLists.txt
+++ b/lib/drivers/csq/CMakeLists.txt
@@ -1,4 +1,4 @@
 
 add_definitions(-D_NTOSKRNL_)
 add_library(csq csq.c)
-add_dependencies(csq build_resources)
\ No newline at end of file
+add_dependencies(csq bugcodes)
\ No newline at end of file