diff --git a/src/common/classes/MsgPrint.cpp b/src/common/classes/MsgPrint.cpp
index a98a6ab977..ccb81a8a44 100644
--- a/src/common/classes/MsgPrint.cpp
+++ b/src/common/classes/MsgPrint.cpp
@@ -28,12 +28,10 @@
 #include "../jrd/common.h"
 #include "BaseStream.h"
 #include "MsgPrint.h"
-#include "array.h"
 #include <string.h>
 #include "../jrd/gds_proto.h"
 #include "../common/utils_proto.h"
 #include "../jrd/file_params.h"
-#include "../jrd/msg_encode.h"
 
 
 namespace MsgFormat
diff --git a/src/common/classes/SafeArg.h b/src/common/classes/SafeArg.h
index 1db500478f..bffbc10baf 100644
--- a/src/common/classes/SafeArg.h
+++ b/src/common/classes/SafeArg.h
@@ -196,4 +196,3 @@ inline size_t SafeArg::getCount() const
 } // namespace
 
 #endif // FB_SAFEARG_H
-
diff --git a/src/jrd/met.epp b/src/jrd/met.epp
index c24111a5cf..70d22458a3 100644
--- a/src/jrd/met.epp
+++ b/src/jrd/met.epp
@@ -1172,9 +1172,9 @@ void MET_delete_shadow(thread_db* tdbb, USHORT shadow_number)
 }
 
 
-bool MET_dsql_cache_use(thread_db* tdbb, int type, const Firebird::MetaName& name, const Firebird::MetaName& package)
+bool MET_dsql_cache_use(thread_db* tdbb, int type, const MetaName& name, const MetaName& package)
 {
-	DSqlCacheItem* item = get_dsql_cache_item(tdbb, type, QualifiedName(package, name));
+	DSqlCacheItem* item = get_dsql_cache_item(tdbb, type, QualifiedName(name, package));
 
 	const bool obsolete = item->obsolete;
 
@@ -1191,10 +1191,9 @@ bool MET_dsql_cache_use(thread_db* tdbb, int type, const Firebird::MetaName& nam
 }
 
 
-void MET_dsql_cache_release(thread_db* tdbb, int type, const Firebird::MetaName& name,
-	const Firebird::MetaName& package)
+void MET_dsql_cache_release(thread_db* tdbb, int type, const MetaName& name, const MetaName& package)
 {
-	DSqlCacheItem* item = get_dsql_cache_item(tdbb, type, QualifiedName(package, name));
+	DSqlCacheItem* item = get_dsql_cache_item(tdbb, type, QualifiedName(name, package));
 
 	// release lock
 	LCK_release(tdbb, item->lock);