Add headers to all md*, v3binder*, and ceefgen vcxproj (#20163)

Work toward #14884

28 files changed, 250 insertions, 7 deletions

diff --git a/src/md/ceefilegen/CMakeLists.txt b/src/md/ceefilegen/CMakeLists.txt
index a1b9107caf..7170facc6f 100644
--- a/src/md/ceefilegen/CMakeLists.txt
+++ b/src/md/ceefilegen/CMakeLists.txt
@@ -11,12 +11,26 @@ set(CEEFILEGEN_SOURCES
     pesectionman.cpp
 )
 
+set(CEEFILEGEN_HEADERS
+    ../../inc/corpriv.h
+    ../../inc/blobfetcher.h
+    ../../inc/ceegen.h
+    ../../inc/ceegentokenmapper.h
+    ../../inc/ceesectionstring.h
+    ../../inc/pesectionman.h
+    ../../inc/utilcode.h
+)
+
 if(CLR_CMAKE_PLATFORM_UNIX)
     add_compile_options(-fPIC)
 endif(CLR_CMAKE_PLATFORM_UNIX)
 
 add_precompiled_header(stdafx.h stdafx.cpp CEEFILEGEN_SOURCES)
 
+if (WIN32)
+    list(APPEND CEEFILEGEN_SOURCES ${CEEFILEGEN_HEADERS})
+endif (WIN32)
+
 add_library_clr(ceefgen
     STATIC
     ${CEEFILEGEN_SOURCES}
diff --git a/src/md/compiler/CMakeLists.txt b/src/md/compiler/CMakeLists.txt
index 4d99d11edc..5000f1b6fc 100644
--- a/src/md/compiler/CMakeLists.txt
+++ b/src/md/compiler/CMakeLists.txt
@@ -20,7 +20,36 @@ set(MDCOMPILER_SOURCES
   verifylayouts.cpp
 )
 
+set(MDCOMPILER_HEADERS
+  ../../inc/corhdr.h
+  ../../inc/corpriv.h
+  ../../inc/mdcommon.h
+  ../../inc/metadata.h
+  ../../inc/posterror.h
+  ../../inc/strongname.h
+  ../../inc/sstring.h
+  ../../inc/switches.h
+  ../inc/cahlprinternal.h
+  ../inc/mdlog.h
+  ../inc/metamodelrw.h
+  ../inc/rwutil.h
+  ../inc/stgio.h
+  ../inc/verifylayouts.h
+  ../inc/VerifyLayouts.h
+  cacheload.h
+  classfactory.h
+  custattr.h
+  disp.h
+  filtermanager.h
+  importhelper.h
+  mdperf.h
+  mdsighelper.h
+  mdutil.h
+  regmeta.h
+)
+
 convert_to_absolute_path(MDCOMPILER_SOURCES ${MDCOMPILER_SOURCES})
+convert_to_absolute_path(MDCOMPILER_HEADERS ${MDCOMPILER_HEADERS})
 
 if(CLR_CMAKE_PLATFORM_UNIX)
     add_compile_options(-fPIC)
diff --git a/src/md/compiler/crossgen/CMakeLists.txt b/src/md/compiler/crossgen/CMakeLists.txt
index 7baf17448b..e732ef637c 100644
--- a/src/md/compiler/crossgen/CMakeLists.txt
+++ b/src/md/compiler/crossgen/CMakeLists.txt
@@ -2,4 +2,9 @@ include(${CLR_DIR}/crossgen.cmake)
 include(../../md_wks.cmake)
 
 add_precompiled_header(stdafx.h ../stdafx.cpp MDCOMPILER_SOURCES)
+
+if (WIN32)
+    list(APPEND MDCOMPILER_SOURCES ${MDCOMPILER_HEADERS})
+endif (WIN32)
+
 add_library_clr(mdcompiler_crossgen ${MDCOMPILER_SOURCES})
diff --git a/src/md/compiler/dac/CMakeLists.txt b/src/md/compiler/dac/CMakeLists.txt
index dda76e1cd9..80041f3fdb 100644
--- a/src/md/compiler/dac/CMakeLists.txt
+++ b/src/md/compiler/dac/CMakeLists.txt
@@ -3,4 +3,9 @@ include(${CLR_DIR}/dac.cmake)
 include(../../md_dac.cmake)
 
 add_precompiled_header(stdafx.h ../stdafx.cpp MDCOMPILER_SOURCES)
+
+if (WIN32)
+    list(APPEND MDCOMPILER_SOURCES ${MDCOMPILER_HEADERS})
+endif (WIN32)
+
 add_library_clr(mdcompiler_dac ${MDCOMPILER_SOURCES})
diff --git a/src/md/compiler/dbi/CMakeLists.txt b/src/md/compiler/dbi/CMakeLists.txt
index b870984309..ee7a2cbbd7 100644
--- a/src/md/compiler/dbi/CMakeLists.txt
+++ b/src/md/compiler/dbi/CMakeLists.txt
@@ -1,4 +1,9 @@
 include(../../md_dbi.cmake)
 
 add_precompiled_header(stdafx.h ../stdafx.cpp MDCOMPILER_SOURCES)
-add_library_clr(mdcompiler-dbi ${MDCOMPILER_SOURCES})
\ No newline at end of file
+
+if (WIN32)
+    list(APPEND MDCOMPILER_SOURCES ${MDCOMPILER_HEADERS})
+endif (WIN32)
+
+add_library_clr(mdcompiler-dbi ${MDCOMPILER_SOURCES})
diff --git a/src/md/compiler/wks/CMakeLists.txt b/src/md/compiler/wks/CMakeLists.txt
index eb39ca7972..c4cf62e33b 100644
--- a/src/md/compiler/wks/CMakeLists.txt
+++ b/src/md/compiler/wks/CMakeLists.txt
@@ -3,4 +3,9 @@ include(../../md_wks.cmake)
 add_definitions(-DFEATURE_METADATA_EMIT_ALL)
 
 add_precompiled_header(stdafx.h ../stdafx.cpp MDCOMPILER_SOURCES)
+
+if (WIN32)
+    list(APPEND MDCOMPILER_SOURCES ${MDCOMPILER_HEADERS})
+endif (WIN32)
+
 add_library_clr(mdcompiler_wks ${MDCOMPILER_SOURCES})
diff --git a/src/md/datasource/CMakeLists.txt b/src/md/datasource/CMakeLists.txt
index 6657c0615a..489ef343aa 100644
--- a/src/md/datasource/CMakeLists.txt
+++ b/src/md/datasource/CMakeLists.txt
@@ -9,7 +9,15 @@ set(MDDATASOURCE_SOURCES
   targettypes.cpp
 )
 
+set(MDDATASOURCE_HEADERS
+  ../../inc/cor.h
+  ../../inc/corpriv.h
+  datatargetreader.h
+  remotemdinternalrwsource.h
+  targettypes.h
+)
+
 convert_to_absolute_path(MDDATASOURCE_SOURCES ${MDDATASOURCE_SOURCES})
+convert_to_absolute_path(MDDATASOURCE_HEADERS ${MDDATASOURCE_HEADERS})
 
 add_subdirectory(dbi)
-
diff --git a/src/md/datasource/dbi/CMakeLists.txt b/src/md/datasource/dbi/CMakeLists.txt
index c30c62e33c..f392a20599 100644
--- a/src/md/datasource/dbi/CMakeLists.txt
+++ b/src/md/datasource/dbi/CMakeLists.txt
@@ -1,4 +1,9 @@
 include(../../md_dbi.cmake)
 
 add_precompiled_header(stdafx.h ../stdafx.cpp MDDATASOURCE_SOURCES)
-add_library_clr(mddatasource_dbi STATIC ${MDDATASOURCE_SOURCES})
\ No newline at end of file
+
+if (WIN32)
+    list(APPEND MDDATASOURCE_SOURCES ${MDDATASOURCE_HEADERS})
+endif (WIN32)
+
+add_library_clr(mddatasource_dbi STATIC ${MDDATASOURCE_SOURCES})
diff --git a/src/md/enc/CMakeLists.txt b/src/md/enc/CMakeLists.txt
index 8e388f526e..32d640a09a 100644
--- a/src/md/enc/CMakeLists.txt
+++ b/src/md/enc/CMakeLists.txt
@@ -10,6 +10,38 @@ set(MDRUNTIMERW_SOURCES
   mdinternalrw.cpp
 )
 
+set(MDRUNTIMERW_HEADERS
+  ../../inc/corhdr.h
+  ../../inc/metadata.h
+  ../../inc/pedecoder.h
+  ../../inc/pedecoder.inl
+  ../../inc/posterror.h
+  ../../inc/sstring.h
+  ../../inc/sstring.inl
+  ../compiler/importhelper.h
+  ../compiler/regmeta.h
+  ../hotdata/hotdataformat.h
+  ../inc/liteweightstgdb.h
+  ../inc/mdfileformat.h
+  ../inc/mdinternalrw.h
+  ../inc/mdlog.h
+  ../inc/metadatahash.h
+  ../inc/metamodel.h
+  ../inc/metamodelro.h
+  ../inc/metamodelrw.h
+  ../inc/rwutil.h
+  ../inc/stgio.h
+  ../inc/stgtiggerstorage.h
+  ../inc/stgtiggerstream.h
+  ../inc/streamutil.h
+  ../runtime/mdinternalro.h
+)
+
+if (WIN32)
+  list(APPEND MDRUNTIMERW_SOURCES ${MDRUNTIMERW_HEADERS})
+endif(WIN32)
+
+convert_to_absolute_path(MDRUNTIMERW_HEADERS ${MDRUNTIMERW_HEADERS})
 convert_to_absolute_path(MDRUNTIMERW_SOURCES ${MDRUNTIMERW_SOURCES})
 
 if(CLR_CMAKE_PLATFORM_UNIX)
diff --git a/src/md/enc/crossgen/CMakeLists.txt b/src/md/enc/crossgen/CMakeLists.txt
index f01451a337..86aa432945 100644
--- a/src/md/enc/crossgen/CMakeLists.txt
+++ b/src/md/enc/crossgen/CMakeLists.txt
@@ -2,4 +2,9 @@ include(${CLR_DIR}/crossgen.cmake)
 include(../../md_wks.cmake)
 
 add_precompiled_header(stdafx.h ../stdafx.cpp MDRUNTIMERW_SOURCES)
+
+if (WIN32)
+    list(APPEND MDRUNTIMERW_SOURCES ${MDRUNTIMERW_HEADERS})
+endif (WIN32)
+
 add_library_clr(mdruntimerw_crossgen ${MDRUNTIMERW_SOURCES})
diff --git a/src/md/enc/dac/CMakeLists.txt b/src/md/enc/dac/CMakeLists.txt
index 9bef4636f7..c4ba31df97 100644
--- a/src/md/enc/dac/CMakeLists.txt
+++ b/src/md/enc/dac/CMakeLists.txt
@@ -3,4 +3,9 @@ include(${CLR_DIR}/dac.cmake)
 include(../../md_dac.cmake)
 
 add_precompiled_header(stdafx.h ../stdafx.cpp MDRUNTIMERW_SOURCES)
+
+if (WIN32)
+    list(APPEND MDRUNTIMERW_SOURCES ${MDRUNTIMERW_HEADERS})
+endif (WIN32)
+
 add_library_clr(mdruntimerw_dac ${MDRUNTIMERW_SOURCES})
diff --git a/src/md/enc/dbi/CMakeLists.txt b/src/md/enc/dbi/CMakeLists.txt
index 5be16bc28c..d591937148 100644
--- a/src/md/enc/dbi/CMakeLists.txt
+++ b/src/md/enc/dbi/CMakeLists.txt
@@ -1,4 +1,9 @@
 include(../../md_dbi.cmake)
 
 add_precompiled_header(stdafx.h ../stdafx.cpp MDRUNTIMERW_SOURCES)
-add_library_clr(mdruntimerw-dbi ${MDRUNTIMERW_SOURCES})
\ No newline at end of file
+
+if (WIN32)
+    list(APPEND MDRUNTIMERW_SOURCES ${MDRUNTIMERW_HEADERS})
+endif (WIN32)
+
+add_library_clr(mdruntimerw-dbi ${MDRUNTIMERW_SOURCES})
diff --git a/src/md/enc/wks/CMakeLists.txt b/src/md/enc/wks/CMakeLists.txt
index 2c0a2b1af5..ff4ec935d0 100644
--- a/src/md/enc/wks/CMakeLists.txt
+++ b/src/md/enc/wks/CMakeLists.txt
@@ -3,4 +3,9 @@ include(../../md_wks.cmake)
 add_definitions(-DFEATURE_METADATA_EMIT_ALL)
 
 add_precompiled_header(stdafx.h ../stdafx.cpp MDRUNTIMERW_SOURCES)
+
+if (WIN32)
+    list(APPEND MDRUNTIMERW_SOURCES ${MDRUNTIMERW_HEADERS})
+endif (WIN32)
+
 add_library_clr(mdruntimerw_wks ${MDRUNTIMERW_SOURCES})
diff --git a/src/md/hotdata/CMakeLists.txt b/src/md/hotdata/CMakeLists.txt
index 199edaa40e..600da6a2be 100644
--- a/src/md/hotdata/CMakeLists.txt
+++ b/src/md/hotdata/CMakeLists.txt
@@ -7,6 +7,22 @@ set(MDHOTDATA_SOURCES
   hotheapwriter.cpp
 )
 
+set(MDHOTDATA_HEADERS
+  ../../inc/metamodelpub.h
+  ../databuffer.h
+  ../heaps/export.h
+  ../inc/streamutil.h
+  ./export.h
+  heapindex.h
+  hotdataformat.h
+  hotheap.h
+  hotheapsdirectoryiterator.h
+  hotheapwriter.h
+  hotmetadata.h
+  hottable.h
+)
+
+convert_to_absolute_path(MDHOTDATA_HEADERS ${MDHOTDATA_HEADERS})
 convert_to_absolute_path(MDHOTDATA_SOURCES ${MDHOTDATA_SOURCES})
 
 if(CLR_CMAKE_PLATFORM_UNIX)
diff --git a/src/md/hotdata/crossgen/CMakeLists.txt b/src/md/hotdata/crossgen/CMakeLists.txt
index 7d7738c5c1..4403c2fd68 100644
--- a/src/md/hotdata/crossgen/CMakeLists.txt
+++ b/src/md/hotdata/crossgen/CMakeLists.txt
@@ -2,4 +2,9 @@ include(${CLR_DIR}/crossgen.cmake)
 include(../../md_wks.cmake)
 
 add_precompiled_header(external.h ../external.cpp MDHOTDATA_SOURCES)
+
+if (WIN32)
+    list(APPEND MDHOTDATA_SOURCES ${MDHOTDATA_HEADERS})
+endif (WIN32)
+
 add_library_clr(mdhotdata_crossgen ${MDHOTDATA_SOURCES})
diff --git a/src/md/hotdata/dac/CMakeLists.txt b/src/md/hotdata/dac/CMakeLists.txt
index 99a3f1d00d..67b8408cf2 100644
--- a/src/md/hotdata/dac/CMakeLists.txt
+++ b/src/md/hotdata/dac/CMakeLists.txt
@@ -3,4 +3,8 @@ include(${CLR_DIR}/dac.cmake)
 
 add_precompiled_header(external.h ../external.cpp MDHOTDATA_SOURCES)
 
+if (WIN32)
+    list(APPEND MDHOTDATA_SOURCES ${MDHOTDATA_HEADERS})
+endif (WIN32)
+
 add_library_clr(mdhotdata_dac ${MDHOTDATA_SOURCES})
diff --git a/src/md/hotdata/full-staticcrt/CMakeLists.txt b/src/md/hotdata/full-staticcrt/CMakeLists.txt
index 8570c4a6f6..d702032e90 100644
--- a/src/md/hotdata/full-staticcrt/CMakeLists.txt
+++ b/src/md/hotdata/full-staticcrt/CMakeLists.txt
@@ -1,4 +1,9 @@
 add_definitions(-D_CRTIMP=) # static link of crt
 
 add_precompiled_header(external.h ../external.cpp MDHOTDATA_SOURCES)
+
+if (WIN32)
+    list(APPEND MDHOTDATA_SOURCES ${MDHOTDATA_HEADERS})
+endif (WIN32)
+
 add_library_clr(mdhotdata-staticcrt ${MDHOTDATA_SOURCES})
diff --git a/src/md/hotdata/full/CMakeLists.txt b/src/md/hotdata/full/CMakeLists.txt
index 26fc6a0721..1b97ff3db3 100644
--- a/src/md/hotdata/full/CMakeLists.txt
+++ b/src/md/hotdata/full/CMakeLists.txt
@@ -1,3 +1,7 @@
 add_precompiled_header(external.h ../external.cpp MDHOTDATA_SOURCES)
 
+if (WIN32)
+    list(APPEND MDHOTDATA_SOURCES ${MDHOTDATA_HEADERS})
+endif (WIN32)
+
 add_library_clr(mdhotdata_full ${MDHOTDATA_SOURCES})
diff --git a/src/md/runtime/CMakeLists.txt b/src/md/runtime/CMakeLists.txt
index 96c9b5114a..1111bdb0fe 100644
--- a/src/md/runtime/CMakeLists.txt
+++ b/src/md/runtime/CMakeLists.txt
@@ -11,6 +11,34 @@ set(MDRUNTIME_SOURCES
   mdinternalro.cpp
 )
 
+set(MDRUNTIME_HEADERS
+  ../../inc/caparser.h
+  ../../inc/cor.h
+  ../../inc/corhlpr.h
+  ../../inc/corpriv.h
+  ../../inc/mdcommon.h
+  ../../inc/metadatatracker.h
+  ../../inc/pedecoder.h
+  ../../inc/posterror.h
+  ../compiler/regmeta.h
+  ../hotdata/export.h
+  ../inc/assemblymdinternaldisp.h
+  ../inc/liteweightstgdb.h
+  ../inc/mdcolumndescriptors.h
+  ../inc/mdfileformat.h
+  ../inc/metamodel.h
+  ../inc/metamodelro.h
+  ../inc/recordpool.h
+  ../inc/winmdinterfaces.h
+  metamodelcolumndefs.h
+  mdinternaldisp.h
+  mdinternalro.h
+  metamodel.cpp
+  metamodelro.cpp
+  recordpool.cpp
+)
+
+convert_to_absolute_path(MDRUNTIME_HEADERS ${MDRUNTIME_HEADERS})
 convert_to_absolute_path(MDRUNTIME_SOURCES ${MDRUNTIME_SOURCES})
 
 if(CLR_CMAKE_PLATFORM_UNIX)
diff --git a/src/md/runtime/crossgen/CMakeLists.txt b/src/md/runtime/crossgen/CMakeLists.txt
index dfd0f34665..e778a8601e 100644
--- a/src/md/runtime/crossgen/CMakeLists.txt
+++ b/src/md/runtime/crossgen/CMakeLists.txt
@@ -2,4 +2,9 @@ include(${CLR_DIR}/crossgen.cmake)
 include(../../md_wks.cmake)
 
 add_precompiled_header(stdafx.h ../stdafx.cpp MDRUNTIME_SOURCES)
+
+if (WIN32)
+    list(APPEND MDRUNTIME_SOURCES ${MDRUNTIME_HEADERS})
+endif (WIN32)
+
 add_library_clr(mdruntime_crossgen ${MDRUNTIME_SOURCES})
diff --git a/src/md/runtime/dac/CMakeLists.txt b/src/md/runtime/dac/CMakeLists.txt
index 337968e2ed..ba6d4f0de8 100644
--- a/src/md/runtime/dac/CMakeLists.txt
+++ b/src/md/runtime/dac/CMakeLists.txt
@@ -4,4 +4,8 @@ include(../../md_dac.cmake)
 
 add_precompiled_header(stdafx.h ../stdafx.cpp MDRUNTIME_SOURCES)
 
+if (WIN32)
+    list(APPEND MDRUNTIME_SOURCES ${MDRUNTIME_HEADERS})
+endif (WIN32)
+
 add_library_clr(mdruntime_dac ${MDRUNTIME_SOURCES})
\ No newline at end of file
diff --git a/src/md/runtime/dbi/CMakeLists.txt b/src/md/runtime/dbi/CMakeLists.txt
index 6f706d2bfb..4d2ebe4871 100644
--- a/src/md/runtime/dbi/CMakeLists.txt
+++ b/src/md/runtime/dbi/CMakeLists.txt
@@ -1,3 +1,9 @@
 include(../../md_dbi.cmake)
+
 add_precompiled_header(stdafx.h ../stdafx.cpp MDRUNTIME_SOURCES)
-add_library_clr(mdruntime-dbi ${MDRUNTIME_SOURCES})
\ No newline at end of file
+
+if (WIN32)
+    list(APPEND MDRUNTIME_SOURCES ${MDRUNTIME_HEADERS})
+endif (WIN32)
+
+add_library_clr(mdruntime-dbi ${MDRUNTIME_SOURCES})
diff --git a/src/md/runtime/wks/CMakeLists.txt b/src/md/runtime/wks/CMakeLists.txt
index 3e2a8cc6be..c8c52f59f2 100644
--- a/src/md/runtime/wks/CMakeLists.txt
+++ b/src/md/runtime/wks/CMakeLists.txt
@@ -3,5 +3,9 @@ include(../../md_wks.cmake)
 add_definitions(-DFEATURE_METADATA_EMIT_ALL)
 
 add_precompiled_header(stdafx.h ../stdafx.cpp MDRUNTIME_SOURCES)
-add_library_clr(mdruntime_wks ${MDRUNTIME_SOURCES})
 
+if (WIN32)
+    list(APPEND MDRUNTIME_SOURCES ${MDRUNTIME_HEADERS})
+endif (WIN32)
+
+add_library_clr(mdruntime_wks ${MDRUNTIME_SOURCES})
diff --git a/src/md/winmd/CMakeLists.txt b/src/md/winmd/CMakeLists.txt
index 9fb7d839ac..31dbbbfc4f 100644
--- a/src/md/winmd/CMakeLists.txt
+++ b/src/md/winmd/CMakeLists.txt
@@ -4,6 +4,20 @@ set(MDWINMD_SOURCES
   winmdinternalimportro.cpp
 )
 
+set(MDWINMD_HEADERS
+  ../../inc/cor.h
+  ../../inc/corpriv.h
+  ../../inc/metadataexports.h
+  ../../inc/nsutilpriv.h
+  ../../inc/sigbuilder.h
+  ../../inc/sigparser.h
+  ../../inc/utsem.h
+  ../inc/winmdinterfaces.h
+  inc/adapter.h
+  inc/memotable.h
+)
+
+convert_to_absolute_path(MDWINMD_HEADERS ${MDWINMD_HEADERS})
 convert_to_absolute_path(MDWINMD_SOURCES ${MDWINMD_SOURCES})
 
 if(CLR_CMAKE_PLATFORM_UNIX)
diff --git a/src/md/winmd/crossgen/CMakeLists.txt b/src/md/winmd/crossgen/CMakeLists.txt
index 30859c30ae..670514a3ab 100644
--- a/src/md/winmd/crossgen/CMakeLists.txt
+++ b/src/md/winmd/crossgen/CMakeLists.txt
@@ -2,4 +2,9 @@ include(${CLR_DIR}/crossgen.cmake)
 include(../../md_wks.cmake)
 
 add_precompiled_header(stdafx.h ../stdafx.cpp MDWINMD_SOURCES)
+
+if (WIN32)
+    list(APPEND MDWINMD_SOURCES ${MDWINMD_HEADERS})
+endif (WIN32)
+
 add_library_clr(mdwinmd_crossgen ${MDWINMD_SOURCES})
diff --git a/src/md/winmd/dac/CMakeLists.txt b/src/md/winmd/dac/CMakeLists.txt
index aca5cb581d..1ed4aec550 100644
--- a/src/md/winmd/dac/CMakeLists.txt
+++ b/src/md/winmd/dac/CMakeLists.txt
@@ -3,4 +3,9 @@ include(${CLR_DIR}/dac.cmake)
 include(../../md_dbi.cmake)
 
 add_precompiled_header(stdafx.h ../stdafx.cpp MDWINMD_SOURCES)
+
+if (WIN32)
+    list(APPEND MDWINMD_SOURCES ${MDWINMD_HEADERS})
+endif (WIN32)
+
 add_library_clr(mdwinmd_dac ${MDWINMD_SOURCES})
diff --git a/src/md/winmd/dbi/CMakeLists.txt b/src/md/winmd/dbi/CMakeLists.txt
index 89a39d3d9b..669018e387 100644
--- a/src/md/winmd/dbi/CMakeLists.txt
+++ b/src/md/winmd/dbi/CMakeLists.txt
@@ -1,4 +1,9 @@
 include(../../md_dbi.cmake)
 
 add_precompiled_header(stdafx.h ../stdafx.cpp MDWINMD_SOURCES)
-add_library_clr(mdwinmd_dbi ${MDWINMD_SOURCES})
\ No newline at end of file
+
+if (WIN32)
+    list(APPEND MDWINMD_SOURCES ${MDWINMD_HEADERS})
+endif (WIN32)
+
+add_library_clr(mdwinmd_dbi ${MDWINMD_SOURCES})
diff --git a/src/md/winmd/wks/CMakeLists.txt b/src/md/winmd/wks/CMakeLists.txt
index defcc1d51d..930dbca9cf 100644
--- a/src/md/winmd/wks/CMakeLists.txt
+++ b/src/md/winmd/wks/CMakeLists.txt
@@ -3,4 +3,9 @@ include(../../md_wks.cmake)
 add_definitions(-DFEATURE_METADATA_EMIT_ALL)
 
 add_precompiled_header(stdafx.h ../stdafx.cpp MDWINMD_SOURCES)
+
+if (WIN32)
+    list(APPEND MDWINMD_SOURCES ${MDWINMD_HEADERS})
+endif (WIN32)
+
 add_library_clr(mdwinmd_wks ${MDWINMD_SOURCES})