diff --git a/src/cg/cg6100.cpp b/src/cg/cg6100.cpp
index ab4701361..d9f8e0403 100755
--- a/src/cg/cg6100.cpp
+++ b/src/cg/cg6100.cpp
@@ -6,7 +6,7 @@
 #include <mailbox.h>
 #include <prefix.h>  
 
-#include "cglib04.h"
+#include "cglib.h"
 
 class TRic_auto : public TSkeleton_application
 {                                 
diff --git a/src/cg/cg6400.cpp b/src/cg/cg6400.cpp
index 45a82dfe2..b1f7c457f 100755
--- a/src/cg/cg6400.cpp
+++ b/src/cg/cg6400.cpp
@@ -11,7 +11,7 @@
 #include <nditte.h>
 
 #include "cg6400.h"
-#include "cglib04.h"
+#include "cglib.h"
 #include "cgsaldac.h"
 
 class TRic_archivi : public TSkeleton_application
diff --git a/src/cg/cg6500.cpp b/src/cg/cg6500.cpp
index 678ace3cd..0b4d692d2 100755
--- a/src/cg/cg6500.cpp
+++ b/src/cg/cg6500.cpp
@@ -4,7 +4,7 @@
 #include <nditte.h>
 
 #include "cgtbind.h"
-#include "cglib04.h"
+#include "cglib.h"
 
 class Tabinv_application : public Tab_application
 {
diff --git a/src/cg/cg6600.cpp b/src/cg/cg6600.cpp
index f230bc10c..55b5b88b6 100755
--- a/src/cg/cg6600.cpp
+++ b/src/cg/cg6600.cpp
@@ -1,7 +1,6 @@
 // Ricezione dati da sistema
 
-#include "cglib02.h"
-#include "cglib04.h"
+#include "cglib.h"
 #include "cgsaldac.h" 
 
 #include "cg6600.h"
diff --git a/src/cg/cg6700.cpp b/src/cg/cg6700.cpp
index 568d24837..a02251d7f 100755
--- a/src/cg/cg6700.cpp
+++ b/src/cg/cg6700.cpp
@@ -2,9 +2,7 @@
 // Ricezione dati: lista controllo movimenti
 //       
 
-#include "cglib01.h"
-#include "cglib03.h"
-#include "cglib04.h" 
+#include "cglib.h"
 #include "cg6700.h"
 
 #include <mask.h>
diff --git a/src/cg/cg6800.cpp b/src/cg/cg6800.cpp
index a63431666..531d70072 100755
--- a/src/cg/cg6800.cpp
+++ b/src/cg/cg6800.cpp
@@ -5,9 +5,7 @@
 // Scelta ditta per ricezione       --> cg6 -7 S
 // Annullo movimenti ricezione      --> cg6 -7 A
 
-#include "cglib04.h"
-#include "cglib03.h"
-#include "cglib01.h"   
+#include "cglib.h"   
 
 #include "cg6800.h"
 #include "cg6801.h"
diff --git a/src/cg/cg6801.cpp b/src/cg/cg6801.cpp
index c0a69137c..d18dd1d5f 100755
--- a/src/cg/cg6801.cpp
+++ b/src/cg/cg6801.cpp
@@ -1,4 +1,4 @@
-#include "cglib04.h"
+#include "cglib.h"
 #include "cg6801.h"
 
 bool TDitta_ric::create()
diff --git a/src/cg/cg6802.cpp b/src/cg/cg6802.cpp
index d5435fcc8..9f38a9dae 100755
--- a/src/cg/cg6802.cpp
+++ b/src/cg/cg6802.cpp
@@ -1,4 +1,4 @@
-#include "cglib04.h"
+#include "cglib.h"
 #include "cg6802.h"
 
 bool TAnn_mov::create()
diff --git a/src/cg/cg6803.cpp b/src/cg/cg6803.cpp
index 6086617e1..17c61ff98 100755
--- a/src/cg/cg6803.cpp
+++ b/src/cg/cg6803.cpp
@@ -1,4 +1,4 @@
-#include "cglib04.h"            
+#include "cglib.h"            
 #include "cg6803.h"
 
 HIDDEN TVis_ric& app() { return (TVis_ric &) main_app(); }
diff --git a/src/cg/cg6804.cpp b/src/cg/cg6804.cpp
index 62c3936b3..1a97ae3dc 100755
--- a/src/cg/cg6804.cpp
+++ b/src/cg/cg6804.cpp
@@ -1,4 +1,4 @@
-#include "cglib04.h"            
+#include "cglib.h"            
 #include "cg6804.h"  
 #include "cg6804a.h"
 
diff --git a/src/cg/cg6900.h b/src/cg/cg6900.h
index 3f489dc70..ac743f2fd 100755
--- a/src/cg/cg6900.h
+++ b/src/cg/cg6900.h
@@ -4,7 +4,7 @@
 #include <applicat.h>
 #include <mask.h>
 
-#include "cglib04.h"
+#include "cglib.h"
 
 class TInv_cont : public TSkeleton_application
 { 
diff --git a/src/cg/cg6901.cpp b/src/cg/cg6901.cpp
index 72d780171..a637bc62b 100755
--- a/src/cg/cg6901.cpp
+++ b/src/cg/cg6901.cpp
@@ -1,5 +1,5 @@
 #include "cg6901.h"
-#include "cglib04.h"
+#include "cglib.h"
 
 #include <mailbox.h>
 #include <printer.h>
diff --git a/src/cg/cg6902.cpp b/src/cg/cg6902.cpp
index b3ed7c941..4ca39ac57 100755
--- a/src/cg/cg6902.cpp
+++ b/src/cg/cg6902.cpp
@@ -1,8 +1,6 @@
 #include "cg6900.h"
 #include "cg6900a.h"
 
-#include "cglib03.h"
-
 #include <progind.h>
 #include <utility.h>
 
diff --git a/src/cg/cg6905.cpp b/src/cg/cg6905.cpp
index 57ca2d2f7..001ec1589 100755
--- a/src/cg/cg6905.cpp
+++ b/src/cg/cg6905.cpp
@@ -1,7 +1,7 @@
 #include <prefix.h>
 
 #include "cg6905.h"
-#include "cglib04.h"
+#include "cglib.h"
 
 void TCanc_file_invio::main_loop()
 { 
diff --git a/src/cg/cg7200.cpp b/src/cg/cg7200.cpp
index 4838fc00d..0b6e7d3e3 100755
--- a/src/cg/cg7200.cpp
+++ b/src/cg/cg7200.cpp
@@ -11,7 +11,7 @@
 #include <occas.h>
 #include <rmoviva.h>
 
-#include "cglib01.h"
+#include "cglib.h"
 #include "cg7200a.h"
 
 ///////////////////////////////////////////////////////////
diff --git a/src/cg/cg7600.cpp b/src/cg/cg7600.cpp
index 31b80b8f0..a9e65fcbd 100644
--- a/src/cg/cg7600.cpp
+++ b/src/cg/cg7600.cpp
@@ -3,7 +3,7 @@
 #include <tabutil.h>
 #include <utility.h>
 
-#include "cglib03.h"
+#include "cglib.h"
 #include "cg7401.h"
 #include "cgpim.h"
 #include "cg7400a.h"
@@ -22,7 +22,7 @@
 #define	REP_TERREM			10
 #define	REP_PAART17			11
 
-enum tipo_sospensione { nessuna, normale, vol_affari, liquidazione };
+enum tipo_sospensione { nessuna, sospenzione_normale, vol_affari, liquidazione };
 
 class TQuadro_VE_recordset : public TQuadro_IVA_recordset
 {
diff --git a/src/cg/cg7700.cpp b/src/cg/cg7700.cpp
index 1fddd02fb..950c60a3d 100644
--- a/src/cg/cg7700.cpp
+++ b/src/cg/cg7700.cpp
@@ -16,7 +16,7 @@
 #define	REP_SANMARINO			4
 #define	REP_RIPACQ				5
 
-enum tipo_sospensione { nessuna, normale, vol_affari, liquidazione };
+enum tipo_sospensione { nessuna, sospensione_normale, vol_affari, liquidazione };
 
 class TQuadro_VF_recordset : public TQuadro_IVA_recordset
 {
diff --git a/src/cg/cg7800.cpp b/src/cg/cg7800.cpp
index cbf66e0a0..0b3aa8770 100644
--- a/src/cg/cg7800.cpp
+++ b/src/cg/cg7800.cpp
@@ -11,7 +11,7 @@
 
 #define	REP_QUADRO			1
 
-enum tipo_sospensione { nessuna, normale, vol_affari, liquidazione };
+enum tipo_sospensione { nessuna, sospensione_normale, vol_affari, liquidazione };
 
 class TQuadro_VJ_recordset : public TQuadro_IVA_recordset
 {