diff --git a/htdocs/admin/accounting.php b/htdocs/admin/accounting.php
index 0d4f6f7e966..655befa2b45 100644
--- a/htdocs/admin/accounting.php
+++ b/htdocs/admin/accounting.php
@@ -24,7 +24,7 @@
  *		\version    $Id$
  */
 
-require('./pre.inc.php');
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load('admin');
diff --git a/htdocs/admin/adherent.php b/htdocs/admin/adherent.php
index 385c6ced291..6276f43e5c0 100644
--- a/htdocs/admin/adherent.php
+++ b/htdocs/admin/adherent.php
@@ -27,7 +27,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");
diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index 6b9584eb8f0..95f97de400e 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -23,7 +23,7 @@
  *      \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php");
 
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index 8f685ab2494..7e77e042428 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -23,7 +23,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/agenda.lib.php');
 
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index 153819287ca..282bff48a83 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -24,7 +24,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/facture.class.php');
 
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index 871add6cfb5..81fe5689884 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -25,7 +25,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/includes/barcode/html.formbarcode.class.php");
 
diff --git a/htdocs/admin/bookmark.php b/htdocs/admin/bookmark.php
index b60b7626f15..84ee0e67bd7 100644
--- a/htdocs/admin/bookmark.php
+++ b/htdocs/admin/bookmark.php
@@ -23,7 +23,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");
diff --git a/htdocs/admin/boutique.php b/htdocs/admin/boutique.php
index 0e6ce1b1f1c..e3429ef55b0 100644
--- a/htdocs/admin/boutique.php
+++ b/htdocs/admin/boutique.php
@@ -22,13 +22,13 @@
  */
 
 /**
- \file 		htdocs/admin/boutique.php
- \ingroup    boutique
- \brief      Page d'administration/configuration du module OsCommerce
- \version    $Revision$
+ *  \file 		htdocs/admin/boutique.php
+ *  \ingroup    boutique
+ *  \brief      Page d'administration/configuration du module OsCommerce
+ *  \version    $Revision$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 850548e80c7..161b8ab98a2 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -18,12 +18,12 @@
  */
 
 /**
-        \file       htdocs/admin/boxes.php
-        \brief      Page d'administration/configuration des boites
-        \version    $Id$
-*/
+ *   \file       htdocs/admin/boxes.php
+ *   \brief      Page d'administration/configuration des boites
+ *   \version    $Id$
+ */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
 include_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
diff --git a/htdocs/admin/cashdesk.php b/htdocs/admin/cashdesk.php
index 8947059ce57..bf1b45845c4 100644
--- a/htdocs/admin/cashdesk.php
+++ b/htdocs/admin/cashdesk.php
@@ -23,7 +23,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formproduct.class.php");
 
diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index 956028459ac..ea5f471bef4 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -17,13 +17,14 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
  
-/**	    \file       htdocs/admin/clicktodial.php
-		\ingroup    clicktodial
-		\brief      Page d'administration/configuration du module clicktodial
-		\version    $Id$
-*/
+/**	
+ *   \file       htdocs/admin/clicktodial.php
+ *   \ingroup    clicktodial
+ *   \brief      Page d'administration/configuration du module clicktodial
+ *   \version    $Id$
+ */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 85a7e93ecb8..fdc7423cbb0 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -29,7 +29,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php');
 
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 25675c2d57c..07918b852c3 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -25,7 +25,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php");
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index 8ee489de7b6..685e8684327 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -25,7 +25,7 @@
  *	\version    $Id$
  */
 
-require('./pre.inc.php');
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load('admin');
diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php
index 993ada95a4e..958f5b01841 100644
--- a/htdocs/admin/confexped.php
+++ b/htdocs/admin/confexped.php
@@ -25,7 +25,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index 77c0eea6a94..559c5af27a9 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -25,7 +25,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 3334c349aa5..7ce513d7797 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -25,7 +25,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index dcef1a1122c..65c2cdc0d3f 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -27,7 +27,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formadmin.class.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formcompany.class.php");
 
diff --git a/htdocs/admin/dons.php b/htdocs/admin/dons.php
index beeb541ee1f..c71c18d88fb 100644
--- a/htdocs/admin/dons.php
+++ b/htdocs/admin/dons.php
@@ -22,7 +22,7 @@
  *		\brief      Page d'administration/configuration du module Dons
  *		\version    $Id$
  */
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/don.class.php");
 
diff --git a/htdocs/admin/droitpret.php b/htdocs/admin/droitpret.php
index 073dcdb7f3c..29f340a0cc1 100644
--- a/htdocs/admin/droitpret.php
+++ b/htdocs/admin/droitpret.php
@@ -24,7 +24,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php");
 
diff --git a/htdocs/admin/editeur.php b/htdocs/admin/editeur.php
index 751f1d13ba7..0f2e7d25ffa 100644
--- a/htdocs/admin/editeur.php
+++ b/htdocs/admin/editeur.php
@@ -25,7 +25,7 @@
  *  \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");
diff --git a/htdocs/admin/energie.php b/htdocs/admin/energie.php
index b0757c9a20a..b1ae29cc919 100644
--- a/htdocs/admin/energie.php
+++ b/htdocs/admin/energie.php
@@ -19,13 +19,14 @@
  * $Id$
  */
  
-/**	    \file       htdocs/admin/energie.php
-	    \ingroup    energie
-	    \brief      Page d'administration/configuration du module de gestion de l'energie
-	    \version    $Revision$
-*/
+/**	
+ *  \file       htdocs/admin/energie.php
+ *  \ingroup    energie
+ *  \brief      Page d'administration/configuration du module de gestion de l'energie
+ *  \version    $Revision$
+ */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");
diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index f643c0e061f..a350e0d97d7 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -23,7 +23,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php");
 
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index bb9e0175756..edc145d5f84 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -28,7 +28,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/expedition/expedition.class.php');
 
diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index f978d34f418..0f390977209 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -27,7 +27,7 @@
  *      \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 include_once(MAGPIERSS_PATH."rss_fetch.inc");
 
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index ff7fee2ba5c..e8b4b164cec 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -27,7 +27,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/facture.class.php');
 
diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index 514c75b0732..91b873a4bc2 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -20,13 +20,13 @@
  */
 
 /**
-	    \file       htdocs/admin/fckeditor.php
-		\ingroup    fckeditor
-		\brief      Page d'activation du module FCKeditor dans les autres modules
-		\version    $Revision$
-*/
+ *  \file       htdocs/admin/fckeditor.php
+ *  \ingroup    fckeditor
+ *  \brief      Page d'activation du module FCKeditor dans les autres modules
+ *  \version    $Revision$
+ */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 75b4893202a..cbe654ced24 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -28,7 +28,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/fichinter/fichinter.class.php');
 
diff --git a/htdocs/admin/fournisseur.php b/htdocs/admin/fournisseur.php
index 57177875ce7..03e91817526 100644
--- a/htdocs/admin/fournisseur.php
+++ b/htdocs/admin/fournisseur.php
@@ -21,13 +21,13 @@
  */
 
 /**
- \file       htdocs/admin/fournisseur.php
- \ingroup    fournisseur
- \brief      Page d'administration-configuration du module Fournisseur
- \version    $Id$
+ *  \file       htdocs/admin/fournisseur.php
+ *  \ingroup    fournisseur
+ *  \brief      Page d'administration-configuration du module Fournisseur
+ *  \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/fourn/fournisseur.class.php');
 require_once(DOL_DOCUMENT_ROOT.'/fourn/fournisseur.commande.class.php');
diff --git a/htdocs/admin/ftpclient.php b/htdocs/admin/ftpclient.php
index 6680759dab6..94bcb8eb544 100644
--- a/htdocs/admin/ftpclient.php
+++ b/htdocs/admin/ftpclient.php
@@ -23,7 +23,7 @@
  *       \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");
diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
index 21bd4f72bc8..1e372fea36a 100644
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
@@ -23,7 +23,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/dolgeoip.class.php");
 
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 6c2fbfd7783..8cf9889aa06 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -24,7 +24,7 @@
  *       \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
index 4b5a914998a..147b275f057 100644
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -23,7 +23,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 
 $langs->load("admin");
 $langs->load("companies");
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index 60db68c9aeb..1f11dab6f52 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -27,7 +27,7 @@
  *      \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index 03be6951ccc..e0b07cbb269 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -21,13 +21,13 @@
  */
 
 /**
-    	\file       htdocs/admin/ldap_contacts.php
-		\ingroup    ldap
-		\brief      Page d'administration/configuration du module Ldap
-		\version    $Id$
-*/
+ * 	\file       htdocs/admin/ldap_contacts.php
+ *  \ingroup    ldap
+ *  \brief      Page d'administration/configuration du module Ldap
+ *  \version    $Id$
+ */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index d3ef9c12a4f..e89992464b5 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -27,7 +27,7 @@
  *     	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/user.class.php");
 require_once(DOL_DOCUMENT_ROOT."/usergroup.class.php");
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index 32e42609a30..26c33077805 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -27,7 +27,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php");
 require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php");
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index 39cdfcb1187..613948cb111 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -27,7 +27,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/user.class.php");
 require_once(DOL_DOCUMENT_ROOT."/usergroup.class.php");
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index 363d4ac1df9..748a44459ce 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -23,7 +23,7 @@
  *       \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/price.lib.php");
 
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index cf6ccb6eaec..17e759b04d6 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -27,7 +27,7 @@
  *      \brief      Page d'administration/configuration du module Livraison
  *      \version    $Id$
  */
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/livraison/livraison.class.php");
 
diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index 850960d6e03..0156ca2e7d7 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -24,7 +24,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 2dac310d65c..70652b1d219 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -23,7 +23,7 @@
  *       \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("companies");
diff --git a/htdocs/admin/mantis.php b/htdocs/admin/mantis.php
index 51f5b9de61a..ae7b9466f0f 100644
--- a/htdocs/admin/mantis.php
+++ b/htdocs/admin/mantis.php
@@ -23,13 +23,13 @@
  */
 
 /**
-	    \file       htdocs/admin/mantis.php
-        \ingroup    mantis
-        \brief      Page de configuration du module mantis
-		\version    $Revision$
-*/
+ *   \file       htdocs/admin/mantis.php
+ *   \ingroup    mantis
+ *   \brief      Page de configuration du module mantis
+ *   \version    $Revision$
+ */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/mantis/mantis.class.php');
 
diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index efb36c74239..e3e69f07088 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -25,7 +25,7 @@
  *		\version	$Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formadmin.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index 48d194da798..f5e904599d7 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -24,7 +24,7 @@
  *		\version	$Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formadmin.class.php");
 require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php");
 
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index 9fd48a7e057..afc60a270a9 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -25,7 +25,7 @@
  *  \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formadmin.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/treeview.lib.php");
 
diff --git a/htdocs/admin/menus/pre.inc.php b/htdocs/admin/menus/pre.inc.php
deleted file mode 100644
index 7bf4c931e38..00000000000
--- a/htdocs/admin/menus/pre.inc.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005      Simon Tosser  <simon@kornog-computing.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-/**
-   \file       htdocs/admin/pre.inc.php
-   \brief      Fichier gestionnaire du menu de gauche de l'espace configuration
-   \version    $Id$
-*/
-
-$res=@include("../../main.inc.php");
-
-
-$langs->load("admin");
-
-
-function llxHeader($head = '', $title='', $help_url='')
-{
-	global $conf, $user, $langs;
-
-	top_menu($head, $title, '');
-
-	$menuarray=array();
-
-	//if ($conf->left_menu == 'rodolphe.php')
-	//{
-	$langs->load("admin");
-	$langs->load("users");
-	$menu = new Menu();
-	$menu->add(DOL_URL_ROOT."/admin/company.php", $langs->trans("MenuCompanySetup"));
-	$menu->add(DOL_URL_ROOT."/admin/modules.php", $langs->trans("Modules"));
-	$menu->add(DOL_URL_ROOT."/admin/menus.php", $langs->trans("Menus"));
-	$menu->add(DOL_URL_ROOT."/admin/ihm.php", $langs->trans("GUISetup"));
-	$menu->add(DOL_URL_ROOT."/admin/boxes.php", $langs->trans("Boxes"));
-	$menu->add(DOL_URL_ROOT."/admin/delais.php",$langs->trans("Alerts"));
-	$menu->add(DOL_URL_ROOT."/admin/perms.php", $langs->trans("Security"));
-	$menu->add(DOL_URL_ROOT."/admin/mails.php", $langs->trans("EMails"));
-	$menu->add(DOL_URL_ROOT."/admin/limits.php", $langs->trans("Limits"));
-	$menu->add(DOL_URL_ROOT."/user/home.php", $langs->trans("MenuUsersAndGroups"));
-	$menu->add(DOL_URL_ROOT."/admin/dict.php", $langs->trans("DictionnarySetup"));
-	$menu->add(DOL_URL_ROOT."/admin/const.php", $langs->trans("OtherSetup"));
-	$menu->add(DOL_URL_ROOT."/admin/system/", $langs->trans("System"));
-	$menu->add(DOL_URL_ROOT."/admin/tools/", $langs->trans("Tools"));
-	$varmenuarray=$menu->liste;
-	//}
-
-	left_menu($varmenuarray, $help_url);
-}
-
-?>
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 00e2b8817b8..b4ee0dc4d96 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -26,7 +26,7 @@
  *  \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("errors");
diff --git a/htdocs/admin/multicompany.php b/htdocs/admin/multicompany.php
index d0cb2a17bf0..24d732feb95 100644
--- a/htdocs/admin/multicompany.php
+++ b/htdocs/admin/multicompany.php
@@ -23,7 +23,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/multicompany/multicompany.class.php');
diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index 5a3d91d53ef..c0efb6470c3 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -24,7 +24,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");
diff --git a/htdocs/admin/numberwords.php b/htdocs/admin/numberwords.php
index 67946091ca5..1901477fac7 100644
--- a/htdocs/admin/numberwords.php
+++ b/htdocs/admin/numberwords.php
@@ -25,7 +25,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formadmin.class.php");
 
diff --git a/htdocs/admin/osc-languages.php b/htdocs/admin/osc-languages.php
index 83b97be7c4d..6f94b915e53 100644
--- a/htdocs/admin/osc-languages.php
+++ b/htdocs/admin/osc-languages.php
@@ -23,7 +23,7 @@
  * \version    	$Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 
 $langs->load("admin");
 
diff --git a/htdocs/admin/paybox.php b/htdocs/admin/paybox.php
index 012b7e02851..ce536ea8d20 100644
--- a/htdocs/admin/paybox.php
+++ b/htdocs/admin/paybox.php
@@ -23,7 +23,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $servicename='PayBox';
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index c8adb5a2277..ef10e02598b 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -25,7 +25,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");
diff --git a/htdocs/admin/phenix.php b/htdocs/admin/phenix.php
index ddf3f809833..3c20a4e2f49 100644
--- a/htdocs/admin/phenix.php
+++ b/htdocs/admin/phenix.php
@@ -18,13 +18,13 @@
  */
 
 /**
-	    \file       htdocs/admin/phenix.php
-        \ingroup    phenix
-        \brief      Page de configuration du module Phenix
-		\version    $Id$
-*/
+ *   \file       htdocs/admin/phenix.php
+ *   \ingroup    phenix
+ *   \brief      Page de configuration du module Phenix
+ *   \version    $Id$
+ */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/phenix/phenix.class.php');
 
diff --git a/htdocs/admin/pre.inc.php b/htdocs/admin/pre.inc.php
deleted file mode 100644
index 03ee8b778f2..00000000000
--- a/htdocs/admin/pre.inc.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005      Simon Tosser  <simon@kornog-computing.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-/**
-   \file       htdocs/admin/pre.inc.php
-   \brief      Fichier gestionnaire du menu de gauche de l'espace configuration
-   \version    $Id$
-*/
-
-$res=@include("../main.inc.php");
-if (! $res) include("../../../dolibarr/htdocs/main.inc.php");	// Used on dev env only
-
-
-$langs->load("admin");
-
-
-function llxHeader($head = '', $title='', $help_url='')
-{
-	global $conf, $user, $langs;
-
-	top_menu($head, $title, '');
-
-	$menuarray=array();
-
-	$langs->load("admin");
-	$langs->load("users");
-	$menu = new Menu();
-	$menu->add(DOL_URL_ROOT."/admin/company.php", $langs->trans("MenuCompanySetup"));
-	$menu->add(DOL_URL_ROOT."/admin/modules.php", $langs->trans("Modules"));
-	$menu->add(DOL_URL_ROOT."/admin/menus.php", $langs->trans("Menus"));
-	$menu->add(DOL_URL_ROOT."/admin/ihm.php", $langs->trans("GUISetup"));
-	$menu->add(DOL_URL_ROOT."/admin/boxes.php", $langs->trans("Boxes"));
-	$menu->add(DOL_URL_ROOT."/admin/delais.php",$langs->trans("Alerts"));
-	$menu->add(DOL_URL_ROOT."/admin/perms.php", $langs->trans("Security"));
-	$menu->add(DOL_URL_ROOT."/admin/mails.php", $langs->trans("EMails"));
-	$menu->add(DOL_URL_ROOT."/admin/limits.php", $langs->trans("Limits"));
-	$menu->add(DOL_URL_ROOT."/user/home.php", $langs->trans("MenuUsersAndGroups"));
-	$menu->add(DOL_URL_ROOT."/admin/dict.php", $langs->trans("DictionnarySetup"));
-	$menu->add(DOL_URL_ROOT."/admin/const.php", $langs->trans("OtherSetup"));
-	$menu->add(DOL_URL_ROOT."/admin/system/", $langs->trans("System"));
-	$menu->add(DOL_URL_ROOT."/admin/tools/", $langs->trans("Tools"));
-	$varmenuarray=$menu->liste;
-
-	left_menu($varmenuarray, $help_url);
-}
-
-?>
diff --git a/htdocs/admin/produit.php b/htdocs/admin/produit.php
index 294b68e1ef5..21f34479bd1 100644
--- a/htdocs/admin/produit.php
+++ b/htdocs/admin/produit.php
@@ -21,13 +21,13 @@
  */
 
 /**
- \file       htdocs/admin/produit.php
- \ingroup    produit
- \brief      Page d'administration/configuration du module Produit
- \version    $Id$
+ *  \file       htdocs/admin/produit.php
+ *  \ingroup    produit
+ *  \brief      Page d'administration/configuration du module Produit
+ *  \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/includes/barcode/html.formbarcode.class.php");
 
diff --git a/htdocs/admin/project.php b/htdocs/admin/project.php
index f5d01956de9..531c8d04e67 100644
--- a/htdocs/admin/project.php
+++ b/htdocs/admin/project.php
@@ -23,7 +23,7 @@
  *  \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/projet/project.class.php');
 require_once(DOL_DOCUMENT_ROOT.'/projet/tasks/task.class.php');
diff --git a/htdocs/admin/propale.php b/htdocs/admin/propale.php
index 4f13d9b20df..381f217871d 100644
--- a/htdocs/admin/propale.php
+++ b/htdocs/admin/propale.php
@@ -29,7 +29,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
 
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 5daad165fc9..fcaa4075e72 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -24,7 +24,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/security.lib.php');
 
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index 26aaf3fecbb..6c3df488abc 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -23,7 +23,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 
diff --git a/htdocs/admin/societe.php b/htdocs/admin/societe.php
index 9f9ae71a1f8..da27b2e40df 100644
--- a/htdocs/admin/societe.php
+++ b/htdocs/admin/societe.php
@@ -26,7 +26,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index d7d4819d566..3102f427fdc 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -24,7 +24,7 @@
  *	\brief      Page d'administration/configuration du module gestion de stock
  *	\version    $Id$
  */
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 1c9428223a4..e8a17e06b96 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -25,7 +25,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 if (!$user->admin)
diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php
index 7b53b5f25d0..1267d850a89 100644
--- a/htdocs/admin/system/constall.php
+++ b/htdocs/admin/system/constall.php
@@ -24,7 +24,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 
 $langs->load("admin");
 $langs->load("user");
diff --git a/htdocs/admin/system/database-tables-contraintes.php b/htdocs/admin/system/database-tables-contraintes.php
index 4d4b1d55a0e..3aeaf52f0ce 100644
--- a/htdocs/admin/system/database-tables-contraintes.php
+++ b/htdocs/admin/system/database-tables-contraintes.php
@@ -25,7 +25,7 @@
  *       \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 include_once $dolibarr_main_document_root."/lib/databases/".$conf->db->type.".lib.php";
 
 $langs->load("admin");
diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index 5b8b6511c4d..985b95a8481 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -25,7 +25,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 include_once $dolibarr_main_document_root."/lib/databases/".$conf->db->type.".lib.php";
 
 $langs->load("admin");
diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index 8f6a2fd0b6f..844eac0ab3f 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -25,7 +25,7 @@
  *   \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 include_once $dolibarr_main_document_root."/lib/databases/".$conf->db->type.".lib.php";
 
 $langs->load("admin");
diff --git a/htdocs/admin/system/dbtable.php b/htdocs/admin/system/dbtable.php
index ef0b89091f5..881d5fcd8e1 100644
--- a/htdocs/admin/system/dbtable.php
+++ b/htdocs/admin/system/dbtable.php
@@ -20,12 +20,12 @@
  */
 
 /**
- \file           htdocs/admin/system/dbtable.php
- \brief          Page d'info des contraintes d'une table
- \version        $Id$
+ *  \file           htdocs/admin/system/dbtable.php
+ *  \brief          Page d'info des contraintes d'une table
+ *  \version        $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 include_once $dolibarr_main_document_root."/lib/databases/".$conf->db->type.".lib.php";
 
 $langs->load("admin");
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index aae260da31a..28ac1274fe4 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -23,7 +23,7 @@
  *  \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/memory.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php");
 
diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php
index 6e18a676f42..de5427c60af 100644
--- a/htdocs/admin/system/index.php
+++ b/htdocs/admin/system/index.php
@@ -24,7 +24,7 @@
  *  \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 include_once(DOL_DOCUMENT_ROOT."/lib/databases/".$conf->db->type.".lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 
diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index 56e50b83905..1692ee8aa8b 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -23,7 +23,7 @@
  *  \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 
 $langs->load("admin");
 $langs->load("install");
diff --git a/htdocs/admin/system/os.php b/htdocs/admin/system/os.php
index 0c3c3d7ad6a..5ce4e9ff156 100644
--- a/htdocs/admin/system/os.php
+++ b/htdocs/admin/system/os.php
@@ -23,7 +23,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 
 $langs->load("admin");
diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index 6652e8d5af5..5c7f2e27fc3 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -23,7 +23,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 
 $langs->load("admin");
 
diff --git a/htdocs/admin/system/pre.inc.php b/htdocs/admin/system/pre.inc.php
deleted file mode 100644
index b333893577f..00000000000
--- a/htdocs/admin/system/pre.inc.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
- * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-/**
- *		\file 		htdocs/admin/system/pre.inc.php
- *		\brief      Fichier gestionnaire menu page infos syst�me
- *		\version    $Id$
- */
-
-require("../../main.inc.php");
-
-function llxHeader($head = "", $urlp = "")
-{
-    global $langs;
-
-    $langs->load("admin");
-
-
-	top_menu($head);
-
-    $menu = new Menu();
-
-    $menu->add(DOL_URL_ROOT."/admin/system/index.php", $langs->trans("Summary"));
-
-    // Dolibarr
-    $menu->add(DOL_URL_ROOT."/admin/system/dolibarr.php", "Dolibarr");
-    $menu->add(DOL_URL_ROOT."/admin/system/constall.php", $langs->trans("AllParameters"),1);
-	$menu->add(DOL_URL_ROOT."/admin/system/modules.php", $langs->trans("Modules"),1);
-    $menu->add(DOL_URL_ROOT."/admin/triggers.php", $langs->trans("Triggers"),1);
-    $menu->add(DOL_URL_ROOT."/about.php", $langs->trans("About"),1);
-
-    // OS
-    $menu->add(DOL_URL_ROOT."/admin/system/os.php", $langs->trans("OS"));
-
-    // Web server
-    $menu->add(DOL_URL_ROOT."/admin/system/web.php", $langs->trans("WebServer"));
-
-    // PHP
-    $menu->add(DOL_URL_ROOT."/admin/system/phpinfo.php", $langs->trans("Php"));
-
-    // XDebug
-    //$menu->add(DOL_URL_ROOT."/admin/system/xdebug.php", $langs->trans("XDebug"));
-
-    // Database
-    $menu->add(DOL_URL_ROOT."/admin/system/database.php", $langs->trans("Database"));
-    $menu->add(DOL_URL_ROOT."/admin/system/database-tables.php", $langs->trans("Tables"),1);
-    $menu->add(DOL_URL_ROOT."/admin/system/database-tables-contraintes.php", $langs->trans("Constraints"),1);
-
-    left_menu($menu->liste);
-}
-
-?>
diff --git a/htdocs/admin/system/web.php b/htdocs/admin/system/web.php
index 7687b4e67e1..cb6ba911dda 100644
--- a/htdocs/admin/system/web.php
+++ b/htdocs/admin/system/web.php
@@ -18,11 +18,11 @@
 
 /**
  *	    \file       htdocs/admin/system/web.php
- *		\brief      Page des infos syst�me du serveur Web
+ *		\brief      Page des infos systeme du serveur Web
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 
 $langs->load("admin");
 
diff --git a/htdocs/admin/system/xdebug.php b/htdocs/admin/system/xdebug.php
index a6cdd960e51..8ca508ff5b2 100644
--- a/htdocs/admin/system/xdebug.php
+++ b/htdocs/admin/system/xdebug.php
@@ -17,12 +17,12 @@
  */
 
 /**
-        \file       htdocs/admin/system/xdebug.php
-		\brief      Page administration XDebug
-		\version    $Id$
-*/
+ *     \file       htdocs/admin/system/xdebug.php
+ *     \brief      Page administration XDebug
+ *     \version    $Id$
+ */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 
 $langs->load("admin");
 
diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index addb47e6b2c..7b91d58f76b 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -19,13 +19,13 @@
  */
 
 /**
-	    \file       htdocs/admin/taxes.php
-        \ingroup    tax
-        \brief      Page de configuration du module tax
-		\version    $Id$
-*/
+ *     \file       htdocs/admin/taxes.php
+ *     \ingroup    tax
+ *     \brief      Page de configuration du module tax
+ *     \version    $Id$
+ */
 
-require('./pre.inc.php');
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load('admin');
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index b4a436ee1e7..01f4e7b0509 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -23,7 +23,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 include_once $dolibarr_main_document_root."/lib/databases/".$conf->db->type.".lib.php";
 
diff --git a/htdocs/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php
index 5b053494e83..b54c095e7dc 100644
--- a/htdocs/admin/tools/dolibarr_import.php
+++ b/htdocs/admin/tools/dolibarr_import.php
@@ -23,7 +23,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 
 $langs->load("admin");
 $langs->load("other");
diff --git a/htdocs/admin/tools/eaccelerator.php b/htdocs/admin/tools/eaccelerator.php
index aa7fc0fc954..5e57da5a39f 100644
--- a/htdocs/admin/tools/eaccelerator.php
+++ b/htdocs/admin/tools/eaccelerator.php
@@ -17,12 +17,12 @@
  */
 
 /**
-        \file       htdocs/admin/tools/eaccelerator.php
-		\brief      Page administration de eaccelerator
-		\version    $Id$
-*/
+ *     \file       htdocs/admin/tools/eaccelerator.php
+ *     \brief      Page administration de eaccelerator
+ *     \version    $Id$
+ */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 
 $langs->load("admin");
 
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index 696a28e2263..08f15e72add 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -22,7 +22,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 include_once $dolibarr_main_document_root."/lib/databases/".$conf->db->type.".lib.php";
diff --git a/htdocs/admin/tools/index.php b/htdocs/admin/tools/index.php
index 1d1e3733a4d..e9175fdf564 100644
--- a/htdocs/admin/tools/index.php
+++ b/htdocs/admin/tools/index.php
@@ -23,7 +23,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 
 $langs->load("admin");
 $langs->load("companies");
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index e2009dfce89..64188a417cf 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -24,7 +24,7 @@
  *      \version    $Id$
  */
 
-require_once("./pre.inc.php");
+require("../../main.inc.php");
 
 if (! $user->admin)
   accessforbidden();
diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php
index dd2d441028b..8e7b86ed21c 100644
--- a/htdocs/admin/tools/listsessions.php
+++ b/htdocs/admin/tools/listsessions.php
@@ -24,7 +24,7 @@
  *      \version    $Id$
  */
 
-require_once("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/admin.lib.php');
 
 if (! $user->admin)
diff --git a/htdocs/admin/tools/pre.inc.php b/htdocs/admin/tools/pre.inc.php
deleted file mode 100644
index 1198c014d1a..00000000000
--- a/htdocs/admin/tools/pre.inc.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/* Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-/**
-		\file 		htdocs/admin/tools/pre.inc.php
-		\brief      Fichier gestionnaire menu page outils
-		\version    $Id$
-*/
-
-require("../../main.inc.php");
-
-function llxHeader($head = '', $title='', $help_url='')
-{
-    global $langs;
-
-    $langs->load("admin");
-
-
-	top_menu($head);
-
-    $menu = new Menu();
-
-    $menu->add(DOL_URL_ROOT."/admin/tools/index.php", $langs->trans("SystemTools"));
-    $menu->add(DOL_URL_ROOT."/admin/tools/dolibarr_export.php", $langs->trans("Backup"),1);
-    $menu->add(DOL_URL_ROOT."/admin/tools/dolibarr_import.php", $langs->trans("Restore"),1);
-	$menu->add(DOL_URL_ROOT."/admin/tools/update.php", $langs->trans("MenuUpgrade"),1);
-	if (function_exists('eaccelerator_info')) $menu->add(DOL_URL_ROOT."/admin/tools/eaccelerator.php", $langs->trans("EAccelerator"),1);
-	$menu->add(DOL_URL_ROOT."/admin/tools/listevents.php", $langs->trans("Audit"),1);
-	$menu->add(DOL_URL_ROOT."/admin/tools/listsessions.php", $langs->trans("Sessions"),1);
-	$menu->add(DOL_URL_ROOT."/admin/tools/purge.php", $langs->trans("Purge"),1);
-	$menu->add(DOL_URL_ROOT."/support/index.php", $langs->trans("HelpCenter"),1,1,'targethelp');
-
-    left_menu($menu->liste, $help_url);
-}
-
-?>
diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php
index f73c2d00d11..c1c3d6345b8 100644
--- a/htdocs/admin/tools/purge.php
+++ b/htdocs/admin/tools/purge.php
@@ -22,7 +22,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 include_once(DOL_DOCUMENT_ROOT."/lib/databases/".$conf->db->type.".lib.php");
 include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
 
diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php
index 8d4f88418eb..1e1c6068781 100644
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -23,7 +23,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 include_once $dolibarr_main_document_root."/lib/databases/".$conf->db->type.".lib.php";
 
 $langs->load("admin");
diff --git a/htdocs/admin/triggers.php b/htdocs/admin/triggers.php
index 7d114a68965..89502da12db 100644
--- a/htdocs/admin/triggers.php
+++ b/htdocs/admin/triggers.php
@@ -22,7 +22,7 @@
  *       \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 include_once(DOL_DOCUMENT_ROOT ."/interfaces.class.php");
 
 if (!$user->admin)
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index 1f5738a16d7..74c4cc4fe92 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -27,7 +27,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");
diff --git a/htdocs/admin/webcalendar.php b/htdocs/admin/webcalendar.php
index dba39f15403..070f3a7ee57 100644
--- a/htdocs/admin/webcalendar.php
+++ b/htdocs/admin/webcalendar.php
@@ -21,13 +21,13 @@
  */
 
 /**
-	    \file       htdocs/admin/webcalendar.php
-        \ingroup    webcalendar
-        \brief      Page de configuration du module webcalendar
-		\version    $Id$
-*/
+ *    \file       htdocs/admin/webcalendar.php
+ *    \ingroup    webcalendar
+ *    \brief      Page de configuration du module webcalendar
+ *    \version    $Id$
+ */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/webcal/webcal.class.php');
 
diff --git a/htdocs/admin/webservices.php b/htdocs/admin/webservices.php
index 62053f821b3..8e36d78b45c 100644
--- a/htdocs/admin/webservices.php
+++ b/htdocs/admin/webservices.php
@@ -17,13 +17,14 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/**	    \file       htdocs/admin/webservices.php
+/**	    
+ *      \file       htdocs/admin/webservices.php
  *		\ingroup    webservices
  *		\brief      Page to setup webservices module
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");