diff --git a/ab/ab0100.cpp b/ab/ab0100.cpp
index ea368ec3a..f3fc517d2 100755
--- a/ab/ab0100.cpp
+++ b/ab/ab0100.cpp
@@ -1,14 +1,10 @@
-#include <applicat.h>
+#include <modaut.h>
 #include <tabapp.h>  
-#include <strings.h>
-#include <stdtypes.h>
 #include <tabutil.h>
 #include <utility.h>                    
-#include <modaut.h>
-#include <prefix.h>
 
-#include "batbpdb.h"
-#include "batbarb.h"
+#include "abtbpdb.h"
+#include "abtbarb.h"
 
 class Tabanabil_application : public Tab_application
 {
diff --git a/ab/ab0200.cpp b/ab/ab0200.cpp
index 910eb619d..eaa092d40 100755
--- a/ab/ab0200.cpp
+++ b/ab/ab0200.cpp
@@ -1,13 +1,6 @@
-
-#include <applicat.h>  
 #include <modaut.h>
-#include <prefix.h>
 #include <recarray.h>
-#include <relapp.h>
 #include <tabapp.h>  
-#include <strings.h>
-#include <stdtypes.h>
-#include <tabutil.h>
 #include <utility.h> 
 
 #include "ab0200.h"
diff --git a/ab/ab0300.cpp b/ab/ab0300.cpp
index 5c306a427..30273d41f 100755
--- a/ab/ab0300.cpp
+++ b/ab/ab0300.cpp
@@ -1,10 +1,7 @@
 // Compatta Piano dei Conti Analisi di Bilancio
-
 #include <applicat.h>
 #include <isam.h>
-#include <mask.h>
-#include <utility.h>
-#include <config.h>
+
 #include "ab0.h"
 
 class TComp_abpcon : public TSkeleton_application
diff --git a/ab/ab0400.cpp b/ab/ab0400.cpp
index b8ca51071..d930cb151 100755
--- a/ab/ab0400.cpp
+++ b/ab/ab0400.cpp
@@ -1,22 +1,20 @@
-
-#include "abpcon.h"
 #include <automask.h>
-#include <applicat.h>
-#include <config.h>
-#include <clifo.h>
-#include <mask.h>
-#include <pconti.h>   
+#include <applicat.h> 
 #include <progind.h>
 #include <relation.h>
-#include <rmov.h>
-#include "saldi.h"
 #include <utility.h>
-#include "../cg/cglib01.h"
+
+#include <clifo.h>
+#include <pconti.h>
 #include "../cg/cglib02.h"
 
+#include "saldi.h"
+#include "abpcon.h"
+
 #include "ab0.h"
 #include "ab0400.h"
 
+
 ///////////////////////////////////////////////////////////
 // TRicl_mask
 ///////////////////////////////////////////////////////////
diff --git a/ab/bastarb.rep b/ab/abstarb.rep
similarity index 98%
rename from ab/bastarb.rep
rename to ab/abstarb.rep
index b63b4adc8..9d15b18b2 100755
--- a/ab/bastarb.rep
+++ b/ab/abstarb.rep
@@ -1,5 +1,5 @@
 
-<report name="bastarb" lpi="6">
+<report name="abstarb" lpi="6">
  <font face="Courier New" size="10" />
  <section keep_with_next="1" type="Head">
   <field type="Stringa" width="50">
diff --git a/ab/bastarb.uml b/ab/abstarb.uml
similarity index 81%
rename from ab/bastarb.uml
rename to ab/abstarb.uml
index 85f72854f..9c04f73fe 100755
--- a/ab/bastarb.uml
+++ b/ab/abstarb.uml
@@ -1,6 +1,10 @@
 #include "ab1200.h"
 
-PAGE "Stampa tabella archiviazione bilanci" -1 -1 50 8
+TOOLBAR "topbar" 0 0 0 2
+#include <printbar.h>
+ENDPAGE
+
+PAGE "Stampa tabella archiviazione bilanci" 0 2 0 0
 
 STRING F_INIZIO1 5
 BEGIN
@@ -31,15 +35,5 @@ BEGIN
   FLAGS "RU"
 END
 
-BUTTON DLG_OK 10 2
-BEGIN
-  PROMPT -12 -1 ""
-END
-
-BUTTON DLG_QUIT 10 2
-BEGIN
-  PROMPT -22 -1 ""
-END
-
 ENDPAGE
 ENDMASK
diff --git a/ab/bastntb.rep b/ab/abstntb.rep
similarity index 97%
rename from ab/bastntb.rep
rename to ab/abstntb.rep
index d77a490d8..646fc7616 100755
--- a/ab/bastntb.rep
+++ b/ab/abstntb.rep
@@ -1,5 +1,5 @@
 
-<report name="bastntb" lpi="6">
+<report name="abstntb" lpi="6">
  <font face="Courier New" size="10" />
  <section keep_with_next="1" type="Head">
   <field type="Testo" valign="center" align="center" width="96" height="2" text="Tabella Tipi di Bilancio">
diff --git a/ab/bastntb.uml b/ab/abstntb.uml
similarity index 79%
rename from ab/bastntb.uml
rename to ab/abstntb.uml
index 7934b4969..0414f7097 100755
--- a/ab/bastntb.uml
+++ b/ab/abstntb.uml
@@ -1,6 +1,10 @@
 #include "ab1200.h"
 
-PAGE "Stampa tabella tipi di bilancio" -1 -1 50 8
+TOOLBAR "topbar" 0 0 0 2
+#include <printbar.h>
+ENDPAGE
+
+PAGE "Stampa tabella tipi di bilancio" 0 2 0 0
 
 STRING F_INIZIO1 2
 BEGIN
@@ -29,15 +33,5 @@ BEGIN
   FLAGS "RU"
 END
 
-BUTTON DLG_OK 10 2
-BEGIN
-  PROMPT -12 -1 ""
-END
-
-BUTTON DLG_QUIT 10 2
-BEGIN
-  PROMPT -22 -1 ""
-END
-
 ENDPAGE
 ENDMASK
diff --git a/ab/bastpdb.rep b/ab/abstpdb.rep
similarity index 98%
rename from ab/bastpdb.rep
rename to ab/abstpdb.rep
index e82d025fa..dc784b635 100755
--- a/ab/bastpdb.rep
+++ b/ab/abstpdb.rep
@@ -1,5 +1,5 @@
 
-<report name="bastpdb" lpi="6">
+<report name="abstpdb" lpi="6">
  <font face="Courier New" size="10" />
  <section keep_with_next="1" type="Head">
   <field type="Testo" valign="center" align="center" width="96" height="2" text="Tabella Perodi di Bilancio">
diff --git a/ab/bastpdb.uml b/ab/abstpdb.uml
similarity index 76%
rename from ab/bastpdb.uml
rename to ab/abstpdb.uml
index 1d166bec2..817d5ba23 100755
--- a/ab/bastpdb.uml
+++ b/ab/abstpdb.uml
@@ -1,6 +1,10 @@
-#include "AB1200.h"
+#include "ab1200.h"
 
-PAGE "Stampa tabella tipi di bilancio" -1 -1 50 8
+TOOLBAR "topbar" 0 0 0 2
+#include <printbar.h>
+ENDPAGE
+
+PAGE "Stampa tabella tipi di bilancio" 0 2 0 0
 
 STRING F_INIZIO1 2
 BEGIN
@@ -29,15 +33,5 @@ BEGIN
   FLAGS "UZ"
 END
 
-BUTTON DLG_OK 10 2
-BEGIN
-  PROMPT -12 -1 ""
-END
-
-BUTTON DLG_QUIT 10 2
-BEGIN
-  PROMPT -22 -1 ""
-END
-
 ENDPAGE
 ENDMASK
diff --git a/ab/batbarb.h b/ab/abtbarb.h
similarity index 100%
rename from ab/batbarb.h
rename to ab/abtbarb.h
diff --git a/ab/batbarb.uml b/ab/abtbarb.uml
similarity index 95%
rename from ab/batbarb.uml
rename to ab/abtbarb.uml
index 240693256..9d825e856 100755
--- a/ab/batbarb.uml
+++ b/ab/abtbarb.uml
@@ -1,13 +1,10 @@
-#include "batbarb.h"
-
-TOOLBAR "" 0 19 0 2
-
-#include <toolbar.h>
+#include "abtbarb.h"
 
+TOOLBAR "" 0 0 0 2
+#include <relapbar.h>
 ENDPAGE
 
-PAGE "Tabella archiviazione bilanci" 0 -1 0 19
-
+PAGE "Tabella archiviazione bilanci" 0 2 0 0
 
 GROUPBOX DLG_NULL 74 12
 BEGIN
diff --git a/ab/batbntb.h b/ab/abtbntb.h
similarity index 100%
rename from ab/batbntb.h
rename to ab/abtbntb.h
diff --git a/ab/batbntb.uml b/ab/abtbntb.uml
similarity index 84%
rename from ab/batbntb.uml
rename to ab/abtbntb.uml
index 68624ed66..506f9b2b1 100755
--- a/ab/batbntb.uml
+++ b/ab/abtbntb.uml
@@ -1,13 +1,11 @@
-#include "batbntb.h"
+#include "abtbntb.h"
 
-TOOLBAR "" 0 19 0 2
-
-#include <toolbar.h>
-
-ENDPAGE              
+TOOLBAR "" 0 0 0 2
+#include <relapbar.h>
+ENDPAGE             
 
 
-PAGE "Tabella tipi di bilancio" 0 -1 0 19  
+PAGE "Tabella tipi di bilancio" 0 2 0 0
   
 GROUPBOX DLG_NULL 76 9
 BEGIN
diff --git a/ab/batbpdb.h b/ab/abtbpdb.h
similarity index 100%
rename from ab/batbpdb.h
rename to ab/abtbpdb.h
diff --git a/ab/batbpdb.uml b/ab/abtbpdb.uml
similarity index 96%
rename from ab/batbpdb.uml
rename to ab/abtbpdb.uml
index a441397f6..516520bbc 100755
--- a/ab/batbpdb.uml
+++ b/ab/abtbpdb.uml
@@ -1,10 +1,10 @@
-#include "batbpdb.h"
+#include "abtbpdb.h"
 
 TOOLBAR "" 0 0 0 2
 #include <relapbar.h>
 ENDPAGE
 
-PAGE "Tabella periodi di bilancio" 0 -1 0 19
+PAGE "Tabella periodi di bilancio" 0 2 0 0
 
 GROUPBOX DLG_NULL 76 6
 BEGIN