4 files changed, 7 insertions, 8 deletions
diff --git a/cpp/src/icegriddb/DBTypes.ice b/cpp/src/icegriddb/DBTypes.ice
index 6729a6bf434..daa4f59bda8 100644
--- a/cpp/src/icegriddb/DBTypes.ice
+++ b/cpp/src/icegriddb/DBTypes.ice
@@ -11,7 +11,7 @@
 
 #include <IceGrid/Admin.ice>
 
-[["cpp:header-ext:h"]]
+[["ice-prefix", "cpp:header-ext:h"]]
 
 module IceGrid
 {
diff --git a/cpp/src/icegriddb/Makefile.mk b/cpp/src/icegriddb/Makefile.mk
index 7150b79492d..69e68ea9bbb 100644
--- a/cpp/src/icegriddb/Makefile.mk
+++ b/cpp/src/icegriddb/Makefile.mk
@@ -9,7 +9,7 @@
 
 $(project)_programs             :=  icegriddb
 $(project)_generated_includedir := $(project)/generated/IceGrid
-$(project)_sliceflags           := -Isrc --include-dir IceGrid
+$(project)_sliceflags           := -Isrc --include-dir IceGrid -DICE_BUILDING_ICEGRIDDB
 
 $(project)/IceGridDB.cpp: $(includedir)/generated/IceGrid/Admin.h
 $(project)/generated/DBTypes.cpp: $(includedir)/generated/IceGrid/Admin.h
diff --git a/cpp/src/icegriddb/msbuild/icegriddb.vcxproj b/cpp/src/icegriddb/msbuild/icegriddb.vcxproj
index 2ab0f884902..5670030372f 100644
--- a/cpp/src/icegriddb/msbuild/icegriddb.vcxproj
+++ b/cpp/src/icegriddb/msbuild/icegriddb.vcxproj
@@ -97,8 +97,7 @@
     <IceBuilderIncludeDirectories>$(Ice_SrcRootDir)\src\;$(IceBuilderIncludeDirectories)</IceBuilderIncludeDirectories>
     <IceBuilderHeaderOutputDir>$(Platform)\$(Configuration)\IceGrid\</IceBuilderHeaderOutputDir>
     <IceBuilderBaseDirectoryForGeneratedInclude>IceGrid</IceBuilderBaseDirectoryForGeneratedInclude>
-    <IceBuilderAdditionalOptions>
-    </IceBuilderAdditionalOptions>
+    <IceBuilderAdditionalOptions>-DICE_BUILDING_ICEGRIDDB</IceBuilderAdditionalOptions>
   </PropertyGroup>
   <ItemGroup>
     <ResourceCompile Include="..\IceGridDB.rc" />
diff --git a/cpp/src/icegriddb/msbuild/icegriddb.vcxproj.filters b/cpp/src/icegriddb/msbuild/icegriddb.vcxproj.filters
index 20bf3556d94..82743311913 100644
--- a/cpp/src/icegriddb/msbuild/icegriddb.vcxproj.filters
+++ b/cpp/src/icegriddb/msbuild/icegriddb.vcxproj.filters
@@ -55,7 +55,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\..\IceGridDB.rc">
+    <ResourceCompile Include="..\IceGridDB.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
@@ -71,9 +71,6 @@
     </IceBuilder>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\IceGridDB.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="Win32\Debug\Descriptor.cpp">
       <Filter>Source Files\Win32\Debug</Filter>
     </ClCompile>
@@ -110,6 +107,9 @@
     <ClCompile Include="x64\Release\DBTypes.cpp">
       <Filter>Source Files\x64\Release</Filter>
     </ClCompile>
+    <ClCompile Include="..\IceGridDB.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Win32\Debug\IceGrid\Descriptor.h">