diff --git a/racket/src/bc/mkincludes.rkt b/racket/src/bc/mkincludes.rkt
index 30c6796bad..7b763f35c7 100644
--- a/racket/src/bc/mkincludes.rkt
+++ b/racket/src/bc/mkincludes.rkt
@@ -54,6 +54,9 @@
   
   (if (directory-exists? incdir) (void) (make-directory incdir))
   (copy-if-newer mzconfdir "mzconfig.h")
+  (if (file-exists? (build-path mzconfdir "bc_suffix.h"))
+      (copy-if-newer mzconfdir "bc_suffix.h")
+      (void))
   (copy-if-newer mzsrcdir "sconfig.h")
   (copy-if-newer mzsrcdir "uconfig.h")
   (copy-if-newer mzsrcdir "include/escheme.h")
diff --git a/racket/src/worksp/build.bat b/racket/src/worksp/build.bat
index 333d0b9315..1a71128b22 100644
--- a/racket/src/worksp/build.bat
+++ b/racket/src/worksp/build.bat
@@ -63,6 +63,8 @@ cd ..
 if "%BUILD_LEVEL%"=="3m" goto doneBuilding
 if "%BUILD_LEVEL%"=="bc" goto doneBuilding
 
+..\..\racketcgc -cu ..\bc\mkincludes.rkt ..\..\include ..\bc .
+
 cd mzstart
 msbuild mzstart%PLTSLNVER%.sln /p:Configuration=Release /p:Platform=%BUILDMODE%
 if errorlevel 1 exit /B 1
diff --git a/racket/src/worksp/csbuild.rkt b/racket/src/worksp/csbuild.rkt
index 9bbdaba57d..214bc4025f 100644
--- a/racket/src/worksp/csbuild.rkt
+++ b/racket/src/worksp/csbuild.rkt
@@ -249,6 +249,7 @@
 (make-directory* "../../etc")
 (make-directory* "../../doc")
 (make-directory* "../../share")
+(make-directory* "../../include")
 
 (copy-file "../LICENSE-libscheme.txt"
            "../../share/LICENSE-libscheme.txt"
@@ -266,6 +267,15 @@
            "../../share/LICENSE-GPL.txt"
            #t)
 
+(copy-file "../cs/c/api.h"
+           "../../include/racketcs.h"
+           #t)
+(copy-file "../cs/c/boot.h"
+           "../../include/racketcsboot.h"
+           #t)
+(copy-file (build-path scheme-dir machine "boot" machine "scheme.h")
+           "../../include//chezscheme.h")
+
 (parameterize ([current-directory "mzstart"])
   (system*! "msbuild"
             (format "mzstart~a.sln" pltslnver)
diff --git a/racket/src/worksp/racket/racket.vcproj b/racket/src/worksp/racket/racket.vcproj
index 323d315239..ab83673ef2 100644
--- a/racket/src/worksp/racket/racket.vcproj
+++ b/racket/src/worksp/racket/racket.vcproj
@@ -60,7 +60,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="&#x0D;&#x0A;if exist &quot;$(TargetPath)&quot; goto :MzOK&#x0D;&#x0A;echo Error: did not find $(TargetPath)&#x0D;&#x0A;exit 1&#x0D;&#x0A;:MzOK&#x0D;&#x0A;&quot;$(TargetPath)&quot; -cu ..\..\bc\mkincludes.rkt &quot;$(TargetDir)/include/&quot; ..\..\bc ..&#x0D;&#x0A;if errorlevel 1 exit 1&#x0D;&#x0A;&quot;$(TargetPath)&quot; -cu ..\..\bc\mksystem.rkt &quot;$(TargetDir)/lib/system.rktd&quot;&#x0D;&#x0A;cd ..\..\bc\dynsrc&#x0D;&#x0A;call mkmzdyn.bat $(ConfigurationName) $(PlatformName)&#x0D;&#x0A;cd ..\..\worksp\racket&#x0D;&#x0A;addman.bat&#x0D;&#x0A;&#x0D;&#x0A;"
+				CommandLine="&#x0D;&#x0A;cd ..\..\bc\dynsrc&#x0D;&#x0A;call mkmzdyn.bat $(ConfigurationName) $(PlatformName)&#x0D;&#x0A;cd ..\..\worksp\racket&#x0D;&#x0A;addman.bat&#x0D;&#x0A;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
diff --git a/racket/src/worksp/racket/racket.vcxproj b/racket/src/worksp/racket/racket.vcxproj
index c9c0e99a83..5b8c8c66aa 100644
--- a/racket/src/worksp/racket/racket.vcxproj
+++ b/racket/src/worksp/racket/racket.vcxproj
@@ -72,12 +72,6 @@
     </Link>
     <PostBuildEvent>
       <Command>
-if exist "$(TargetPath)" goto :MzOK
-echo Error: did not find $(TargetPath)
-exit 1
-:MzOK
-"$(TargetPath)" -cu ..\..\bc\mkincludes.rkt "$(TargetDir)/include/" ..\..\bc ..
-if errorlevel 1 exit 1
 cd ..\..\bc\dynsrc
 call mkmzdyn.bat $(Configuration) $(Platform)
 cd ..\..\worksp\racket