diff --git a/src/jrd/extds/ExtDS.cpp b/src/jrd/extds/ExtDS.cpp
index 9716e8133a..473d9d582f 100644
--- a/src/jrd/extds/ExtDS.cpp
+++ b/src/jrd/extds/ExtDS.cpp
@@ -41,10 +41,7 @@
 #include "../evl_proto.h"
 #include "../intl_proto.h"
 #include "../mov_proto.h"
-#include "../common/isc_f_proto.h"
-#include "../common/db_alias.h"
-#include "../common/isc_proto.h"
-#include "../common/Auth.h"
+
 
 using namespace Jrd;
 using namespace Firebird;
diff --git a/src/jrd/extds/ExtDS.h b/src/jrd/extds/ExtDS.h
index 407e63ad8a..765929b14c 100644
--- a/src/jrd/extds/ExtDS.h
+++ b/src/jrd/extds/ExtDS.h
@@ -27,24 +27,14 @@
 #include "../../common/classes/array.h"
 #include "../../common/classes/ClumpletWriter.h"
 #include "../../common/classes/locks.h"
-#include "../../common/classes/init.h"
-#include "../../common/classes/NestConst.h"
 #include "../../common/utils_proto.h"
-#include "../../jrd/status.h"
 
-namespace Firebird
-{
-	class MetaName;
-}
 
 namespace Jrd
 {
 	class jrd_tra;
-	class jrd_req;
 	class thread_db;
 	class ValueListNode;
-	class Attachment;
-	class ValueExprNode;
 }
 
 namespace EDS {
diff --git a/src/jrd/extds/ValidatePassword.cpp b/src/jrd/extds/ValidatePassword.cpp
index 1c0ab068a8..d3089c10f3 100644
--- a/src/jrd/extds/ValidatePassword.cpp
+++ b/src/jrd/extds/ValidatePassword.cpp
@@ -21,25 +21,10 @@
  */
 
 #include "firebird.h"
-//#include "fb_types.h"
-//#include "../../include/fb_blk.h"
 #include "fb_exception.h"
 #include "iberror.h"
 
-/*#include "../../dsql/chars.h"
-#include "../../dsql/ExprNodes.h"
-#include "../common/dsc.h"
-#include "../exe.h"*/
-#include "ExtDS.h"
 #include "../jrd.h"
-/*#include "../tra.h"
-
-#include "../blb_proto.h"
-#include "../exe_proto.h"
-#include "../err_proto.h"
-#include "../evl_proto.h"
-#include "../intl_proto.h"
-#include "../mov_proto.h" */
 #include "../common/isc_f_proto.h"
 #include "../common/db_alias.h"
 #include "../common/isc_proto.h"
@@ -192,7 +177,7 @@ void validatePassword(thread_db* tdbb, const PathName& file, ClumpletWriter& dpb
 	// Build list of client/server plugins
 	RefPtr<Config> config;
 	PathName list;
-	expandDatabaseName(file, list /* usused value */, &config);
+	expandDatabaseName(file, list /* unused value */, &config);
 	PathName serverList = config->getPlugins(IPluginManager::TYPE_AUTH_SERVER);
 	PathName clientList = config->getPlugins(IPluginManager::TYPE_AUTH_CLIENT);
 	Auth::mergeLists(list, serverList, clientList);
diff --git a/src/jrd/extds/ValidatePassword.h b/src/jrd/extds/ValidatePassword.h
index b1523be775..e42f4a5dca 100644
--- a/src/jrd/extds/ValidatePassword.h
+++ b/src/jrd/extds/ValidatePassword.h
@@ -29,9 +29,7 @@
 
 namespace Jrd
 {
-	class jrd_tra;
 	class thread_db;
-	class ValueListNode;
 }
 
 namespace EDS {