diff --git a/build/xvaga.vcxproj b/build/xvaga.vcxproj
index c3e26e971..29937fc72 100644
--- a/build/xvaga.vcxproj
+++ b/build/xvaga.vcxproj
@@ -156,6 +156,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
+    <ClCompile Include="..\src\xvaga\guid.cpp" />
     <ClCompile Include="..\src\xvaga\matche.cpp" />
     <ClCompile Include="..\src\xvaga\MD5Checksum.cpp" />
     <ClCompile Include="..\src\xvaga\oswin32.cpp">
@@ -195,6 +196,7 @@
   <ItemGroup>
     <ClInclude Include="..\src\xvaga\agasys.h" />
     <ClInclude Include="..\src\xvaga\fstrcmp.h" />
+    <ClInclude Include="..\src\xvaga\guid.hpp" />
     <ClInclude Include="..\src\xvaga\incstr.h" />
     <ClInclude Include="..\src\xvaga\matche.h" />
     <ClInclude Include="..\src\xvaga\MD5Checksum.h" />
diff --git a/build/xvaga.vcxproj.filters b/build/xvaga.vcxproj.filters
index ff61c6d8f..9525bce81 100644
--- a/build/xvaga.vcxproj.filters
+++ b/build/xvaga.vcxproj.filters
@@ -72,6 +72,9 @@
     <ClCompile Include="..\src\wxSqlite3\wxsqlite3.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\xvaga\guid.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\xvaga\agasys.h">
@@ -143,6 +146,9 @@
     <ClInclude Include="..\src\xvaga\xvtwin.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\xvaga\guid.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Library Include="..\lib\SSADll.lib">
diff --git a/build/xvtdb.vcxproj b/build/xvtdb.vcxproj
index 8bf3fa23a..a8fa3f6b8 100644
--- a/build/xvtdb.vcxproj
+++ b/build/xvtdb.vcxproj
@@ -11,7 +11,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}</ProjectGuid>
+    <ProjectGuid>{835D0414-DB92-4563-AB84-2FC250C68947}</ProjectGuid>
     <RootNamespace>xvtdb</RootNamespace>
     <ProjectName>xvtdb</ProjectName>
     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
@@ -111,12 +111,11 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\libraries\SQLAPI\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\SQLAPI\include;..\src\xvaga;..\src\xi;..\src\gfm;..\src\include;..\src\xvtdb;..\src\xvturl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>DBDLL_EXPORT;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -137,6 +136,7 @@
       <TargetMachine>MachineX86</TargetMachine>
       <Version>12.0</Version>
       <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>