diff --git a/builds/win32/msvc15/common.vcxproj b/builds/win32/msvc15/common.vcxproj
index 0783d06cfd..fe2589d153 100644
--- a/builds/win32/msvc15/common.vcxproj
+++ b/builds/win32/msvc15/common.vcxproj
@@ -182,7 +182,6 @@
     <ClInclude Include="..\..\..\src\common\dyntable.h" />
     <ClInclude Include="..\..\..\src\common\enc_proto.h" />
     <ClInclude Include="..\..\..\src\common\file_params.h" />
-    <ClInclude Include="..\..\..\src\common\gds_proto.h" />
     <ClInclude Include="..\..\..\src\common\gdsassert.h" />
     <ClInclude Include="..\..\..\src\common\Int128.h" />
     <ClInclude Include="..\..\..\src\common\intlobj_new.h" />
diff --git a/builds/win32/msvc15/common.vcxproj.filters b/builds/win32/msvc15/common.vcxproj.filters
index 2223a7560c..375058a121 100644
--- a/builds/win32/msvc15/common.vcxproj.filters
+++ b/builds/win32/msvc15/common.vcxproj.filters
@@ -302,9 +302,6 @@
     <ClInclude Include="..\..\..\src\common\enc_proto.h">
       <Filter>headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\common\gds_proto.h">
-      <Filter>headers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\common\intlobj_new.h">
       <Filter>headers</Filter>
     </ClInclude>
diff --git a/builds/win32/msvc15/yvalve.vcxproj b/builds/win32/msvc15/yvalve.vcxproj
index f3a5597a0f..38752a2184 100644
--- a/builds/win32/msvc15/yvalve.vcxproj
+++ b/builds/win32/msvc15/yvalve.vcxproj
@@ -48,6 +48,7 @@
     <ClInclude Include="..\..\..\src\yvalve\alt_proto.h" />
     <ClInclude Include="..\..\..\src\yvalve\array_proto.h" />
     <ClInclude Include="..\..\..\src\yvalve\blob_proto.h" />
+    <ClInclude Include="..\..\..\src\yvalve\gds_proto.h" />
     <ClInclude Include="..\..\..\src\yvalve\keywordsStub.h" />
     <ClInclude Include="..\..\..\src\yvalve\perf.h" />
     <ClInclude Include="..\..\..\src\yvalve\perf_proto.h" />
diff --git a/builds/win32/msvc15/yvalve.vcxproj.filters b/builds/win32/msvc15/yvalve.vcxproj.filters
index efd2ddbe7a..b08b8d1e74 100644
--- a/builds/win32/msvc15/yvalve.vcxproj.filters
+++ b/builds/win32/msvc15/yvalve.vcxproj.filters
@@ -95,6 +95,9 @@
     <ClInclude Include="..\..\..\src\yvalve\blob_proto.h">
       <Filter>headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\yvalve\gds_proto.h">
+      <Filter>headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\src\yvalve\keywordsStub.h">
       <Filter>headers</Filter>
     </ClInclude>
diff --git a/src/alice/alice.cpp b/src/alice/alice.cpp
index b5aa9574c0..19f8c12009 100644
--- a/src/alice/alice.cpp
+++ b/src/alice/alice.cpp
@@ -45,7 +45,7 @@
 #include "../alice/alice.h"
 #include "../alice/exe_proto.h"
 #include "../common/msg_encode.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../alice/alice_proto.h"
 #include "../common/utils_proto.h"
 #include "../common/classes/Switches.h"
diff --git a/src/alice/alice_meta.epp b/src/alice/alice_meta.epp
index 6cab971aa4..651602fcc6 100644
--- a/src/alice/alice_meta.epp
+++ b/src/alice/alice_meta.epp
@@ -32,7 +32,7 @@
 #include "ibase.h"
 #include "../alice/alice.h"
 #include "../alice/alice_meta.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "fb_exception.h"
 #include "../common/classes/alloc.h"
 #include "../common/classes/array.h"
diff --git a/src/alice/exe.cpp b/src/alice/exe.cpp
index c1c411faac..5dc13750a4 100644
--- a/src/alice/exe.cpp
+++ b/src/alice/exe.cpp
@@ -43,7 +43,7 @@
 #include "../alice/aliceswi.h"
 #include "../alice/alice_meta.h"
 #include "../alice/tdr_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/constants.h"
 #include "../common/classes/ClumpletWriter.h"
 
diff --git a/src/alice/tdr.cpp b/src/alice/tdr.cpp
index 633876e730..f7b1e89b0b 100644
--- a/src/alice/tdr.cpp
+++ b/src/alice/tdr.cpp
@@ -42,7 +42,7 @@
 #include "../alice/alice_proto.h"
 #include "../alice/alice_meta.h"
 #include "../alice/tdr_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/isc_proto.h"
 #include "../jrd/constants.h"
 #include "../common/classes/ClumpletWriter.h"
diff --git a/src/auth/SecurityDatabase/LegacyManagement.epp b/src/auth/SecurityDatabase/LegacyManagement.epp
index ff96f3c9f3..80cbc070dc 100644
--- a/src/auth/SecurityDatabase/LegacyManagement.epp
+++ b/src/auth/SecurityDatabase/LegacyManagement.epp
@@ -30,7 +30,7 @@
 #include "ibase.h"
 #include "../auth/SecurityDatabase/LegacyHash.h"
 #include "../common/enc_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/isc_proto.h"
 #include "../utilities/gsec/gsec.h"
 #include "../common/utils_proto.h"
diff --git a/src/burp/burp.cpp b/src/burp/burp.cpp
index bd59785506..38750aa532 100644
--- a/src/burp/burp.cpp
+++ b/src/burp/burp.cpp
@@ -52,7 +52,7 @@
 #include "../burp/backu_proto.h"
 #include "../burp/mvol_proto.h"
 #include "../burp/resto_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/gdsassert.h"
 #include "../common/isc_f_proto.h"
 #include "../common/classes/ClumpletWriter.h"
diff --git a/src/burp/burp.h b/src/burp/burp.h
index c641377159..6138267e93 100644
--- a/src/burp/burp.h
+++ b/src/burp/burp.h
@@ -36,7 +36,7 @@
 #include "../common/dsc.h"
 #include "../burp/misc_proto.h"
 #include "../burp/mvol_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/ThreadData.h"
 #include "../common/UtilSvc.h"
 #include "../common/classes/array.h"
diff --git a/src/burp/mvol.cpp b/src/burp/mvol.cpp
index 9e1e4c888e..da257d6063 100644
--- a/src/burp/mvol.cpp
+++ b/src/burp/mvol.cpp
@@ -44,7 +44,7 @@
 #include "../burp/mvol_proto.h"
 #include "../burp/split/spit.h"
 #include "../burp/BurpTasks.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/gdsassert.h"
 #include "../common/os/os_utils.h"
 #include <fcntl.h>
diff --git a/src/common/StatementMetadata.cpp b/src/common/StatementMetadata.cpp
index d64eb09fb6..4a48fafe46 100644
--- a/src/common/StatementMetadata.cpp
+++ b/src/common/StatementMetadata.cpp
@@ -27,7 +27,7 @@
 #include "memory_routines.h"
 #include "../common/StatusHolder.h"
 #include "firebird/impl/inf_pub.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/utils_proto.h"
 #include "firebird/impl/sqlda_pub.h"
 
diff --git a/src/common/ThreadStart.cpp b/src/common/ThreadStart.cpp
index acc678b671..44a45d6130 100644
--- a/src/common/ThreadStart.cpp
+++ b/src/common/ThreadStart.cpp
@@ -32,7 +32,7 @@
 #include <errno.h>
 #include "../common/classes/alloc.h"
 #include "../common/ThreadStart.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/gdsassert.h"
 
 #ifdef WIN_NT
diff --git a/src/common/classes/ClumpletReader.cpp b/src/common/classes/ClumpletReader.cpp
index 2ef385a53b..67710ca654 100644
--- a/src/common/classes/ClumpletReader.cpp
+++ b/src/common/classes/ClumpletReader.cpp
@@ -35,7 +35,7 @@
 #include "firebird/Interface.h"
 
 #ifdef DEBUG_CLUMPLETS
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include <ctype.h>
 
 namespace Firebird {
diff --git a/src/common/classes/ImplementHelper.h b/src/common/classes/ImplementHelper.h
index 123c5dc5d2..5da017d1b8 100644
--- a/src/common/classes/ImplementHelper.h
+++ b/src/common/classes/ImplementHelper.h
@@ -32,7 +32,7 @@
 #include "firebird/Interface.h"
 #include "../common/classes/alloc.h"
 #include "iberror.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/classes/init.h"
 #include "../common/classes/auto.h"
 #include "../common/classes/RefCounted.h"
diff --git a/src/common/classes/MsgPrint.cpp b/src/common/classes/MsgPrint.cpp
index 1a6508f2a1..66d6af97f6 100644
--- a/src/common/classes/MsgPrint.cpp
+++ b/src/common/classes/MsgPrint.cpp
@@ -28,7 +28,7 @@
 #include "BaseStream.h"
 #include "MsgPrint.h"
 #include <string.h>
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/utils_proto.h"
 #include "../common/file_params.h"
 
diff --git a/src/common/classes/UserBlob.cpp b/src/common/classes/UserBlob.cpp
index 4e96b139e8..51fc2844dd 100644
--- a/src/common/classes/UserBlob.cpp
+++ b/src/common/classes/UserBlob.cpp
@@ -23,7 +23,7 @@
 
 #include "UserBlob.h"
 #include "ibase.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 
 static const USHORT SEGMENT_LIMIT = 65535;
 //static SLONG fb_vax_integer(const UCHAR* ptr, int length);
diff --git a/src/common/config/dir_list.cpp b/src/common/config/dir_list.cpp
index 88274e76a6..c772dbb0c0 100644
--- a/src/common/config/dir_list.cpp
+++ b/src/common/config/dir_list.cpp
@@ -23,7 +23,7 @@
 #include "../common/config/config.h"
 #include "../common/config/dir_list.h"
 #include "../common/os/path_utils.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/TempSpace.h"
 #include "../common/utils_proto.h"
 
diff --git a/src/common/db_alias.cpp b/src/common/db_alias.cpp
index a2577f8cc2..6e0a6802ab 100644
--- a/src/common/db_alias.cpp
+++ b/src/common/db_alias.cpp
@@ -27,7 +27,7 @@
 #include "../common/config/ConfigCache.h"
 #include "../common/config/dir_list.h"
 #include "../common/os/path_utils.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/isc_proto.h"
 #include "../common/utils_proto.h"
 #include "../common/classes/Hash.h"
diff --git a/src/common/dsc.cpp b/src/common/dsc.cpp
index bf9a606a3d..fdfab54dce 100644
--- a/src/common/dsc.cpp
+++ b/src/common/dsc.cpp
@@ -30,7 +30,7 @@
 #include "../common/TimeZoneUtil.h"
 #include "ibase.h"
 #include "../jrd/intl.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/gdsassert.h"
 #include "../common/dsc_proto.h"
 #include "../common/StatusArg.h"
diff --git a/src/common/gds.cpp b/src/common/gds.cpp
index 93b7f769bb..c0b4f3143d 100644
--- a/src/common/gds.cpp
+++ b/src/common/gds.cpp
@@ -45,7 +45,7 @@
 #include "../common/gdsassert.h"
 #include "../common/file_params.h"
 #include "../common/msg_encode.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/os/path_utils.h"
 #include "../common/dsc.h"
 #include "../common/TimeZoneUtil.h"
diff --git a/src/common/gdsassert.h b/src/common/gdsassert.h
index fbd649eb3e..7d048203c6 100644
--- a/src/common/gdsassert.h
+++ b/src/common/gdsassert.h
@@ -21,7 +21,7 @@
 #ifndef COMMON_GDSASSERT_H
 #define COMMON_GDSASSERT_H
 
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 
 #ifdef DEV_BUILD
 
diff --git a/src/common/isc.cpp b/src/common/isc.cpp
index 67b8060164..9183d8bfbe 100644
--- a/src/common/isc.cpp
+++ b/src/common/isc.cpp
@@ -42,7 +42,7 @@
 
 #include "iberror.h"
 #include "ibase.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/isc_proto.h"
 #include "../common/os/os_utils.h"
 #include "../common/os/path_utils.h"
diff --git a/src/common/isc_file.cpp b/src/common/isc_file.cpp
index c47993cb4d..10222ac6b6 100644
--- a/src/common/isc_file.cpp
+++ b/src/common/isc_file.cpp
@@ -47,7 +47,7 @@
 #include <string.h>
 #include <ctype.h>
 #include "iberror.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/isc_proto.h"
 #include "../common/isc_f_proto.h"
 #include "../jrd/jrd_proto.h"
diff --git a/src/common/isc_sync.cpp b/src/common/isc_sync.cpp
index 975ef55515..96b1cddf3c 100644
--- a/src/common/isc_sync.cpp
+++ b/src/common/isc_sync.cpp
@@ -51,7 +51,7 @@
 #endif
 
 #include "iberror.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/isc_proto.h"
 #include "../common/os/isc_i_proto.h"
 #include "../common/os/os_utils.h"
diff --git a/src/common/os/posix/SyncSignals.cpp b/src/common/os/posix/SyncSignals.cpp
index c44f633e1f..54beabd45d 100644
--- a/src/common/os/posix/SyncSignals.cpp
+++ b/src/common/os/posix/SyncSignals.cpp
@@ -30,7 +30,7 @@
 #include "iberror.h"
 
 /*
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/isc_proto.h"
 #include "../common/os/isc_i_proto.h"
 #include "../common/os/os_utils.h"
diff --git a/src/common/os/posix/isc_ipc.cpp b/src/common/os/posix/isc_ipc.cpp
index 8b198e6401..6133968853 100644
--- a/src/common/os/posix/isc_ipc.cpp
+++ b/src/common/os/posix/isc_ipc.cpp
@@ -41,7 +41,7 @@
 #include <stdlib.h>
 #include "../common/gdsassert.h"
 #include "iberror.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/isc_proto.h"
 #include "../common/os/isc_i_proto.h"
 #include "../common/isc_s_proto.h"
diff --git a/src/common/os/win32/isc_ipc.cpp b/src/common/os/win32/isc_ipc.cpp
index 252b0ae7c3..1e457d589b 100644
--- a/src/common/os/win32/isc_ipc.cpp
+++ b/src/common/os/win32/isc_ipc.cpp
@@ -41,7 +41,7 @@
 #include "../../../common/classes/init.h"
 #include "../../../common/utils_proto.h"
 #include "iberror.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/isc_proto.h"
 #include "../common/os/isc_i_proto.h"
 #include "../common/isc_s_proto.h"
diff --git a/src/common/pretty.cpp b/src/common/pretty.cpp
index 2b5985cbf9..b20c0c394a 100644
--- a/src/common/pretty.cpp
+++ b/src/common/pretty.cpp
@@ -34,7 +34,7 @@
 #include "ibase.h"
 #include "../jrd/constants.h"
 #include "../common/prett_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 
 static inline void ADVANCE_PTR(TEXT*& ptr)
 {
diff --git a/src/common/sdl.cpp b/src/common/sdl.cpp
index 74f88437fd..0059a6bda3 100644
--- a/src/common/sdl.cpp
+++ b/src/common/sdl.cpp
@@ -26,7 +26,7 @@
 #include "ibase.h"
 #include "../common/sdl.h"
 #include "../jrd/intl.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/sdl_proto.h"
 #include "../common/StatusArg.h"
 
diff --git a/src/common/xdr.cpp b/src/common/xdr.cpp
index d91b7b7f31..f3f30bab72 100644
--- a/src/common/xdr.cpp
+++ b/src/common/xdr.cpp
@@ -28,7 +28,7 @@
 #include <string.h>
 #include "../common/xdr.h"
 #include "../common/xdr_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/gdsassert.h"
 #include "../common/DecFloat.h"
 #include "../common/Int128.h"
diff --git a/src/dsql/ddl.cpp b/src/dsql/ddl.cpp
index b4736018c0..ce05c19496 100644
--- a/src/dsql/ddl.cpp
+++ b/src/dsql/ddl.cpp
@@ -93,7 +93,7 @@
 #include "../dsql/utld_proto.h"
 #include "../jrd/intl_proto.h"
 #include "../jrd/met_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/jrd_proto.h"
 #include "../jrd/vio_proto.h"
 #include "../yvalve/why_proto.h"
diff --git a/src/dsql/dsql.cpp b/src/dsql/dsql.cpp
index 1be3f62ada..203d98d475 100644
--- a/src/dsql/dsql.cpp
+++ b/src/dsql/dsql.cpp
@@ -56,7 +56,7 @@
 #include "../jrd/DataTypeUtil.h"
 #include "../jrd/blb_proto.h"
 #include "../jrd/cmp_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/exe_proto.h"
 #include "../jrd/inf_proto.h"
 #include "../jrd/ini_proto.h"
diff --git a/src/dsql/errd.cpp b/src/dsql/errd.cpp
index 935f909b9d..9e8d3564f6 100644
--- a/src/dsql/errd.cpp
+++ b/src/dsql/errd.cpp
@@ -51,7 +51,7 @@
 //#undef BUGCHECK
 //#undef IBERROR
 
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/utils_proto.h"
 
 using namespace Jrd;
diff --git a/src/dsql/metd.epp b/src/dsql/metd.epp
index 0255bb16d8..bfb47f644e 100644
--- a/src/dsql/metd.epp
+++ b/src/dsql/metd.epp
@@ -48,7 +48,7 @@
 #include "../jrd/blb_proto.h"
 #include "../jrd/cmp_proto.h"
 #include "../jrd/exe_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/met_proto.h"
 #include "../yvalve/why_proto.h"
 #include "../common/utils_proto.h"
diff --git a/src/dsql/parse.y b/src/dsql/parse.y
index 98c47e5a1d..e2e04f8295 100644
--- a/src/dsql/parse.y
+++ b/src/dsql/parse.y
@@ -89,7 +89,7 @@
 #include "../jrd/DataTypeUtil.h"
 #include "../dsql/errd_proto.h"
 #include "../dsql/make_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/err_proto.h"
 #include "../common/intlobj_new.h"
 #include "../jrd/Attachment.h"
diff --git a/src/dsql/utld.cpp b/src/dsql/utld.cpp
index 3d44a3d970..5d142f77e4 100644
--- a/src/dsql/utld.cpp
+++ b/src/dsql/utld.cpp
@@ -39,7 +39,7 @@
 #include "../jrd/align.h"
 #include "../jrd/constants.h"
 #include "../dsql/utld_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/classes/init.h"
 
 using namespace Jrd;
diff --git a/src/gpre/boot/gpre_meta_boot.cpp b/src/gpre/boot/gpre_meta_boot.cpp
index 3c8c996fc4..67f13f4011 100644
--- a/src/gpre/boot/gpre_meta_boot.cpp
+++ b/src/gpre/boot/gpre_meta_boot.cpp
@@ -39,7 +39,7 @@
 #include "../gpre/gpre_meta.h"
 #include "../gpre/msc_proto.h"
 #include "../gpre/par_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 
 /*____________________________________________________________
  *
diff --git a/src/gpre/c_cxx.cpp b/src/gpre/c_cxx.cpp
index 0304b03721..8db3968e49 100644
--- a/src/gpre/c_cxx.cpp
+++ b/src/gpre/c_cxx.cpp
@@ -42,7 +42,7 @@
 #include "../gpre/lang_proto.h"
 #include "../gpre/pat_proto.h"
 #include "../common/prett_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/utils_proto.h"
 
 
diff --git a/src/gpre/int_cxx.cpp b/src/gpre/int_cxx.cpp
index 34f32851d5..fabd63c477 100644
--- a/src/gpre/int_cxx.cpp
+++ b/src/gpre/int_cxx.cpp
@@ -34,7 +34,7 @@
 #include "../gpre/gpre.h"
 #include "../gpre/gpre_proto.h"
 #include "../gpre/lang_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/utils_proto.h"
 
 static void align(const int);
diff --git a/src/gpre/languages/ada.cpp b/src/gpre/languages/ada.cpp
index 376ac468f3..80011fcefb 100644
--- a/src/gpre/languages/ada.cpp
+++ b/src/gpre/languages/ada.cpp
@@ -38,7 +38,7 @@
 #include "../gpre/lang_proto.h"
 #include "../gpre/pat_proto.h"
 #include "../common/prett_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/utils_proto.h"
 
 #ifdef HAVE_STRING_H
diff --git a/src/gpre/languages/cob.cpp b/src/gpre/languages/cob.cpp
index ef31176fec..9011a055a9 100644
--- a/src/gpre/languages/cob.cpp
+++ b/src/gpre/languages/cob.cpp
@@ -43,7 +43,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include "ibase.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../gpre/gpre.h"
 #include "../gpre/pat.h"
 #include "../gpre/cmp_proto.h"
diff --git a/src/gpre/languages/ftn.cpp b/src/gpre/languages/ftn.cpp
index 88e0b306ac..8de9e4206b 100644
--- a/src/gpre/languages/ftn.cpp
+++ b/src/gpre/languages/ftn.cpp
@@ -34,7 +34,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include "ibase.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../gpre/gpre.h"
 #include "../gpre/pat.h"
 #include "../gpre/cmp_proto.h"
diff --git a/src/gpre/languages/pas.cpp b/src/gpre/languages/pas.cpp
index 278340b10b..30d8ca9762 100644
--- a/src/gpre/languages/pas.cpp
+++ b/src/gpre/languages/pas.cpp
@@ -38,7 +38,7 @@
 #include "../gpre/pat_proto.h"
 #include "../gpre/gpre_proto.h"
 #include "../common/prett_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/utils_proto.h"
 
 
diff --git a/src/gpre/languages/rmc.cpp b/src/gpre/languages/rmc.cpp
index 6efcfec9f6..a6a0ee463a 100644
--- a/src/gpre/languages/rmc.cpp
+++ b/src/gpre/languages/rmc.cpp
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include "ibase.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../gpre/gpre.h"
 #include "../gpre/pat.h"
 #include "../gpre/cmp_proto.h"
diff --git a/src/gpre/msc.cpp b/src/gpre/msc.cpp
index 1157e7d59a..b5e78ea512 100644
--- a/src/gpre/msc.cpp
+++ b/src/gpre/msc.cpp
@@ -47,7 +47,7 @@
 #include "../gpre/gpre.h"
 #include "../gpre/gpre_proto.h"
 #include "../gpre/msc_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 
 
 struct gpre_space
diff --git a/src/gpre/obj_cxx.cpp b/src/gpre/obj_cxx.cpp
index b03018a3a3..5486a902bc 100644
--- a/src/gpre/obj_cxx.cpp
+++ b/src/gpre/obj_cxx.cpp
@@ -42,7 +42,7 @@
 #include "../gpre/lang_proto.h"
 #include "../gpre/pat_proto.h"
 #include "../common/prett_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/utils_proto.h"
 
 
diff --git a/src/iscguard/cntl_guard.cpp b/src/iscguard/cntl_guard.cpp
index de4d041815..a24f992eb8 100644
--- a/src/iscguard/cntl_guard.cpp
+++ b/src/iscguard/cntl_guard.cpp
@@ -26,7 +26,7 @@
 #include "../iscguard/cntlg_proto.h"
 #include "../utilities/install/install_nt.h"
 #include "../common/isc_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/classes/fb_string.h"
 #include "../common/classes/init.h"
 
diff --git a/src/iscguard/iscguard.cpp b/src/iscguard/iscguard.cpp
index 544679f172..983a7ba2d0 100644
--- a/src/iscguard/iscguard.cpp
+++ b/src/iscguard/iscguard.cpp
@@ -18,7 +18,7 @@
  */
 #include "firebird.h"
 #include <stdio.h>
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include <stdlib.h>
 #include <windows.h>
 #include <shellapi.h>
diff --git a/src/isql/extract.epp b/src/isql/extract.epp
index 91083f88e3..31ca3d2cce 100644
--- a/src/isql/extract.epp
+++ b/src/isql/extract.epp
@@ -47,7 +47,7 @@
 #include <ctype.h>				// isdigit
 #include "../jrd/constants.h"
 #include "ibase.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/intlobj_new.h"
 #include "../isql/isql.h"
 #include "../isql/extra_proto.h"
diff --git a/src/isql/iutils.cpp b/src/isql/iutils.cpp
index 7a5d3f34af..aeb9c7db11 100644
--- a/src/isql/iutils.cpp
+++ b/src/isql/iutils.cpp
@@ -26,7 +26,7 @@
 
 #include "iutils_proto.h"
 #include "../yvalve/keywordsStub.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 //#if defined(WIN_NT)
 //#include <windows.h>
 //#endif
diff --git a/src/isql/show.epp b/src/isql/show.epp
index 3b7fed2132..85a6a76168 100644
--- a/src/isql/show.epp
+++ b/src/isql/show.epp
@@ -40,7 +40,7 @@
 #include "../jrd/license.h"
 #include <string.h>
 
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "ibase.h"
 #include "../isql/isql.h"
 #include "../jrd/intl.h"
diff --git a/src/jrd/blb.cpp b/src/jrd/blb.cpp
index 88f98ca191..26691ed9be 100644
--- a/src/jrd/blb.cpp
+++ b/src/jrd/blb.cpp
@@ -61,7 +61,7 @@
 #include "../jrd/evl_proto.h"
 #include "../jrd/exe_proto.h"
 #include "../jrd/filte_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/intl_proto.h"
 #include "../jrd/jrd_proto.h"
 #include "../jrd/met_proto.h"
diff --git a/src/jrd/blob_filter.cpp b/src/jrd/blob_filter.cpp
index 3b0b686656..998e7cbc80 100644
--- a/src/jrd/blob_filter.cpp
+++ b/src/jrd/blob_filter.cpp
@@ -33,7 +33,7 @@
 #include "../common/gdsassert.h"
 #include "../jrd/blf_proto.h"
 #include "../jrd/filte_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/inf_proto.h"
 #include "../jrd/intl_proto.h"
 #include "../jrd/err_proto.h"
diff --git a/src/jrd/btr.cpp b/src/jrd/btr.cpp
index bdb574273d..c58218e38d 100644
--- a/src/jrd/btr.cpp
+++ b/src/jrd/btr.cpp
@@ -52,7 +52,7 @@
 #include "../jrd/err_proto.h"
 #include "../jrd/evl_proto.h"
 #include "../jrd/exe_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/intl_proto.h"
 #include "../jrd/jrd_proto.h"
 #include "../jrd/lck_proto.h"
diff --git a/src/jrd/builtin.cpp b/src/jrd/builtin.cpp
index bb0e9457f3..b8a813a9be 100644
--- a/src/jrd/builtin.cpp
+++ b/src/jrd/builtin.cpp
@@ -27,7 +27,7 @@
 #include <string.h>
 #include "../jrd/flu.h"
 #include "../jrd/flu_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 
 struct FN
 {
diff --git a/src/jrd/cch.cpp b/src/jrd/cch.cpp
index 44f4011d35..ddf3bb7bd0 100644
--- a/src/jrd/cch.cpp
+++ b/src/jrd/cch.cpp
@@ -45,7 +45,7 @@
 #include "../common/gdsassert.h"
 #include "../jrd/cch_proto.h"
 #include "../jrd/err_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/isc_proto.h"
 #include "../common/isc_s_proto.h"
 #include "../jrd/jrd_proto.h"
diff --git a/src/jrd/cmp.cpp b/src/jrd/cmp.cpp
index bf95f4a76b..9a7051cc6e 100644
--- a/src/jrd/cmp.cpp
+++ b/src/jrd/cmp.cpp
@@ -62,7 +62,7 @@
 #include "../jrd/err_proto.h"
 #include "../jrd/exe_proto.h"
 #include "../jrd/fun_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/idx_proto.h"
 #include "../jrd/intl_proto.h"
 #include "../jrd/jrd_proto.h"
diff --git a/src/jrd/cvt.cpp b/src/jrd/cvt.cpp
index e65a543470..efd887ecd9 100644
--- a/src/jrd/cvt.cpp
+++ b/src/jrd/cvt.cpp
@@ -46,7 +46,7 @@
 #include "../jrd/cvt_proto.h"
 #include "../common/dsc_proto.h"
 #include "../jrd/err_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/intl_proto.h"
 #include "../common/classes/timestamp.h"
 #include "../common/cvt.h"
diff --git a/src/jrd/cvt2.cpp b/src/jrd/cvt2.cpp
index c35a0381cd..6ed5ed14e2 100644
--- a/src/jrd/cvt2.cpp
+++ b/src/jrd/cvt2.cpp
@@ -41,7 +41,7 @@
 #include "../jrd/intl_proto.h"
 #include "../jrd/intl_classes.h"
 #include "../jrd/Collation.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 // CVC: I needed them here.
 #include "../jrd/jrd.h"
 #include "../jrd/blb_proto.h"
diff --git a/src/jrd/dfw.epp b/src/jrd/dfw.epp
index 36d95fc31e..401fe9d10a 100644
--- a/src/jrd/dfw.epp
+++ b/src/jrd/dfw.epp
@@ -98,7 +98,7 @@
 #include "../jrd/evl_proto.h"
 #include "../jrd/exe_proto.h"
 #include "../jrd/ext_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/grant_proto.h"
 #include "../jrd/idx_proto.h"
 #include "../jrd/intl_proto.h"
diff --git a/src/jrd/dyn_util.epp b/src/jrd/dyn_util.epp
index 4463490944..c8d4bfedf8 100644
--- a/src/jrd/dyn_util.epp
+++ b/src/jrd/dyn_util.epp
@@ -45,7 +45,7 @@
 #include "../jrd/dyn_ut_proto.h"
 #include "../jrd/err_proto.h"
 #include "../jrd/exe_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/inf_proto.h"
 #include "../jrd/intl_proto.h"
 #include "../common/isc_f_proto.h"
diff --git a/src/jrd/err.cpp b/src/jrd/err.cpp
index ba1614cd44..dd4bd9585c 100644
--- a/src/jrd/err.cpp
+++ b/src/jrd/err.cpp
@@ -41,7 +41,7 @@
 #include "../jrd/cch_proto.h"
 #include "../jrd/met_proto.h"
 #include "../jrd/err_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/isc_proto.h"
 #include "../common/config/config.h"
 #include "../common/utils_proto.h"
diff --git a/src/jrd/event.cpp b/src/jrd/event.cpp
index 5e41902228..1e3c7467cb 100644
--- a/src/jrd/event.cpp
+++ b/src/jrd/event.cpp
@@ -34,7 +34,7 @@
 #include "../jrd/event.h"
 #include "../common/gdsassert.h"
 #include "../jrd/event_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/isc_proto.h"
 #include "../common/isc_s_proto.h"
 #include "../jrd/err_proto.h"
diff --git a/src/jrd/evl.cpp b/src/jrd/evl.cpp
index 6e30ebaf07..5116c08806 100644
--- a/src/jrd/evl.cpp
+++ b/src/jrd/evl.cpp
@@ -102,7 +102,7 @@
 #include "../jrd/pag_proto.h"
 #include "../jrd/rlck_proto.h"
 #include "../jrd/scl_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/align.h"
 #include "../jrd/met_proto.h"
 #include "../common/config/config.h"
diff --git a/src/jrd/exe.cpp b/src/jrd/exe.cpp
index 2af7084d6f..be444e1b63 100644
--- a/src/jrd/exe.cpp
+++ b/src/jrd/exe.cpp
@@ -83,7 +83,7 @@
 #include "../jrd/evl_proto.h"
 #include "../jrd/exe_proto.h"
 #include "../jrd/ext_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/idx_proto.h"
 #include "../jrd/intl_proto.h"
 #include "../jrd/jrd_proto.h"
diff --git a/src/jrd/ext.cpp b/src/jrd/ext.cpp
index d2c1616258..b3e588cbf0 100644
--- a/src/jrd/ext.cpp
+++ b/src/jrd/ext.cpp
@@ -49,7 +49,7 @@
 #include "../jrd/cmp_proto.h"
 #include "../jrd/err_proto.h"
 #include "../jrd/ext_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/met_proto.h"
 #include "../jrd/mov_proto.h"
 #include "../jrd/vio_proto.h"
diff --git a/src/jrd/filters.cpp b/src/jrd/filters.cpp
index 63b742c3a3..ba1a1343ac 100644
--- a/src/jrd/filters.cpp
+++ b/src/jrd/filters.cpp
@@ -36,7 +36,7 @@
 #include "../common/gdsassert.h"
 #include "../jrd/err_proto.h"
 #include "../jrd/filte_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/intl_proto.h"
 #include "../jrd/DebugInterface.h"
 #include "../jrd/mov_proto.h"
diff --git a/src/jrd/flu.cpp b/src/jrd/flu.cpp
index 80b3d03e97..c778f61c91 100644
--- a/src/jrd/flu.cpp
+++ b/src/jrd/flu.cpp
@@ -57,7 +57,7 @@
 #include "../common/gdsassert.h"
 
 #include "../jrd/flu_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/err_proto.h"
 
 #include "iberror.h"
diff --git a/src/jrd/fun.epp b/src/jrd/fun.epp
index abb910fb6c..f7fd84c68d 100644
--- a/src/jrd/fun.epp
+++ b/src/jrd/fun.epp
@@ -54,7 +54,7 @@
 #include "../jrd/exe_proto.h"
 #include "../jrd/flu_proto.h"
 #include "../jrd/fun_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/mov_proto.h"
 #include "../common/isc_s_proto.h"
 #include "../jrd/blb.h"
diff --git a/src/jrd/grant.epp b/src/jrd/grant.epp
index b495713ce0..aabe8453cf 100644
--- a/src/jrd/grant.epp
+++ b/src/jrd/grant.epp
@@ -46,7 +46,7 @@
 #include "../jrd/dpm_proto.h"
 #include "../jrd/err_proto.h"
 #include "../jrd/exe_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/grant_proto.h"
 #include "../jrd/jrd_proto.h"
 #include "../jrd/met_proto.h"
diff --git a/src/jrd/idx.cpp b/src/jrd/idx.cpp
index d612f23495..bc1fb80b15 100644
--- a/src/jrd/idx.cpp
+++ b/src/jrd/idx.cpp
@@ -53,7 +53,7 @@
 #include "../jrd/dpm_proto.h"
 #include "../jrd/err_proto.h"
 #include "../jrd/evl_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/idx_proto.h"
 #include "../jrd/intl_proto.h"
 #include "../jrd/jrd_proto.h"
diff --git a/src/jrd/inf.cpp b/src/jrd/inf.cpp
index bff2c79070..ac502be805 100644
--- a/src/jrd/inf.cpp
+++ b/src/jrd/inf.cpp
@@ -57,7 +57,7 @@
 #include "../jrd/pag_proto.h"
 #include "../jrd/os/pio_proto.h"
 #include "../jrd/tra_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/err_proto.h"
 #include "../jrd/intl_proto.h"
 #include "../jrd/nbak.h"
diff --git a/src/jrd/ini.epp b/src/jrd/ini.epp
index c265b695d9..c78fc409a5 100644
--- a/src/jrd/ini.epp
+++ b/src/jrd/ini.epp
@@ -46,7 +46,7 @@
 #include "../jrd/dpm_proto.h"
 #include "../jrd/err_proto.h"
 #include "../jrd/exe_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/idx_proto.h"
 #include "../jrd/ini_proto.h"
 #include "../jrd/jrd_proto.h"
diff --git a/src/jrd/intl.cpp b/src/jrd/intl.cpp
index 1e3bedaa81..463293de4e 100644
--- a/src/jrd/intl.cpp
+++ b/src/jrd/intl.cpp
@@ -111,7 +111,7 @@
 #include "../common/cvt.h"
 #include "../jrd/err_proto.h"
 #include "../jrd/fun_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/intl_proto.h"
 #include "../common/isc_proto.h"
 #include "../jrd/lck_proto.h"
diff --git a/src/jrd/jrd.cpp b/src/jrd/jrd.cpp
index a3e1a3172b..5f4a5b2bae 100644
--- a/src/jrd/jrd.cpp
+++ b/src/jrd/jrd.cpp
@@ -82,7 +82,7 @@
 #include "../jrd/exe_proto.h"
 #include "../jrd/ext_proto.h"
 #include "../jrd/fun_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/inf_proto.h"
 #include "../jrd/ini_proto.h"
 #include "../jrd/intl_proto.h"
diff --git a/src/jrd/lck.cpp b/src/jrd/lck.cpp
index aaa44cd4b1..af2b76ab11 100644
--- a/src/jrd/lck.cpp
+++ b/src/jrd/lck.cpp
@@ -33,7 +33,7 @@
 #include "../jrd/lck.h"
 #include "iberror.h"
 #include "../jrd/err_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/jrd_proto.h"
 #include "../jrd/lck_proto.h"
 #include "../common/gdsassert.h"
diff --git a/src/jrd/met.epp b/src/jrd/met.epp
index e7db4f2ccd..edbd0170d1 100644
--- a/src/jrd/met.epp
+++ b/src/jrd/met.epp
@@ -74,7 +74,7 @@
 #include "../jrd/exe_proto.h"
 #include "../jrd/ext_proto.h"
 #include "../jrd/flu_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/idx_proto.h"
 #include "../jrd/ini_proto.h"
 
diff --git a/src/jrd/nbak.cpp b/src/jrd/nbak.cpp
index 711667b58e..727c080bcb 100644
--- a/src/jrd/nbak.cpp
+++ b/src/jrd/nbak.cpp
@@ -41,7 +41,7 @@
 #include "../common/isc_proto.h"
 #include "os/pio_proto.h"
 #include "iberror.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/os/guid.h"
 #include "../common/os/isc_i_proto.h"
 #include "../jrd/CryptoManager.h"
diff --git a/src/jrd/optimizer/Optimizer.cpp b/src/jrd/optimizer/Optimizer.cpp
index 216b9ae67c..d34cc4aa9a 100644
--- a/src/jrd/optimizer/Optimizer.cpp
+++ b/src/jrd/optimizer/Optimizer.cpp
@@ -66,7 +66,7 @@
 #include "../jrd/met_proto.h"
 #include "../jrd/mov_proto.h"
 #include "../jrd/par_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/DataTypeUtil.h"
 #include "../jrd/KeywordsTable.h"
 #include "../jrd/RecordSourceNodes.h"
diff --git a/src/jrd/os/posix/unix.cpp b/src/jrd/os/posix/unix.cpp
index b5937979b4..443675e12b 100644
--- a/src/jrd/os/posix/unix.cpp
+++ b/src/jrd/os/posix/unix.cpp
@@ -66,7 +66,7 @@
 #include "iberror.h"
 #include "../jrd/cch_proto.h"
 #include "../jrd/err_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/isc_proto.h"
 #include "../common/isc_f_proto.h"
 #include "../common/os/isc_i_proto.h"
diff --git a/src/jrd/pag.cpp b/src/jrd/pag.cpp
index 1d0688a47b..771713c7fc 100644
--- a/src/jrd/pag.cpp
+++ b/src/jrd/pag.cpp
@@ -82,7 +82,7 @@
 #include "../jrd/cch_proto.h"
 #include "../jrd/dpm_proto.h"
 #include "../jrd/err_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/lck_proto.h"
 #include "../jrd/met_proto.h"
 #include "../jrd/mov_proto.h"
diff --git a/src/jrd/par.cpp b/src/jrd/par.cpp
index 7108140f55..8c063ba184 100644
--- a/src/jrd/par.cpp
+++ b/src/jrd/par.cpp
@@ -55,7 +55,7 @@
 #include "../jrd/cvt_proto.h"
 #include "../jrd/err_proto.h"
 #include "../jrd/fun_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/met_proto.h"
 #include "../jrd/par_proto.h"
 #include "../common/MsgUtil.h"
diff --git a/src/jrd/scl.epp b/src/jrd/scl.epp
index 949adf2938..7b48dd78af 100644
--- a/src/jrd/scl.epp
+++ b/src/jrd/scl.epp
@@ -45,7 +45,7 @@
 #include "../jrd/err_proto.h"
 #include "../jrd/exe_proto.h"
 #include "../jrd/ini_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/isc_proto.h"
 #include "../jrd/met_proto.h"
 #include "../jrd/grant_proto.h"
diff --git a/src/jrd/sdw.cpp b/src/jrd/sdw.cpp
index 0ca7c2cb58..8730a5d2ea 100644
--- a/src/jrd/sdw.cpp
+++ b/src/jrd/sdw.cpp
@@ -38,7 +38,7 @@
 #include "../jrd/flags.h"
 #include "../jrd/cch_proto.h"
 #include "../jrd/err_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/isc_proto.h"
 #include "../common/isc_f_proto.h"
 
diff --git a/src/jrd/sort.cpp b/src/jrd/sort.cpp
index f62e440762..502bd3b2e3 100644
--- a/src/jrd/sort.cpp
+++ b/src/jrd/sort.cpp
@@ -40,7 +40,7 @@
 #include "../jrd/req.h"
 #include "../jrd/val.h"
 #include "../jrd/err_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/src/jrd/sqz.cpp b/src/jrd/sqz.cpp
index 0f43c03e2e..00fc828c70 100644
--- a/src/jrd/sqz.cpp
+++ b/src/jrd/sqz.cpp
@@ -26,7 +26,7 @@
 #include "../jrd/sqz.h"
 #include "../jrd/req.h"
 #include "../jrd/err_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 
 using namespace Jrd;
 
diff --git a/src/jrd/svc.cpp b/src/jrd/svc.cpp
index 06a0dca351..75f6483ce9 100644
--- a/src/jrd/svc.cpp
+++ b/src/jrd/svc.cpp
@@ -42,7 +42,7 @@
 #include "iberror.h"
 #include "../jrd/license.h"
 #include "../jrd/err_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/inf_proto.h"
 #include "../common/isc_proto.h"
 #include "../jrd/jrd_proto.h"
diff --git a/src/jrd/tra.cpp b/src/jrd/tra.cpp
index 9687478ecd..fd713b1d95 100644
--- a/src/jrd/tra.cpp
+++ b/src/jrd/tra.cpp
@@ -50,7 +50,7 @@
 #include "../jrd/exe_proto.h"
 #include "../jrd/ext_proto.h"
 #include "../jrd/idx_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/isc_proto.h"
 #include "../jrd/lck_proto.h"
 #include "../jrd/met_proto.h"
diff --git a/src/jrd/validation.cpp b/src/jrd/validation.cpp
index 1b010749f0..f03551166b 100644
--- a/src/jrd/validation.cpp
+++ b/src/jrd/validation.cpp
@@ -557,7 +557,7 @@ VI. ADDITIONAL NOTES
 #include "../jrd/dpm_proto.h"
 #include "../jrd/err_proto.h"
 #include "../jrd/jrd_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/isc_proto.h"
 #include "../jrd/met_proto.h"
 #include "../jrd/ods_proto.h"
diff --git a/src/jrd/vio.cpp b/src/jrd/vio.cpp
index 92df5270ec..4e00bb45b8 100644
--- a/src/jrd/vio.cpp
+++ b/src/jrd/vio.cpp
@@ -69,7 +69,7 @@
 #include "../jrd/dpm_proto.h"
 #include "../jrd/err_proto.h"
 #include "../jrd/evl_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/idx_proto.h"
 #include "../common/isc_s_proto.h"
 #include "../common/isc_proto.h"
diff --git a/src/lock/lock.cpp b/src/lock/lock.cpp
index 327ec97983..889883cb12 100644
--- a/src/lock/lock.cpp
+++ b/src/lock/lock.cpp
@@ -44,7 +44,7 @@
 #include "../jrd/jrd.h"
 #include "../jrd/Attachment.h"
 #include "iberror.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/gdsassert.h"
 #include "../common/isc_proto.h"
 #include "../common/os/isc_i_proto.h"
diff --git a/src/lock/print.cpp b/src/lock/print.cpp
index 40c3f8313d..fcfc821568 100644
--- a/src/lock/print.cpp
+++ b/src/lock/print.cpp
@@ -41,7 +41,7 @@
 #include "../lock/lock_proto.h"
 #include "../common/gdsassert.h"
 #include "../common/db_alias.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/isc_proto.h"
 #include "../common/isc_s_proto.h"
 #include "../common/StatusHolder.h"
diff --git a/src/remote/client/interface.cpp b/src/remote/client/interface.cpp
index 9b5c818b8e..61dd8f9310 100644
--- a/src/remote/client/interface.cpp
+++ b/src/remote/client/interface.cpp
@@ -52,7 +52,7 @@
 #include "../remote/remot_proto.h"
 #include "../remote/proto_proto.h"
 #include "../common/cvt.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/isc_f_proto.h"
 #include "../common/classes/ClumpletWriter.h"
 #include "../common/classes/BatchCompletionState.h"
diff --git a/src/remote/inet.cpp b/src/remote/inet.cpp
index 0c82db5897..103169eb1e 100644
--- a/src/remote/inet.cpp
+++ b/src/remote/inet.cpp
@@ -105,7 +105,7 @@ const int INET_RETRY_CALL = 5;
 #include "../remote/inet_proto.h"
 #include "../remote/proto_proto.h"
 #include "../remote/remot_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/isc_proto.h"
 #include "../common/isc_f_proto.h"
 #include "../common/os/isc_i_proto.h"
diff --git a/src/remote/merge.cpp b/src/remote/merge.cpp
index 5310e65bd8..9eacfef502 100644
--- a/src/remote/merge.cpp
+++ b/src/remote/merge.cpp
@@ -26,7 +26,7 @@
 #include "ibase.h"
 #include "../remote/remote.h"
 #include "../remote/merge_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/classes/DbImplementation.h"
 
 inline void PUT_WORD(UCHAR*& ptr, USHORT value)
diff --git a/src/remote/os/win32/xnet.cpp b/src/remote/os/win32/xnet.cpp
index 0528731495..9dc8e34557 100644
--- a/src/remote/os/win32/xnet.cpp
+++ b/src/remote/os/win32/xnet.cpp
@@ -33,7 +33,7 @@
 #include "../../../remote/remot_proto.h"
 #include "../../../remote/os/win32/xnet_proto.h"
 #include "../../../remote/server/serve_proto.h"
-#include "../../../common/gds_proto.h"
+#include "../../../yvalve/gds_proto.h"
 #include "../../../common/isc_proto.h"
 #include "../../../common/isc_f_proto.h"
 #include "../../../common/classes/init.h"
diff --git a/src/remote/parser.cpp b/src/remote/parser.cpp
index bab90813cd..ac1896b183 100644
--- a/src/remote/parser.cpp
+++ b/src/remote/parser.cpp
@@ -33,7 +33,7 @@
 #include "../common/DecFloat.h"
 
 #if !defined(DEV_BUILD) || (defined(DEV_BUILD) && defined(WIN_NT))
-#include "../common/gds_proto.h"	// gds__log()
+#include "../yvalve/gds_proto.h"	// gds__log()
 #endif
 
 using namespace Firebird;
diff --git a/src/remote/protocol.cpp b/src/remote/protocol.cpp
index 3d93ce2bc5..ef466b8f34 100644
--- a/src/remote/protocol.cpp
+++ b/src/remote/protocol.cpp
@@ -37,7 +37,7 @@
 #include "../remote/parse_proto.h"
 #include "../remote/proto_proto.h"
 #include "../remote/remot_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/sdl_proto.h"
 #include "../common/StatusHolder.h"
 #include "../common/classes/stack.h"
diff --git a/src/remote/remote.cpp b/src/remote/remote.cpp
index b502a3463e..a8549e6b87 100644
--- a/src/remote/remote.cpp
+++ b/src/remote/remote.cpp
@@ -30,7 +30,7 @@
 #include "../common/gdsassert.h"
 #include "../remote/proto_proto.h"
 #include "../remote/remot_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/config/config.h"
 #include "../common/classes/init.h"
 #include "../common/db_alias.h"
diff --git a/src/remote/server/os/posix/inet_server.cpp b/src/remote/server/os/posix/inet_server.cpp
index cd16c96f40..8de5a57506 100644
--- a/src/remote/server/os/posix/inet_server.cpp
+++ b/src/remote/server/os/posix/inet_server.cpp
@@ -84,7 +84,7 @@
 #include "../remote/inet_proto.h"
 #include "../remote/server/serve_proto.h"
 #include "../remote/server/ReplServer.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/utils_proto.h"
 #include "../common/classes/fb_string.h"
 
diff --git a/src/remote/server/os/win32/cntl.cpp b/src/remote/server/os/win32/cntl.cpp
index c86dd7cb3c..7a3c58dd5b 100644
--- a/src/remote/server/os/win32/cntl.cpp
+++ b/src/remote/server/os/win32/cntl.cpp
@@ -28,7 +28,7 @@
 #include "../utilities/install/install_nt.h"
 #include "../remote/server/serve_proto.h"
 #include "../../remote/server/os/win32/cntl_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/isc_proto.h"
 #include "../jrd/jrd_proto.h"
 #include "../common/classes/init.h"
diff --git a/src/remote/server/os/win32/srvr_w32.cpp b/src/remote/server/os/win32/srvr_w32.cpp
index 77eadf230f..680693333f 100644
--- a/src/remote/server/os/win32/srvr_w32.cpp
+++ b/src/remote/server/os/win32/srvr_w32.cpp
@@ -105,7 +105,7 @@
 #include "../remote/server/os/win32/window_proto.h"
 #include "../remote/server/os/win32/window.rh"
 #include "../remote/os/win32/xnet_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 
 #include "firebird/Interface.h"
 #include "../common/classes/ImplementHelper.h"
diff --git a/src/remote/server/os/win32/window.cpp b/src/remote/server/os/win32/window.cpp
index 07534395ba..b20caf10c6 100644
--- a/src/remote/server/os/win32/window.cpp
+++ b/src/remote/server/os/win32/window.cpp
@@ -33,7 +33,7 @@
 #include "../jrd/jrd_proto.h"
 #include "../../remote/server/os/win32/window_proto.h"
 #include "../../remote/server/os/win32/propty_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 
 #include "../../remote/server/os/win32/window.h"
 #include "../common/isc_proto.h"
diff --git a/src/utilities/cache.cpp b/src/utilities/cache.cpp
index b38bf5ebbe..3ebe276cb2 100644
--- a/src/utilities/cache.cpp
+++ b/src/utilities/cache.cpp
@@ -28,7 +28,7 @@
 #include <signal.h>
 #include "ibase.h"
 #include "../jrd/license.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../yvalve/why_proto.h"
 
 #ifdef HAVE_IO_H
diff --git a/src/utilities/drop.cpp b/src/utilities/drop.cpp
index 9be786a6d2..3b8fbc8435 100644
--- a/src/utilities/drop.cpp
+++ b/src/utilities/drop.cpp
@@ -38,7 +38,7 @@
 #include "../common/isc_s_proto.h"
 #include "../lock/lock_proto.h"
 #include "../jrd/license.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/isc_proto.h"
 #include "../common/config/config.h"
 
diff --git a/src/utilities/fbsvcmgr/fbsvcmgr.cpp b/src/utilities/fbsvcmgr/fbsvcmgr.cpp
index 8d5276c070..4632fea670 100644
--- a/src/utilities/fbsvcmgr/fbsvcmgr.cpp
+++ b/src/utilities/fbsvcmgr/fbsvcmgr.cpp
@@ -35,7 +35,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "ibase.h"
 #include "../common/classes/ClumpletWriter.h"
 #include "../common/classes/timestamp.h"
diff --git a/src/utilities/gsec/gsec.cpp b/src/utilities/gsec/gsec.cpp
index 807a0aad61..b6ba23f236 100644
--- a/src/utilities/gsec/gsec.cpp
+++ b/src/utilities/gsec/gsec.cpp
@@ -29,7 +29,7 @@
 #include <errno.h>
 #include <stdarg.h>
 #include "ibase.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/msg_encode.h"
 #include "../common/isc_f_proto.h"
 #include "../utilities/gsec/gsec.h"
diff --git a/src/utilities/gstat/dba.epp b/src/utilities/gstat/dba.epp
index c1bdaf1ca1..91418868ac 100644
--- a/src/utilities/gstat/dba.epp
+++ b/src/utilities/gstat/dba.epp
@@ -46,7 +46,7 @@
 #include "../common/gdsassert.h"
 #include "../utilities/gstat/ppg_proto.h"
 #include "../utilities/gstat/dbaswi.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/isc_f_proto.h"
 #include "../common/utils_proto.h"
 #include "../common/classes/ClumpletWriter.h"
diff --git a/src/utilities/gstat/ppg.cpp b/src/utilities/gstat/ppg.cpp
index 9d8805d533..a706c2015e 100644
--- a/src/utilities/gstat/ppg.cpp
+++ b/src/utilities/gstat/ppg.cpp
@@ -32,7 +32,7 @@
 #include "../jrd/ods.h"
 #include "../jrd/ods_proto.h"
 #include "../common/os/guid.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/classes/DbImplementation.h"
 
 #include "../utilities/gstat/ppg_proto.h"
diff --git a/src/utilities/guard/guard.cpp b/src/utilities/guard/guard.cpp
index cb7c698b00..f65a6167e8 100644
--- a/src/utilities/guard/guard.cpp
+++ b/src/utilities/guard/guard.cpp
@@ -51,7 +51,7 @@ int errno = -1;
 #include "../common/os/divorce.h"
 #include "../common/os/os_utils.h"
 #include "../common/isc_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/file_params.h"
 #include "../utilities/guard/util_proto.h"
 #include "../common/classes/fb_string.h"
diff --git a/src/utilities/guard/util.cpp b/src/utilities/guard/util.cpp
index cbe3f417c9..a083220ad3 100644
--- a/src/utilities/guard/util.cpp
+++ b/src/utilities/guard/util.cpp
@@ -57,7 +57,7 @@
 
 #include "../common/gdsassert.h"
 #include "../utilities/guard/util_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/isc_proto.h"
 #include "../common/utils_proto.h"
 #include "../common/os/os_utils.h"
diff --git a/src/utilities/ibmgr/srvrmgr.cpp b/src/utilities/ibmgr/srvrmgr.cpp
index b0cb7c0d32..6fda9e7979 100644
--- a/src/utilities/ibmgr/srvrmgr.cpp
+++ b/src/utilities/ibmgr/srvrmgr.cpp
@@ -37,7 +37,7 @@
 
 
 #include "ibase.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/gdsassert.h"
 #include "../jrd/svc_undoc.h"
 #include "../common/stuff.h"
diff --git a/src/utilities/nbackup/nbackup.cpp b/src/utilities/nbackup/nbackup.cpp
index 625c7f76cb..26a1542173 100644
--- a/src/utilities/nbackup/nbackup.cpp
+++ b/src/utilities/nbackup/nbackup.cpp
@@ -37,7 +37,7 @@
 
 #include "../common/db_alias.h"
 #include "../jrd/ods.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/os/path_utils.h"
 #include "../common/os/guid.h"
 #include "ibase.h"
diff --git a/src/utilities/print_event.cpp b/src/utilities/print_event.cpp
index 0e0a0cc9f0..d35a3d4317 100644
--- a/src/utilities/print_event.cpp
+++ b/src/utilities/print_event.cpp
@@ -25,7 +25,7 @@
 #include "fb_types.h"
 #include "../jrd/event.h"
 #include "../jrd/event_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/utils_proto.h"
 
 #define isc_print_status gds__print_status
diff --git a/src/utilities/rebuild/rebuild.cpp b/src/utilities/rebuild/rebuild.cpp
index bcabcbfcb9..df5d187708 100644
--- a/src/utilities/rebuild/rebuild.cpp
+++ b/src/utilities/rebuild/rebuild.cpp
@@ -37,7 +37,7 @@
 #include "../utilities/rebuild/rmet_proto.h"
 #include "../utilities/rebuild/rstor_proto.h"
 #include "../jrd/dmp_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/utils_proto.h
 
 #ifndef O_RDWR
diff --git a/src/utilities/rebuild/rmet.epp b/src/utilities/rebuild/rmet.epp
index 8bcf790f3f..91d2c2efdd 100644
--- a/src/utilities/rebuild/rmet.epp
+++ b/src/utilities/rebuild/rmet.epp
@@ -29,7 +29,7 @@
 #include "../utilities/rebuild/rebuild.h"
 #include "../utilities/rebuild/rebui_proto.h"
 #include "../utilities/rebuild/rmet_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 
 DATABASE DB = STATIC FILENAME "rebuild.fdb";
 
diff --git a/src/utilities/rebuild/rstore.epp b/src/utilities/rebuild/rstore.epp
index 15039e18c8..4d5dbadeb7 100644
--- a/src/utilities/rebuild/rstore.epp
+++ b/src/utilities/rebuild/rstore.epp
@@ -27,7 +27,7 @@
 #include "../utilities/rebuild/rebuild.h"
 #include "../utilities/rebuild/rebui_proto.h"
 #include "../utilities/rebuild/rstor_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 
 DATABASE DB = STATIC FILENAME "rebuild.fdb";
 
diff --git a/src/utilities/run_service.cpp b/src/utilities/run_service.cpp
index 02d959006a..b4a067eb7f 100644
--- a/src/utilities/run_service.cpp
+++ b/src/utilities/run_service.cpp
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "ibase.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 
 static const SCHAR recv_items[] = { isc_info_svc_to_eof };
 static const SCHAR send_timeout[] = { isc_info_svc_timeout, 1, 0, 30 };
diff --git a/src/yvalve/alt.cpp b/src/yvalve/alt.cpp
index 450aee1e57..2199c7dc11 100644
--- a/src/yvalve/alt.cpp
+++ b/src/yvalve/alt.cpp
@@ -37,7 +37,7 @@
 
 #include <stdarg.h>
 #include "ibase.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../yvalve/utl_proto.h"
 #include "../yvalve/why_proto.h"
 #include "../utilities/gsec/gsec.h"
diff --git a/src/yvalve/array.epp b/src/yvalve/array.epp
index 5bbdbed94a..449de9806a 100644
--- a/src/yvalve/array.epp
+++ b/src/yvalve/array.epp
@@ -37,7 +37,7 @@
 #include <stdarg.h>
 #include "ibase.h"
 #include "../yvalve/array_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../common/StatusArg.h"
 #include "../jrd/constants.h"
 #include "../common/utils_proto.h"
diff --git a/src/common/gds_proto.h b/src/yvalve/gds_proto.h
similarity index 100%
rename from src/common/gds_proto.h
rename to src/yvalve/gds_proto.h
diff --git a/src/yvalve/perf.cpp b/src/yvalve/perf.cpp
index bc079da441..55fc2deea8 100644
--- a/src/yvalve/perf.cpp
+++ b/src/yvalve/perf.cpp
@@ -32,7 +32,7 @@
 #include <limits.h>
 #include "ibase.h"
 #include "../yvalve/perf.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../yvalve/perf_proto.h"
 #include "../yvalve/utl_proto.h"
 #include "../yvalve/YObjects.h"
diff --git a/src/yvalve/preparse.cpp b/src/yvalve/preparse.cpp
index d812daefec..d300447686 100644
--- a/src/yvalve/preparse.cpp
+++ b/src/yvalve/preparse.cpp
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "../yvalve/prepa_proto.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../yvalve/YObjects.h"
 #include "../common/classes/ClumpletWriter.h"
 #include "../common/StatusArg.h"
diff --git a/src/yvalve/user_dsql.cpp b/src/yvalve/user_dsql.cpp
index 43659538fd..ff45209e75 100644
--- a/src/yvalve/user_dsql.cpp
+++ b/src/yvalve/user_dsql.cpp
@@ -38,7 +38,7 @@
 #include "firebird.h"
 #include "../dsql/chars.h"
 #include "firebird/impl/sqlda_pub.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../yvalve/why_proto.h"
 #include "../yvalve/user__proto.h"
 #include "../yvalve/utl_proto.h"
diff --git a/src/yvalve/utl.cpp b/src/yvalve/utl.cpp
index bba07e4ca7..c8947cbafc 100644
--- a/src/yvalve/utl.cpp
+++ b/src/yvalve/utl.cpp
@@ -51,7 +51,7 @@
 #include "ibase.h"
 #include "../yvalve/msg.h"
 #include "../jrd/event.h"
-#include "../common/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../yvalve/utl_proto.h"
 #include "../yvalve/YObjects.h"
 #include "../yvalve/why_proto.h"