diff --git a/.jenkins/configuration/default-environment/unattended_install/unattended_install.php b/.jenkins/configuration/default-environment/unattended_install/unattended_install.php
index bbd92da5f..a69309364 100644
--- a/.jenkins/configuration/default-environment/unattended_install/unattended_install.php
+++ b/.jenkins/configuration/default-environment/unattended_install/unattended_install.php
@@ -20,7 +20,6 @@
 //this scrit will be run under the ./toolkit directory, relatively to the document root
 
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/utils.inc.php');
 require_once(APPROOT.'/application/clipage.class.inc.php');
 require_once(APPROOT.'/core/config.class.inc.php');
diff --git a/application/maintenancemsg.php b/application/maintenancemsg.php
index 08885d2d2..92b1fbc81 100644
--- a/application/maintenancemsg.php
+++ b/application/maintenancemsg.php
@@ -18,7 +18,6 @@
 function _MaintenanceSetupPageMessage($sTitle, $sMessage)
 {
 	// Web Page
-	@include_once(APPROOT.'bootstrap.inc.php');
 	@include_once(APPROOT.'setup/setuppage.class.inc.php');
 	if (class_exists('SetupPage'))
 	{
@@ -58,7 +57,6 @@ function _MaintenanceHtmlMessage($sMessage)
  */
 function _MaintenanceJsonMessage($sTitle, $sMessage)
 {
-	@include_once(APPROOT.'bootstrap.inc.php');
 	@include_once(APPROOT."/application/ajaxwebpage.class.inc.php");
 	if (class_exists('ajax_page'))
 	{
diff --git a/approot.inc.php b/approot.inc.php
index 45af5d77e..98bd2e537 100644
--- a/approot.inc.php
+++ b/approot.inc.php
@@ -15,6 +15,9 @@ else
 	$fItopStarted = 1000 * time();
 }
 
+require_once APPROOT.'bootstrap.inc.php';
+
+
 //
 // Maintenance mode
 //
diff --git a/bootstrap.inc.php b/bootstrap.inc.php
index 56d47adfb..9da290c25 100644
--- a/bootstrap.inc.php
+++ b/bootstrap.inc.php
@@ -18,7 +18,9 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
-require_once __DIR__.'/approot.inc.php';
-require_once APPROOT.'/lib/autoload.php';
 
-// Require here files containing PHP instructions
\ No newline at end of file
+if (! isset($GLOBALS['bBypassAutoload']) || $GLOBALS['bBypassAutoload'] == false)
+{
+	require_once APPROOT.'/lib/autoload.php';
+}
+
diff --git a/datamodels/2.x/itop-attachments/ajax.attachment.php b/datamodels/2.x/itop-attachments/ajax.attachment.php
index ab41f7c4d..cfcedd6c6 100755
--- a/datamodels/2.x/itop-attachments/ajax.attachment.php
+++ b/datamodels/2.x/itop-attachments/ajax.attachment.php
@@ -18,7 +18,6 @@
  */
 
 require_once('../../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/webpage.class.inc.php');
 require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');
diff --git a/datamodels/2.x/itop-backup/ajax.backup.php b/datamodels/2.x/itop-backup/ajax.backup.php
index e8b96e7e5..2d026d20c 100644
--- a/datamodels/2.x/itop-backup/ajax.backup.php
+++ b/datamodels/2.x/itop-backup/ajax.backup.php
@@ -19,7 +19,6 @@
 
 if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
 if (!defined('APPROOT')) require_once(__DIR__.'/../../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/webpage.class.inc.php');
 require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');
diff --git a/datamodels/2.x/itop-backup/backup.php b/datamodels/2.x/itop-backup/backup.php
index 884f9c01b..116f17564 100644
--- a/datamodels/2.x/itop-backup/backup.php
+++ b/datamodels/2.x/itop-backup/backup.php
@@ -29,7 +29,6 @@ if (!defined('APPROOT'))
 		require_once __DIR__.'/../../../approot.inc.php';   // When in datamodels/x.x folder
 	}
 }
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'application/application.inc.php');
 require_once(APPROOT.'application/webpage.class.inc.php');
 require_once(APPROOT.'application/csvpage.class.inc.php');
diff --git a/datamodels/2.x/itop-backup/check-backup.php b/datamodels/2.x/itop-backup/check-backup.php
index bf55efdea..a898e0bb2 100644
--- a/datamodels/2.x/itop-backup/check-backup.php
+++ b/datamodels/2.x/itop-backup/check-backup.php
@@ -35,7 +35,6 @@ else
 {
 	require_once __DIR__.'/../../../approot.inc.php';   // When in datamodels/x.x folder
 }
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'application/utils.inc.php');
 require_once(APPROOT.'application/startup.inc.php');
 
diff --git a/datamodels/2.x/itop-backup/status.php b/datamodels/2.x/itop-backup/status.php
index 9037fc641..b6ce74f76 100644
--- a/datamodels/2.x/itop-backup/status.php
+++ b/datamodels/2.x/itop-backup/status.php
@@ -19,7 +19,6 @@
 
 if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
 if (!defined('APPROOT')) require_once(__DIR__.'/../../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'application/application.inc.php');
 require_once(APPROOT.'application/itopwebpage.class.inc.php');
 
diff --git a/datamodels/2.x/itop-hub-connector/myextensions.php b/datamodels/2.x/itop-hub-connector/myextensions.php
index 5578d5a91..e57222dba 100644
--- a/datamodels/2.x/itop-hub-connector/myextensions.php
+++ b/datamodels/2.x/itop-hub-connector/myextensions.php
@@ -18,7 +18,6 @@
  */
 
 require_once ('../approot.inc.php');
-require_once (APPROOT.'/bootstrap.inc.php');
 require_once (APPROOT.'/application/application.inc.php');
 require_once (APPROOT.'/application/itopwebpage.class.inc.php');
 require_once (APPROOT.'setup/extensionsmap.class.inc.php');
diff --git a/datamodels/2.x/itop-portal-base/index.php b/datamodels/2.x/itop-portal-base/index.php
index 77ace9157..3a086d760 100644
--- a/datamodels/2.x/itop-portal-base/index.php
+++ b/datamodels/2.x/itop-portal-base/index.php
@@ -32,7 +32,6 @@ else
 {
 	require_once __DIR__.'/../../../approot.inc.php';   // When in datamodels/x.x folder
 }
-require_once APPROOT.'/bootstrap.inc.php';
 require_once APPROOT.'application/startup.inc.php';
 
 // Load frontal
diff --git a/datamodels/2.x/itop-portal-base/portal/config/bootstrap.php b/datamodels/2.x/itop-portal-base/portal/config/bootstrap.php
index 10d7beb5b..1c0b6bc89 100644
--- a/datamodels/2.x/itop-portal-base/portal/config/bootstrap.php
+++ b/datamodels/2.x/itop-portal-base/portal/config/bootstrap.php
@@ -38,7 +38,6 @@ if (!defined('MODULESROOT'))
 	{
 		require_once __DIR__.'/../../../../../approot.inc.php';   // When in datamodels/x.x folder
 	}
-	require_once APPROOT.'/bootstrap.inc.php';
 	require_once APPROOT.'/application/startup.inc.php';
 }
 
diff --git a/datamodels/2.x/itop-portal/index.php b/datamodels/2.x/itop-portal/index.php
index dd7786330..e6c39253d 100644
--- a/datamodels/2.x/itop-portal/index.php
+++ b/datamodels/2.x/itop-portal/index.php
@@ -46,7 +46,6 @@ else
 {
 	require_once __DIR__.'/../../../approot.inc.php';   // When in datamodels/x.x folder
 }
-require_once APPROOT.'/bootstrap.inc.php';
 require_once APPROOT.'application/startup.inc.php';
 
 // Protection against setup in the following configuration : ITIL Ticket with Enhanced Portal selected but neither UserRequest or Incident. Which would crash the portal.
diff --git a/pages/UI.php b/pages/UI.php
index 9a860184f..b0f807601 100644
--- a/pages/UI.php
+++ b/pages/UI.php
@@ -332,7 +332,6 @@ function DisplayNavigatorGroupTab($oP)
  *
  ***********************************************************************************/
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/itopwebpage.class.inc.php');
 require_once(APPROOT.'/application/wizardhelper.class.inc.php');
diff --git a/pages/UniversalSearch.php b/pages/UniversalSearch.php
index f584ca043..cfcacc935 100644
--- a/pages/UniversalSearch.php
+++ b/pages/UniversalSearch.php
@@ -18,7 +18,6 @@
  */
 
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/itopwebpage.class.inc.php');
 require_once(APPROOT.'/application/applicationcontext.class.inc.php');
diff --git a/pages/ajax.csvimport.php b/pages/ajax.csvimport.php
index 5d401c8c8..593da00ed 100644
--- a/pages/ajax.csvimport.php
+++ b/pages/ajax.csvimport.php
@@ -18,7 +18,6 @@
  */
 
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/webpage.class.inc.php');
 require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');
diff --git a/pages/ajax.document.php b/pages/ajax.document.php
index c4600d182..52796c4c6 100644
--- a/pages/ajax.document.php
+++ b/pages/ajax.document.php
@@ -18,7 +18,6 @@
  */
 
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'application/utils.inc.php');
 
 
diff --git a/pages/ajax.render.php b/pages/ajax.render.php
index 2f706a810..29bc5560c 100644
--- a/pages/ajax.render.php
+++ b/pages/ajax.render.php
@@ -18,7 +18,6 @@
  */
 
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'application/application.inc.php');
 require_once(APPROOT.'application/webpage.class.inc.php');
 require_once(APPROOT.'application/ajaxwebpage.class.inc.php');
diff --git a/pages/ajax.searchform.php b/pages/ajax.searchform.php
index 2593c9fbb..99cfeda1f 100644
--- a/pages/ajax.searchform.php
+++ b/pages/ajax.searchform.php
@@ -21,7 +21,6 @@ use Combodo\iTop\Application\Search\AjaxSearchException;
 use Combodo\iTop\Application\Search\CriterionParser;
 
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/webpage.class.inc.php');
 require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');
diff --git a/pages/audit.php b/pages/audit.php
index 864b06dda..306ba613f 100644
--- a/pages/audit.php
+++ b/pages/audit.php
@@ -159,7 +159,6 @@ function GetReportColor($iTotal, $iErrors)
 try
 {
 	require_once('../approot.inc.php');
-	require_once(APPROOT.'/bootstrap.inc.php');
 	require_once(APPROOT.'/application/application.inc.php');
 	require_once(APPROOT.'/application/itopwebpage.class.inc.php');
 	require_once(APPROOT.'/application/csvpage.class.inc.php');
diff --git a/pages/csvimport.php b/pages/csvimport.php
index c6b3c1015..2afabc5e7 100644
--- a/pages/csvimport.php
+++ b/pages/csvimport.php
@@ -21,7 +21,6 @@ try
 {
 	ini_set('memory_limit', '256M');
 	require_once('../approot.inc.php');
-	require_once(APPROOT.'/bootstrap.inc.php');
 	require_once(APPROOT.'/application/application.inc.php');
 	require_once(APPROOT.'/application/itopwebpage.class.inc.php');
 	require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');
diff --git a/pages/exec.php b/pages/exec.php
index e44cbd708..3db08bc6e 100644
--- a/pages/exec.php
+++ b/pages/exec.php
@@ -18,7 +18,6 @@
  */
 
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 
 // Needed to read the parameters (with sanitization)
 require_once(APPROOT.'application/utils.inc.php');
diff --git a/pages/graphviz.php b/pages/graphviz.php
index a2f9f875b..ace9e1f9f 100644
--- a/pages/graphviz.php
+++ b/pages/graphviz.php
@@ -18,7 +18,6 @@
  */
 
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/itopwebpage.class.inc.php');
 
diff --git a/pages/logoff.php b/pages/logoff.php
index 8ab6fa575..2cdded5ae 100644
--- a/pages/logoff.php
+++ b/pages/logoff.php
@@ -18,7 +18,6 @@
  */
 
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/itopwebpage.class.inc.php');
 require_once(APPROOT.'/application/wizardhelper.class.inc.php');
diff --git a/pages/navigator.php b/pages/navigator.php
index 621102c86..a20e753fe 100755
--- a/pages/navigator.php
+++ b/pages/navigator.php
@@ -22,7 +22,6 @@
  * Display the Flash navigator, in the whole pane
  */
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/itopwebpage.class.inc.php');
 
diff --git a/pages/notifications.php b/pages/notifications.php
index 6f7c67727..1629e93b6 100644
--- a/pages/notifications.php
+++ b/pages/notifications.php
@@ -18,7 +18,6 @@
  */
 
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/itopwebpage.class.inc.php');
 
diff --git a/pages/opensearch.xml.php b/pages/opensearch.xml.php
index 8b84bd568..81ea14e94 100644
--- a/pages/opensearch.xml.php
+++ b/pages/opensearch.xml.php
@@ -18,7 +18,6 @@
  */
 
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/startup.inc.php');
 
diff --git a/pages/preferences.php b/pages/preferences.php
index 2f86592fe..7b085a66c 100644
--- a/pages/preferences.php
+++ b/pages/preferences.php
@@ -18,7 +18,6 @@
  */
 
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/itopwebpage.class.inc.php');
 require_once(APPROOT.'/application/startup.inc.php');
diff --git a/pages/run_query.php b/pages/run_query.php
index c7f557598..0e111f2bc 100644
--- a/pages/run_query.php
+++ b/pages/run_query.php
@@ -18,7 +18,6 @@
  */
 
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/itopwebpage.class.inc.php');
 require_once(APPROOT.'/application/startup.inc.php');
diff --git a/pages/schema.php b/pages/schema.php
index 4f8c56a32..ef628795a 100644
--- a/pages/schema.php
+++ b/pages/schema.php
@@ -18,7 +18,6 @@
  */
 
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/itopwebpage.class.inc.php');
 
diff --git a/pages/tagadmin.php b/pages/tagadmin.php
index 005e82697..cecf2dcb0 100644
--- a/pages/tagadmin.php
+++ b/pages/tagadmin.php
@@ -18,7 +18,6 @@
  */
 
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'application/application.inc.php');
 require_once(APPROOT.'application/itopwebpage.class.inc.php');
 require_once(APPROOT.'application/startup.inc.php');
diff --git a/portal/index.php b/portal/index.php
index 701fa662b..7e2d048b1 100644
--- a/portal/index.php
+++ b/portal/index.php
@@ -19,7 +19,6 @@
  */
 
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 
 try
diff --git a/setup/ajax.dataloader.php b/setup/ajax.dataloader.php
index 8862d0302..9d1b01f08 100644
--- a/setup/ajax.dataloader.php
+++ b/setup/ajax.dataloader.php
@@ -35,7 +35,6 @@
  */ 
 define('SAFE_MINIMUM_MEMORY', 64*1024*1024);
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/utils.inc.php');
 require_once(APPROOT.'/setup/setuppage.class.inc.php');
 require_once(APPROOT.'/setup/moduleinstaller.class.inc.php');
diff --git a/setup/email.test.php b/setup/email.test.php
index 25c685f8f..dc7f22770 100644
--- a/setup/email.test.php
+++ b/setup/email.test.php
@@ -21,7 +21,6 @@
  * Wizard to configure and initialize the iTop application
  */
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/utils.inc.php');
 require_once(APPROOT.'/core/email.class.inc.php');
 require_once('./setuppage.class.inc.php');
diff --git a/setup/index.php b/setup/index.php
index 003f2d239..b309ce79d 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -19,7 +19,6 @@
 
 $bBypassMaintenance = true; // Reset maintenance mode in case of problem
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/utils.inc.php');
 require_once(APPROOT.'/core/config.class.inc.php');
 require_once(APPROOT.'/setup/setuppage.class.inc.php');
diff --git a/setup/phpinfo.php b/setup/phpinfo.php
index 4c3b90328..9a78e238d 100644
--- a/setup/phpinfo.php
+++ b/setup/phpinfo.php
@@ -18,7 +18,6 @@
  */
 
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 
 require_once(APPROOT.'/application/startup.inc.php');
 
diff --git a/sources/application/status/status.inc.php b/sources/application/status/status.inc.php
index 7b4efdbf8..08b34a58e 100644
--- a/sources/application/status/status.inc.php
+++ b/sources/application/status/status.inc.php
@@ -29,7 +29,6 @@ function StatusGetAppRoot($sAppRootFilename = 'approot.inc.php')
             throw new Exception($sAppRootFilename . ' is not readable');
         }
         @require_once($sAppRootFile);
-        @require_once(APPROOT.'bootstrap.inc.php');
 }
 
 /**
diff --git a/synchro/priv_sync_chunk.php b/synchro/priv_sync_chunk.php
index a47672bbe..2a91ce421 100644
--- a/synchro/priv_sync_chunk.php
+++ b/synchro/priv_sync_chunk.php
@@ -19,7 +19,6 @@
 
 if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
 require_once(__DIR__.'/../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/webpage.class.inc.php');
 require_once(APPROOT.'/application/csvpage.class.inc.php');
diff --git a/synchro/replica.php b/synchro/replica.php
index c2607c17f..bbfc50da9 100644
--- a/synchro/replica.php
+++ b/synchro/replica.php
@@ -18,7 +18,6 @@
  */
 
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/itopwebpage.class.inc.php');
 
diff --git a/synchro/synchro_exec.php b/synchro/synchro_exec.php
index 686c724a5..d212ca776 100644
--- a/synchro/synchro_exec.php
+++ b/synchro/synchro_exec.php
@@ -29,7 +29,6 @@
 
 if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
 require_once(__DIR__.'/../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/webpage.class.inc.php');
 require_once(APPROOT.'/application/csvpage.class.inc.php');
diff --git a/synchro/synchro_import.php b/synchro/synchro_import.php
index a4a1c54c1..b773677a6 100644
--- a/synchro/synchro_import.php
+++ b/synchro/synchro_import.php
@@ -28,7 +28,6 @@ if (!defined('__DIR__'))
 	define('__DIR__', dirname(__FILE__));
 }
 require_once __DIR__.'/../approot.inc.php';
-require_once APPROOT.'/bootstrap.inc.php';
 require_once APPROOT.'/application/application.inc.php';
 require_once APPROOT.'/application/webpage.class.inc.php';
 require_once APPROOT.'/application/csvpage.class.inc.php';
diff --git a/test/GroupByAndFunctions.php b/test/GroupByAndFunctions.php
index 287201022..ffb1c4862 100644
--- a/test/GroupByAndFunctions.php
+++ b/test/GroupByAndFunctions.php
@@ -18,7 +18,6 @@
  */
 
 require_once ('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'application/application.inc.php');
 require_once(APPROOT.'application/itopwebpage.class.inc.php');
 require_once(APPROOT.'application/startup.inc.php');
diff --git a/test/ItopTestCase.php b/test/ItopTestCase.php
index 638a6a64a..82adec874 100644
--- a/test/ItopTestCase.php
+++ b/test/ItopTestCase.php
@@ -44,7 +44,6 @@ class ItopTestCase extends TestCase
 		@include_once '../../../../../../approot.inc.php';
 		@include_once '../../../../../../../approot.inc.php';
 		@include_once '../../../../../../../../approot.inc.php';
-		@require_once APPROOT.'/bootstrap.inc.php';
 
         $this->debug("\n----------\n---------- ".$this->getName()."\n----------\n");
 
diff --git a/test/VerifyOQL.php b/test/VerifyOQL.php
index af0674453..e9da8e82c 100644
--- a/test/VerifyOQL.php
+++ b/test/VerifyOQL.php
@@ -24,7 +24,6 @@
  */
 
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/itopwebpage.class.inc.php');
 require_once(APPROOT.'/application/startup.inc.php');
diff --git a/test/benchmark.php b/test/benchmark.php
index 7031072b7..abe4d3aa3 100644
--- a/test/benchmark.php
+++ b/test/benchmark.php
@@ -18,7 +18,6 @@
  */
 
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/itopwebpage.class.inc.php');
 require_once(APPROOT.'/application/wizardhelper.class.inc.php');
diff --git a/test/build_test_oql.php b/test/build_test_oql.php
index ed0383f7a..417e2b9a5 100644
--- a/test/build_test_oql.php
+++ b/test/build_test_oql.php
@@ -23,7 +23,6 @@
 
 
 require_once('../approot.inc.php');
-require_once(APPROOT.'bootstrap.inc.php');
 require_once(APPROOT.'application/startup.inc.php');
 
 \LoginWebPage::DoLogin(true);
diff --git a/test/display_cache_content.php b/test/display_cache_content.php
index 10b59c950..6a22a85c6 100644
--- a/test/display_cache_content.php
+++ b/test/display_cache_content.php
@@ -22,7 +22,6 @@
  */
 
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'application/startup.inc.php');
 
 
diff --git a/test/replay_query_log.php b/test/replay_query_log.php
index 369c3a16f..4e9ba7847 100644
--- a/test/replay_query_log.php
+++ b/test/replay_query_log.php
@@ -204,7 +204,6 @@ class QueryLogEntry
 /////////////////////////////////////////////////////////////////////////////
 
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');
 
diff --git a/test/test.php b/test/test.php
index f73f85e2c..1db1c24e4 100644
--- a/test/test.php
+++ b/test/test.php
@@ -86,7 +86,6 @@ function DisplayEvents($aEvents, $sTitle)
 date_default_timezone_set('Europe/Paris');
 
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/utils.inc.php');
 require_once('./test.class.inc.php');
 require_once('./testlist.inc.php');
diff --git a/webservices/backoffice.dataloader.php b/webservices/backoffice.dataloader.php
index 99f6cb63a..fbce8d10e 100644
--- a/webservices/backoffice.dataloader.php
+++ b/webservices/backoffice.dataloader.php
@@ -25,7 +25,6 @@
 define('SAFE_MINIMUM_MEMORY', 256*1024*1024);
 
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 
 require_once(APPROOT.'/application/startup.inc.php');
diff --git a/webservices/createfrommail.php b/webservices/createfrommail.php
index 147265761..f33afa8d1 100644
--- a/webservices/createfrommail.php
+++ b/webservices/createfrommail.php
@@ -37,7 +37,6 @@ define('DEFAULT_WORKGROUP_ID', 5);
 
 if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
 require_once(__DIR__.'/../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/startup.inc.php');
 
diff --git a/webservices/cron.php b/webservices/cron.php
index 1c513b5da..dc4e866fc 100644
--- a/webservices/cron.php
+++ b/webservices/cron.php
@@ -19,7 +19,6 @@
 
 if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
 require_once(__DIR__.'/../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/nicewebpage.class.inc.php');
 require_once(APPROOT.'/application/webpage.class.inc.php');
diff --git a/webservices/export-v2.php b/webservices/export-v2.php
index 6e715c6a8..c83a27897 100644
--- a/webservices/export-v2.php
+++ b/webservices/export-v2.php
@@ -19,7 +19,6 @@
 
 if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
 require_once(__DIR__.'/../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/nicewebpage.class.inc.php');
 require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');
diff --git a/webservices/export.php b/webservices/export.php
index 3481307b3..9758425d0 100644
--- a/webservices/export.php
+++ b/webservices/export.php
@@ -19,7 +19,6 @@
 
 if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
 require_once(__DIR__.'/../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/nicewebpage.class.inc.php');
 require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');
diff --git a/webservices/import.php b/webservices/import.php
index 96611eb30..dc55a95df 100644
--- a/webservices/import.php
+++ b/webservices/import.php
@@ -29,7 +29,6 @@
 
 if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
 require_once(__DIR__.'/../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/webpage.class.inc.php');
 require_once(APPROOT.'/application/csvpage.class.inc.php');
diff --git a/webservices/itop.wsdl.php b/webservices/itop.wsdl.php
index 553a6d88f..3e70de456 100644
--- a/webservices/itop.wsdl.php
+++ b/webservices/itop.wsdl.php
@@ -38,7 +38,6 @@ else
 }
 
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'webservices/webservices.class.inc.php');
 require_once(APPROOT.'core/config.class.inc.php');
 require_once(APPROOT.'application/utils.inc.php');
diff --git a/webservices/rest.php b/webservices/rest.php
index ba6760034..5c020402b 100644
--- a/webservices/rest.php
+++ b/webservices/rest.php
@@ -19,7 +19,6 @@
 
 if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
 require_once(__DIR__.'/../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/loginwebpage.class.inc.php');
 require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');
diff --git a/webservices/soapserver.php b/webservices/soapserver.php
index fb2c783f6..ab500ad6a 100644
--- a/webservices/soapserver.php
+++ b/webservices/soapserver.php
@@ -21,7 +21,6 @@
 // in the error "looks like we got no XML document"...
 
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/startup.inc.php');