diff --git a/include/assoc.cpp b/include/assoc.cpp
index b3356f053..88c8f4847 100755
--- a/include/assoc.cpp
+++ b/include/assoc.cpp
@@ -328,8 +328,7 @@ HIDDEN TAssoc_array * _new_assoc_array = NULL;
 
 // @doc INTERNAL
 
-// @mfunc funzione per duplicare il contenuto di un assoc_array
-//  
+// @func HIDDEN void | copia_elemento | Funzione per duplicare il contenuto di un assoc_array
 HIDDEN void copia_elemento(const TObject & o)
 
 { 
diff --git a/include/controls.cpp b/include/controls.cpp
index 54ce827f1..dc203268b 100755
--- a/include/controls.cpp
+++ b/include/controls.cpp
@@ -536,8 +536,6 @@ HIDDEN void xi_event_handler(XI_OBJ* itf, XI_EVENT* xiev)
 // TControl
 ///////////////////////////////////////////////////////////
 
-// @doc INTERNAL
-
 TControl::TControl()
         : _obj(NULL), _fld(NULL)
 {}
diff --git a/include/form.h b/include/form.h
index 8d3012d74..7aa005aef 100755
--- a/include/form.h
+++ b/include/form.h
@@ -693,7 +693,8 @@ public:
   { return _effective_height; }
   // @cmember Scrive la stringa <p s> alla posizione del TForm_item. Funzione che 
   //          per default non fa nulla. Ridefinita solo per TForm_number e TForm_string.
-  virtual void put_paragraph(const char* s) {};
+  virtual void put_paragraph(const char* s) 
+  {};
 
   // @cmember Ritorna se si tratta di una campo temporaneo (reference)
   virtual bool& temp() 
diff --git a/include/mask.h b/include/mask.h
index 4272cab0e..c666e0004 100755
--- a/include/mask.h
+++ b/include/mask.h
@@ -139,7 +139,7 @@ protected:
   // @cmember Ritorna il numero della pagina corrente
   int curr_page() const
   { return _page; }
-  // @cmember Costruttore (crea una maschera vuota\)
+  // @cmember Costruttore (crea una maschera vuota)
   TMask() { init_mask();}
 
   // @access Public Member
diff --git a/include/maskfld.cpp b/include/maskfld.cpp
index 47467a418..b8b338b98 100755
--- a/include/maskfld.cpp
+++ b/include/maskfld.cpp
@@ -23,8 +23,7 @@
 
 // @doc INTERNAL
 
-// @mfunc Elimina gli spazi iniziali e/o finali da un stringa
-
+// @func HIDDEN void | smart_trim | Elimina gli spazi iniziali e/o finali da un stringa
 HIDDEN void smart_trim(
             TString & s, // @parm Stringa
             byte mode    // @parm operazione da effettuare ( 0 = nessuna operazione
@@ -408,9 +407,6 @@ void TMask_field::set_dirty(bool d)
 
 
 
-// @doc EXTERNAL
-
-
 // Certified 100%
 const char* TMask_field::prompt() const
 {
@@ -1516,7 +1512,7 @@ TEditable_field& TBrowse_button::field(short id) const
 // TList_sheet
 ///////////////////////////////////////////////////////////
 
-// @doc EXTERNAL
+
 
 // Certified 100%
 TList_sheet::TList_sheet(TEdit_field* f, const char* caption, const char* head)
diff --git a/include/maskfld.h b/include/maskfld.h
index 89a09adab..cc15dcf1d 100755
--- a/include/maskfld.h
+++ b/include/maskfld.h
@@ -377,9 +377,6 @@ public:
 // @field void | TField_Flags() | Costruttore
 // @field char | update(const char*) | Aggiorna i bit della struttura secondo i valori letti da file
 
-// @doc EXTERNAL
-
-
 class TText_field : public TMask_field
 {
 protected:                 
@@ -442,7 +439,8 @@ public:
   virtual bool is_kind_of(word cid) const;
 
   // @cmember Esegue processo in background
-  virtual void on_idle() {}
+  virtual void on_idle() 
+  {}
 
   // @cmember Esegue il messaggio <p n>-esimo sul campo
   bool do_message(int n);
@@ -465,7 +463,8 @@ public:
   virtual void enable(bool on = TRUE);
   
   // @cmember Setta il valore del cambio nel campo
-  virtual void exchange(bool, const real&) { }
+  virtual void exchange(bool, const real&) 
+  { }
 
   TOperable_field(TMask* m);
   virtual ~TOperable_field();
@@ -665,7 +664,8 @@ public:
   TBoolean_field(TMask* mask);
   
   // @cmember Distruttore
-  virtual ~TBoolean_field() {}
+  virtual ~TBoolean_field() 
+  {}
 };
 
 
@@ -980,7 +980,6 @@ public:
 
   // @cmember Esegue il controllo
   virtual bool check(CheckTime = RUNNING_CHECK);
-  // @cmember Ritorna l'oggetto _browse
 
   // @cmember Ritorna l'oggetto _browse
   TBrowse* browse() const    
@@ -1066,7 +1065,8 @@ public:
   // @cmember Costruttore
   TReal_field(TMask* mask);
   // @cmember Distruttore
-  virtual ~TReal_field() { }
+  virtual ~TReal_field() 
+  { }
 };
 
 // @doc EXTERNAL
@@ -1111,9 +1111,9 @@ public:
   
   // @cmember Costruttore
   TDate_field(TMask* mask);
-  
   // @cmember Distruttore
-  virtual ~TDate_field() { }
+  virtual ~TDate_field() 
+  { }
 };
 
 
@@ -1243,8 +1243,7 @@ protected:
   virtual word class_id() const;
   // @cmember Crea il controllo
   virtual void create(WINDOW parent);
-  // @cmember Permette di abilitare/disabilitare il radio button (vedi <mf TMask_field::enable>)
-
+  
   // @cmember Setta la voce corrente      
   virtual void current(int n);
   // @cmember Ritorna la voce corrente
@@ -1289,9 +1288,9 @@ protected: // TEditable_field
   virtual bool on_key(KEY k);
   // @cmember Non fa' nulla
   virtual const char* reformat(const char* data) const;
-  // @cmember Trasforma i '\n' in '\r'
+  // @cmember Trasforma i '/n' in '/r'
   virtual const char* raw2win(const char* data) const;
-  // @cmember Trasforma i '\r' in '\n'
+  // @cmember Trasforma i '/r' in '/n'
   virtual const char* win2raw(const char* data) const;
 
   // @access Public Member
diff --git a/include/sheet.h b/include/sheet.h
index 96c53af1a..10896d6ce 100755
--- a/include/sheet.h
+++ b/include/sheet.h
@@ -95,9 +95,7 @@ public:
   long checked() const;
   
   // @cmember Costruttore
-  TSheet(short x, short y, short dx, short dy,
-         const char* title, const char* head, 
-         byte buttons = 0, short sht_y = 0);
+  TSheet(short x, short y, short dx, short dy, const char* title, const char* head, byte buttons = 0, short sht_y = 0);
 
   // @cmember Distruttore
   virtual ~TSheet();
@@ -134,8 +132,7 @@ protected:
   // @access Public Member
 public:
   // @cmember Costruttore
-  TArray_sheet(short x, short y, short dx, short dy, 
-               const char* caption, const char* head, byte buttons = 0);
+  TArray_sheet(short x, short y, short dx, short dy, const char* caption, const char* head, byte buttons = 0);
   // @cmember Ritorna il contenuto dello sheet
   TString_array& rows_array() 
   { return _data; }
@@ -194,9 +191,7 @@ public:
   const TArray& fields_array() const { return _fields; }
 
   // @cmember Costruttore
-  TCursor_sheet(TCursor* cursor, const char* fields, 
-                const char* title, const char* head, 
-                byte buttons = 0, short sht_y = 0);
+  TCursor_sheet(TCursor* cursor, const char* fields, const char* title, const char* head, byte buttons = 0, short sht_y = 0);
   // @cmember Distruttore
   virtual ~TCursor_sheet() 
   {}                     
@@ -236,9 +231,7 @@ protected:
   // @access Public Member
 public:
   // @cmember Costruttore
-  TBrowse_sheet(TCursor* cursor, const char* fields, const char* title, 
-                const char* head, byte buttons, 
-                TEdit_field* f, TToken_string& siblings);
+  TBrowse_sheet(TCursor* cursor, const char* fields, const char* title, const char* head, byte buttons, TEdit_field* f, TToken_string& siblings);
   // @cmember Distruttore
   virtual ~TBrowse_sheet()
   {}
diff --git a/include/text.h b/include/text.h
index 5f1910fdf..bbce14092 100755
--- a/include/text.h
+++ b/include/text.h
@@ -180,8 +180,7 @@ public:
   void destroy(); 
 
   // @cmember Cerca una stringa di testo all'interno di una riga
-  long search (const char* txt, int& pos, long from = 0, bool down = TRUE, 
-               bool casesens = FALSE, bool regexp = FALSE);
+  long search (const char* txt, int& pos, long from = 0, bool down = TRUE, bool casesens = FALSE, bool regexp = FALSE);
   // @cmember Sostituisce un testo all'interno di una riga
   int replace(long line, const char* txt, int pos = 0, int len = -1);
 
diff --git a/include/varmask.h b/include/varmask.h
index 73de572c8..51a4e6160 100755
--- a/include/varmask.h
+++ b/include/varmask.h
@@ -68,7 +68,8 @@ public:
   virtual TMask& sheet_mask() const;
 
   // @cmember Costruttore
-  TVariable_sheet_field(TMask* m) : TSheet_field(m) {}
+  TVariable_sheet_field(TMask* m) : TSheet_field(m) 
+  {}
   // @cmember Distruttore
   virtual ~TVariable_sheet_field();
 };
diff --git a/include/viswin.h b/include/viswin.h
index 7f3ca87cd..562858f3c 100755
--- a/include/viswin.h
+++ b/include/viswin.h
@@ -318,8 +318,7 @@ public:
   void add_line(const char* l);                                       
   
   // @cmember Funzione di ricerca non interattiva
-  long search (const char* txt,  int& pos, long from = 0, bool down = TRUE, 
-               bool casesens = FALSE, bool regx = FALSE);
+  long search (const char* txt,  int& pos, long from = 0, bool down = TRUE, bool casesens = FALSE, bool regx = FALSE);
   // @cmember Funzione di sostituzione di un testo all'interno di una riga non interattiva
   int replace(long line, const char* txt, int pos = 0, int len = -1);
 
diff --git a/include/window.h b/include/window.h
index dccedad77..e9a7c7d65 100755
--- a/include/window.h
+++ b/include/window.h
@@ -346,7 +346,8 @@ public:
   bool remove_menu(MENU_TAG id);
 
   // @cmember Chiamata ad ogni cambio ditta
-  virtual void on_firm_change() {}
+  virtual void on_firm_change() 
+  {}
 };
 
 // @doc INTERNAL
diff --git a/include/xvtility.cpp b/include/xvtility.cpp
index 27a513f3e..eb7221447 100755
--- a/include/xvtility.cpp
+++ b/include/xvtility.cpp
@@ -588,8 +588,6 @@ void dispatch_e_scroll(
 
 // @doc INTERNAL
 
-// @doc INTERNAL
-
 // @func Stabilisce i parametri standard dei controlli
 void customize_controls(
   bool on) // @parm Permette di inizializzare (TRUE) o scaricare (FALSE) i parametri
@@ -1046,7 +1044,7 @@ COLOR trans_color(
 }
 
 // @doc INTERNAL
-// @mfunc Cambia il cursore del mouse
+// @func HIDDEN void | set_cursor | Cambia il cursore del mouse
 HIDDEN void set_cursor(
      bool w) // @parm Indica il tipo di cursore da utilizzare:
              //