diff --git a/src/include/recset.cpp b/src/include/recset.cpp
index c45672389..c3ac0b2a7 100755
--- a/src/include/recset.cpp
+++ b/src/include/recset.cpp
@@ -517,7 +517,8 @@ const TString & TRecordset::get_custom_query(const char * module, const char * q
     mod = mod.sleft(2);
 
   var << module << query_var;
-  const TString custom_query = ini_get_string(CONFIG_DITTA, mod, var);
+
+	const TString custom_query = ini_get_string(CONFIG_DITTA, mod, var);
 
   if (custom_query.full())
     query = custom_query;
diff --git a/src/include/recset.h b/src/include/recset.h
index a084913e2..f8d1f4022 100755
--- a/src/include/recset.h
+++ b/src/include/recset.h
@@ -13,10 +13,6 @@
 #include <variant.h>
 #endif
 
-#define FIELD_NAME(lf, name) TOSTRING(lf) "." name
-#define SUB_FIELD_NAME(lf, name, from, to ) TOSTRING(lf) "." name "[" TOSTRING(from) "," TOSTRING(to) "]"
-#define MAIN_SUB_FIELD_NAME(name, from, to )  name "[" TOSTRING(from) "," TOSTRING(to) "]"
-
 struct TRecordset_column_info : public TObject
 {
   TString _name;   // Table.Column
diff --git a/src/include/relation.h b/src/include/relation.h
index 1094cddb6..d88118d5e 100755
--- a/src/include/relation.h
+++ b/src/include/relation.h
@@ -13,6 +13,10 @@ class TSort;
 class TMask;
 #endif
 
+#define FIELD_NAME(lf, name) TOSTRING(lf) "." name
+#define SUB_FIELD_NAME(lf, name, from, to ) TOSTRING(lf) "." name "[" TOSTRING(from) "," TOSTRING(to) "]"
+#define MAIN_SUB_FIELD_NAME(name, from, to )  name "[" TOSTRING(from) "," TOSTRING(to) "]"
+
 // @doc EXTERNAL
 
 // @class TRelation | Classe per la definizione delle relazioni esistenti tra i file