Delete explicit references to headers that only existed on FB1 (MSVC doesn't complain unless the missing header is in an #include clause).

Fix reference to header files that existed in another location in FB1.

builds/win32/msvc6/engine.dsp

@@ -736,10 +736,6 @@ SOURCE=..\..\..\src\jrd\dmp_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\doserr.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\src\jrd\dpm_proto.h
 # End Source File
 # Begin Source File
@@ -1064,10 +1060,6 @@ SOURCE=..\..\..\src\jrd\mov_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\mpexl.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\src\jrd\msg.h
 # End Source File
 # Begin Source File
@@ -1092,10 +1084,6 @@ SOURCE=..\..\..\src\jrd\nav_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\nlm_thd.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\src\jrd\nod.h
 # End Source File
 # Begin Source File
@@ -1152,10 +1140,6 @@ SOURCE=..\..\..\src\jrd\os\pio_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\pragma.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\src\jrd\PreparedStatement.h
 # End Source File
 # Begin Source File
@@ -1164,10 +1148,6 @@ SOURCE=..\..\..\src\jrd\prv_m_bypass.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\pwd_proto.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\src\jrd\quad.h
 # End Source File
 # Begin Source File
@@ -1256,10 +1236,6 @@ SOURCE=..\..\..\src\jrd\sdw_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\seg_proto.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\src\jrd\sha.h
 # End Source File
 # Begin Source File
@@ -1280,7 +1256,7 @@ SOURCE=..\..\..\src\jrd\sort_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\sql_code.h
+SOURCE=..\..\..\src\include\gen\sql_code.h
 # End Source File
 # Begin Source File
 
@@ -1316,10 +1292,6 @@ SOURCE=..\..\..\src\jrd\TempSpace.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\termtype.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\src\jrd\TextType.h
 # End Source File
 # Begin Source File

builds/win32/msvc6/engine_classic.dsp

@@ -705,10 +705,6 @@ SOURCE=..\..\..\src\jrd\dmp_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\doserr.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\src\jrd\dpm_proto.h
 # End Source File
 # Begin Source File
@@ -1033,10 +1029,6 @@ SOURCE=..\..\..\src\jrd\mov_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\mpexl.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\src\jrd\msg.h
 # End Source File
 # Begin Source File
@@ -1061,10 +1053,6 @@ SOURCE=..\..\..\src\jrd\nav_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\nlm_thd.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\src\jrd\nod.h
 # End Source File
 # Begin Source File
@@ -1121,10 +1109,6 @@ SOURCE=..\..\..\src\jrd\os\pio_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\pragma.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\src\jrd\PreparedStatement.h
 # End Source File
 # Begin Source File
@@ -1133,10 +1117,6 @@ SOURCE=..\..\..\src\jrd\prv_m_bypass.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\pwd_proto.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\src\jrd\quad.h
 # End Source File
 # Begin Source File
@@ -1225,10 +1205,6 @@ SOURCE=..\..\..\src\jrd\sdw_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\seg_proto.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\src\jrd\sha.h
 # End Source File
 # Begin Source File
@@ -1249,7 +1225,7 @@ SOURCE=..\..\..\src\jrd\sort_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\sql_code.h
+SOURCE=..\..\..\src\include\gen\sql_code.h
 # End Source File
 # Begin Source File
 
@@ -1285,10 +1261,6 @@ SOURCE=..\..\..\src\jrd\TempSpace.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\termtype.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\src\jrd\TextType.h
 # End Source File
 # Begin Source File

builds/win32/msvc6/engine_embed.dsp

@@ -709,10 +709,6 @@ SOURCE=..\..\..\src\jrd\dmp_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\doserr.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\src\jrd\dpm_proto.h
 # End Source File
 # Begin Source File
@@ -1037,10 +1033,6 @@ SOURCE=..\..\..\src\jrd\mov_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\mpexl.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\src\jrd\msg.h
 # End Source File
 # Begin Source File
@@ -1065,10 +1057,6 @@ SOURCE=..\..\..\src\jrd\nav_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\nlm_thd.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\src\jrd\nod.h
 # End Source File
 # Begin Source File
@@ -1125,10 +1113,6 @@ SOURCE=..\..\..\src\jrd\os\pio_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\pragma.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\src\jrd\PreparedStatement.h
 # End Source File
 # Begin Source File
@@ -1137,10 +1121,6 @@ SOURCE=..\..\..\src\jrd\prv_m_bypass.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\pwd_proto.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\src\jrd\quad.h
 # End Source File
 # Begin Source File
@@ -1233,10 +1213,6 @@ SOURCE=..\..\..\src\jrd\sdw_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\seg_proto.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\src\jrd\sha.h
 # End Source File
 # Begin Source File
@@ -1257,7 +1233,7 @@ SOURCE=..\..\..\src\jrd\sort_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\sql_code.h
+SOURCE=..\..\..\src\include\gen\sql_code.h
 # End Source File
 # Begin Source File
 
@@ -1293,10 +1269,6 @@ SOURCE=..\..\..\src\jrd\TempSpace.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\termtype.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\src\jrd\TextType.h
 # End Source File
 # Begin Source File

builds/win32/msvc7/engine.vcproj

@@ -535,9 +535,6 @@
 			<File
 				RelativePath="..\..\..\src\jrd\dmp_proto.h">
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\doserr.h">
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\dpm_proto.h">
 			</File>
@@ -787,9 +784,6 @@
 			<File
 				RelativePath="..\..\..\src\jrd\mov_proto.h">
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\mpexl.h">
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\msg.h">
 			</File>
@@ -811,9 +805,6 @@
 			<File
 				RelativePath="..\..\..\src\jrd\nbak.h">
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\nlm_thd.h">
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\nod.h">
 			</File>
@@ -862,18 +853,12 @@
 			<File
 				RelativePath="..\..\..\src\jrd\os\pio_proto.h">
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\pragma.h">
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\PreparedStatement.h">
 			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\prv_m_bypass.h">
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\pwd_proto.h">
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\quad.h">
 			</File>
@@ -952,9 +937,6 @@
 			<File
 				RelativePath="..\..\..\src\jrd\sdw_proto.h">
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\seg_proto.h">
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\sha.h">
 			</File>
@@ -971,7 +953,7 @@
 				RelativePath="..\..\..\src\jrd\sort_proto.h">
 			</File>
 			<File
-				RelativePath="..\..\..\src\jrd\sql_code.h">
+				RelativePath="..\..\..\src\include\gen\sql_code.h">
 			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\sqz.h">
@@ -1000,9 +982,6 @@
 			<File
 				RelativePath="..\..\..\src\jrd\TempSpace.h">
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\termtype.h">
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\TextType.h">
 			</File>

builds/win32/msvc7/engine_classic.vcproj

@@ -535,9 +535,6 @@
 			<File
 				RelativePath="..\..\..\src\jrd\dmp_proto.h">
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\doserr.h">
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\dpm_proto.h">
 			</File>
@@ -787,9 +784,6 @@
 			<File
 				RelativePath="..\..\..\src\jrd\mov_proto.h">
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\mpexl.h">
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\msg.h">
 			</File>
@@ -811,9 +805,6 @@
 			<File
 				RelativePath="..\..\..\src\jrd\nbak.h">
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\nlm_thd.h">
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\nod.h">
 			</File>
@@ -862,18 +853,12 @@
 			<File
 				RelativePath="..\..\..\src\jrd\os\pio_proto.h">
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\pragma.h">
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\PreparedStatement.h">
 			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\prv_m_bypass.h">
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\pwd_proto.h">
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\quad.h">
 			</File>
@@ -952,9 +937,6 @@
 			<File
 				RelativePath="..\..\..\src\jrd\sdw_proto.h">
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\seg_proto.h">
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\sha.h">
 			</File>
@@ -971,7 +953,7 @@
 				RelativePath="..\..\..\src\jrd\sort_proto.h">
 			</File>
 			<File
-				RelativePath="..\..\..\src\jrd\sql_code.h">
+				RelativePath="..\..\..\src\include\gen\sql_code.h">
 			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\sqz.h">
@@ -1000,9 +982,6 @@
 			<File
 				RelativePath="..\..\..\src\jrd\TempSpace.h">
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\termtype.h">
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\TextType.h">
 			</File>

builds/win32/msvc7/engine_embed.vcproj

@@ -536,9 +536,6 @@
 			<File
 				RelativePath="..\..\..\src\jrd\dmp_proto.h">
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\doserr.h">
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\dpm_proto.h">
 			</File>
@@ -788,9 +785,6 @@
 			<File
 				RelativePath="..\..\..\src\jrd\mov_proto.h">
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\mpexl.h">
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\msg.h">
 			</File>
@@ -812,9 +806,6 @@
 			<File
 				RelativePath="..\..\..\src\jrd\nbak.h">
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\nlm_thd.h">
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\nod.h">
 			</File>
@@ -863,18 +854,12 @@
 			<File
 				RelativePath="..\..\..\src\jrd\os\pio_proto.h">
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\pragma.h">
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\PreparedStatement.h">
 			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\prv_m_bypass.h">
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\pwd_proto.h">
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\quad.h">
 			</File>
@@ -953,9 +938,6 @@
 			<File
 				RelativePath="..\..\..\src\jrd\sdw_proto.h">
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\seg_proto.h">
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\sha.h">
 			</File>
@@ -972,7 +954,7 @@
 				RelativePath="..\..\..\src\jrd\sort_proto.h">
 			</File>
 			<File
-				RelativePath="..\..\..\src\jrd\sql_code.h">
+				RelativePath="..\..\..\src\include\gen\sql_code.h">
 			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\sqz.h">
@@ -1001,9 +983,6 @@
 			<File
 				RelativePath="..\..\..\src\jrd\TempSpace.h">
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\termtype.h">
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\TextType.h">
 			</File>

builds/win32/msvc8/engine.vcproj

@@ -830,10 +830,6 @@
 				RelativePath="..\..\..\src\jrd\dmp_proto.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\doserr.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\dpm_proto.h"
 				>
@@ -1182,10 +1178,6 @@
 				RelativePath="..\..\..\src\jrd\mov_proto.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\mpexl.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\msg.h"
 				>
@@ -1214,10 +1206,6 @@
 				RelativePath="..\..\..\src\jrd\nbak.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\nlm_thd.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\nod.h"
 				>
@@ -1282,10 +1270,6 @@
 				RelativePath="..\..\..\src\jrd\os\pio_proto.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\pragma.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\PreparedStatement.h"
 				>
@@ -1294,10 +1278,6 @@
 				RelativePath="..\..\..\src\jrd\prv_m_bypass.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\pwd_proto.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\quad.h"
 				>
@@ -1402,10 +1382,6 @@
 				RelativePath="..\..\..\src\jrd\sdw_proto.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\seg_proto.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\sha.h"
 				>
@@ -1427,7 +1403,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\jrd\sql_code.h"
+				RelativePath="..\..\..\src\include\gen\sql_code.h"
 				>
 			</File>
 			<File
@@ -1466,10 +1442,6 @@
 				RelativePath="..\..\..\src\jrd\TempSpace.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\termtype.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\TextType.h"
 				>

builds/win32/msvc8/engine_classic.vcproj

@@ -830,10 +830,6 @@
 				RelativePath="..\..\..\src\jrd\dmp_proto.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\doserr.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\dpm_proto.h"
 				>
@@ -1182,10 +1178,6 @@
 				RelativePath="..\..\..\src\jrd\mov_proto.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\mpexl.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\msg.h"
 				>
@@ -1214,10 +1206,6 @@
 				RelativePath="..\..\..\src\jrd\nbak.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\nlm_thd.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\nod.h"
 				>
@@ -1282,10 +1270,6 @@
 				RelativePath="..\..\..\src\jrd\os\pio_proto.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\pragma.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\PreparedStatement.h"
 				>
@@ -1294,10 +1278,6 @@
 				RelativePath="..\..\..\src\jrd\prv_m_bypass.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\pwd_proto.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\quad.h"
 				>
@@ -1402,10 +1382,6 @@
 				RelativePath="..\..\..\src\jrd\sdw_proto.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\seg_proto.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\sha.h"
 				>
@@ -1427,7 +1403,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\jrd\sql_code.h"
+				RelativePath="..\..\..\src\include\gen\sql_code.h"
 				>
 			</File>
 			<File
@@ -1466,10 +1442,6 @@
 				RelativePath="..\..\..\src\jrd\TempSpace.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\termtype.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\TextType.h"
 				>

builds/win32/msvc8/engine_embed.vcproj

@@ -830,10 +830,6 @@
 				RelativePath="..\..\..\src\jrd\dmp_proto.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\doserr.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\dpm_proto.h"
 				>
@@ -1182,10 +1178,6 @@
 				RelativePath="..\..\..\src\jrd\mov_proto.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\mpexl.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\msg.h"
 				>
@@ -1214,10 +1206,6 @@
 				RelativePath="..\..\..\src\jrd\nbak.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\nlm_thd.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\nod.h"
 				>
@@ -1282,10 +1270,6 @@
 				RelativePath="..\..\..\src\jrd\os\pio_proto.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\pragma.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\PreparedStatement.h"
 				>
@@ -1294,10 +1278,6 @@
 				RelativePath="..\..\..\src\jrd\prv_m_bypass.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\pwd_proto.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\quad.h"
 				>
@@ -1402,10 +1382,6 @@
 				RelativePath="..\..\..\src\jrd\sdw_proto.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\seg_proto.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\sha.h"
 				>
@@ -1427,7 +1403,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\jrd\sql_code.h"
+				RelativePath="..\..\..\src\include\gen\sql_code.h"
 				>
 			</File>
 			<File
@@ -1466,10 +1442,6 @@
 				RelativePath="..\..\..\src\jrd\TempSpace.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\termtype.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\TextType.h"
 				>