diff --git a/src/utilities/gsec/gsec.cpp b/src/utilities/gsec/gsec.cpp
index 490a6bf680..5a972f23e4 100644
--- a/src/utilities/gsec/gsec.cpp
+++ b/src/utilities/gsec/gsec.cpp
@@ -30,12 +30,12 @@
 #include <stdarg.h>
 #include "../jrd/common.h"
 #include "../jrd/ibase.h"
-#include "../jrd/gds_proto.h"
+#include "../yvalve/gds_proto.h"
 #include "../jrd/msg_encode.h"
-#include "../jrd/isc_f_proto.h"
+#include "../common/isc_f_proto.h"
 #include "../utilities/gsec/gsec.h"
 #include "../utilities/gsec/gsec_proto.h"
-#include "../jrd/jrd_pwd.h"
+#include "../auth/SecurityDatabase/jrd_pwd.h"
 #include "../jrd/license.h"
 #include "../jrd/constants.h"
 #include "../utilities/gsec/secur_proto.h"
@@ -43,7 +43,7 @@
 #include "../utilities/gsec/gsecswi.h"
 #include "../common/classes/ClumpletWriter.h"
 
-#include "../utilities/gsec/call_service.h"
+#include "../common/call_service.h"
 #include "../common/utils_proto.h"
 #include "../common/classes/MsgPrint.h"
 
diff --git a/src/utilities/gsec/gsec.h b/src/utilities/gsec/gsec.h
index 9276915e83..7851eab51c 100644
--- a/src/utilities/gsec/gsec.h
+++ b/src/utilities/gsec/gsec.h
@@ -24,8 +24,8 @@
 #ifndef UTILITIES_GSEC_H
 #define UTILITIES_GSEC_H
 
-#include "../jrd/ThreadData.h"
-#include "../jrd/jrd_pwd.h"
+#include "../common/ThreadData.h"
+#include "../auth/SecurityDatabase/jrd_pwd.h"
 #include "../jrd/constants.h"
 
 const USHORT GSEC_MSG_FAC	= 18;
diff --git a/src/utilities/gsec/gsec_proto.h b/src/utilities/gsec/gsec_proto.h
index 279d2c90db..e81ed1f58f 100644
--- a/src/utilities/gsec/gsec_proto.h
+++ b/src/utilities/gsec/gsec_proto.h
@@ -1,7 +1,7 @@
 #ifndef GSEC_PROTO_H
 #define GSEC_PROTO_H
 
-#include "../jrd/ThreadData.h"
+#include "../common/ThreadData.h"
 #include "../common/UtilSvc.h"
 
 // Output reporting utilities
diff --git a/src/utilities/gsec/security.cpp b/src/utilities/gsec/security.cpp
index 4d5f99eb26..b46f259178 100644
--- a/src/utilities/gsec/security.cpp
+++ b/src/utilities/gsec/security.cpp
@@ -30,11 +30,11 @@
 #include <ctype.h>
 #include "../jrd/common.h"
 #include "../jrd/ibase.h"
-#include "../jrd/jrd_pwd.h"
-#include "../jrd/enc_proto.h"
-#include "../jrd/gds_proto.h"
-#include "../jrd/isc_proto.h"
-#include "../jrd/os/mod_loader.h"
+#include "../auth/SecurityDatabase/jrd_pwd.h"
+#include "../common/enc_proto.h"
+#include "../yvalve/gds_proto.h"
+#include "../common/isc_proto.h"
+#include "../common/os/mod_loader.h"
 #include "../utilities/gsec/gsec.h"
 #include "../utilities/gsec/secur_proto.h"
 #include "../common/utils_proto.h"