diff --git a/www/admin/memcachestat.php b/www/admin/memcachestat.php
index 28daaa1db8e3cb6f2ac2690de0f27af5fdd295b4..0260049cb302431d8257fc1b2d7b10685e925eb7 100644
--- a/www/admin/memcachestat.php
+++ b/www/admin/memcachestat.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../_include.php');
+require_once('../_include.php');
 
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Configuration.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/MemcacheStore.php');
diff --git a/www/admin/metadata-converter.php b/www/admin/metadata-converter.php
index ff882012ec88ccc7eb5454f283b023b0bab1a9ef..cbda96fd6e628be046d008536c042036c88af79b 100644
--- a/www/admin/metadata-converter.php
+++ b/www/admin/metadata-converter.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../_include.php');
+require_once('../_include.php');
 
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Configuration.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Metadata/SAMLParser.php');
diff --git a/www/admin/metadata.php b/www/admin/metadata.php
index a1ec74fd98d5eff3216b01a6bfa081e26a53279d..671fa5ae61badf411e5c3aa1fa5fb792c49692e1 100644
--- a/www/admin/metadata.php
+++ b/www/admin/metadata.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../_include.php');
+require_once('../_include.php');
 
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/admin/phpinfo.php b/www/admin/phpinfo.php
index 622e8eb50469f7aa87f8a5a1e7f349aa766a1d54..c62d8a617eef045f680e8ca88ebd67e1ffb313b3 100644
--- a/www/admin/phpinfo.php
+++ b/www/admin/phpinfo.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../_include.php');
+require_once('../_include.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Configuration.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
diff --git a/www/admin/test.php b/www/admin/test.php
index 65348d7023de73337401abc189d2f0b846ae6bbd..2ec35b98c748470474f523cf5ea81ab903cd463d 100644
--- a/www/admin/test.php
+++ b/www/admin/test.php
@@ -28,7 +28,7 @@
  * This page will print out "OK" on success or "ERROR: <message>" on failure.
  */
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../_include.php');
+require_once('../_include.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Configuration.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
diff --git a/www/aselect/handler.php b/www/aselect/handler.php
index 06fc8f7eebbdb4b5499acefd44e5b1b322001f8a..c843fbac14c416ee185fd1b02ab0ae9a9940f02d 100644
--- a/www/aselect/handler.php
+++ b/www/aselect/handler.php
@@ -53,7 +53,7 @@
  * - dynamic bridging after IDP discovery across all protocols (core feature)
  */
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../www/_include.php');
+require_once('../../www/_include.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'xmlseclibs.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Logger.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Configuration.php');
diff --git a/www/auth/login-admin.php b/www/auth/login-admin.php
index 88471aa475992a325e818b6bc7f2e2bd689dbdf7..9fa3dce36bd9b8b8d05f38e2e4508412614907b0 100644
--- a/www/auth/login-admin.php
+++ b/www/auth/login-admin.php
@@ -1,7 +1,7 @@
 <?php
 
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../www/_include.php');
+require_once('../../www/_include.php');
 
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/auth/login-auto.php b/www/auth/login-auto.php
index 3255bd225084ad88534ba0ff104a73ed347baedd..212dee6af7d331dbd5b67ef981828be945f518eb 100644
--- a/www/auth/login-auto.php
+++ b/www/auth/login-auto.php
@@ -17,7 +17,7 @@
  * options.
  */
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../www/_include.php');
+require_once('../../www/_include.php');
 
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Configuration.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/auth/login-feide.php b/www/auth/login-feide.php
index b556fa8671a8c87f55a00d01cc95402715dff911..863539ca3be5f6dba94dc7271b746f4a4d0d7a0e 100644
--- a/www/auth/login-feide.php
+++ b/www/auth/login-feide.php
@@ -18,7 +18,7 @@
  */
 
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../www/_include.php');
+require_once('../../www/_include.php');
 
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/auth/login-ldapmulti.php b/www/auth/login-ldapmulti.php
index 65189cd2412d9000ff5a79af931396bcc149684c..a423c55b4cafc2833e377b20c8f5b85b733eea6a 100644
--- a/www/auth/login-ldapmulti.php
+++ b/www/auth/login-ldapmulti.php
@@ -1,7 +1,7 @@
 <?php
 
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../www/_include.php');
+require_once('../../www/_include.php');
 
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/auth/login-radius.php b/www/auth/login-radius.php
index f23b38d5d3dc37b787d56c31750397c373bbf34e..8d179f8bb6321186637bc4417bbbbad99245d6ac 100644
--- a/www/auth/login-radius.php
+++ b/www/auth/login-radius.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../www/_include.php');
+require_once('../../www/_include.php');
 
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/auth/login.php b/www/auth/login.php
index 69a50992e7e0157fc37a02774503285c359cb23c..c0e7790ac1049ab996c60ec5de044e298b8bb868 100644
--- a/www/auth/login.php
+++ b/www/auth/login.php
@@ -1,7 +1,7 @@
 <?php
 
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../www/_include.php');
+require_once('../../www/_include.php');
 
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/example-simple/hostnames.php b/www/example-simple/hostnames.php
index 5e4aaf3ed73aeafed183219df9dde7adc0675f55..55458ed23649fa0763515e78643344e92b8ce8ca 100644
--- a/www/example-simple/hostnames.php
+++ b/www/example-simple/hostnames.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../_include.php');
+require_once('../_include.php');
 
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/example-simple/saml2-example.php b/www/example-simple/saml2-example.php
index 52e27cbcfc1d224cfdc8e433784f8ec3a3330024..b2d032c029e1989eb28f8118c0e31de1a07057f0 100644
--- a/www/example-simple/saml2-example.php
+++ b/www/example-simple/saml2-example.php
@@ -4,7 +4,7 @@
  * The _include script sets simpleSAMLphp libraries in the PHP PATH, as well as 
  * initialize the simpleSAMLphp config class with the correct path.
  */
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../_include.php');
+require_once('../_include.php');
 
 /**
  * We need to load a few classes from simpleSAMLphp. These are available because
diff --git a/www/example-simple/shib13-example.php b/www/example-simple/shib13-example.php
index 30afd8a8e1473d7a0e8432dec12e0b063901e340..a87da040d420a03dfa3de0516fdf5e597d842ab1 100644
--- a/www/example-simple/shib13-example.php
+++ b/www/example-simple/shib13-example.php
@@ -4,7 +4,7 @@
  * The _include script sets simpleSAMLphp libraries in the PHP PATH, as well as 
  * initialize the simpleSAMLphp config class with the correct path.
  */
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../_include.php');
+require_once('../_include.php');
 
 /**
  * We need to load a few classes from simpleSAMLphp. These are available because
diff --git a/www/index.php b/www/index.php
index 731b242593978628f4a53fc512d3a314fef9c81d..52a6954e64b8b4968144a3f2e51ff13239eb6480 100644
--- a/www/index.php
+++ b/www/index.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '_include.php');
+require_once('_include.php');
 
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/noconsent.php b/www/noconsent.php
index a10cf3ff7d72251c2461f5b353dfd3bc04b9f8d8..a2337dbc9d97cc2f15b97914e7cd72934c30419a 100644
--- a/www/noconsent.php
+++ b/www/noconsent.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '_include.php');
+require_once('_include.php');
 
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/XHTML/Template.php');
 
diff --git a/www/openid/provider/server.php b/www/openid/provider/server.php
index 4bddef197bb3f043432c824b11bea0e5bf611b67..b3c563c71cde0ea3f663857b62b9be55857a7c70 100644
--- a/www/openid/provider/server.php
+++ b/www/openid/provider/server.php
@@ -4,7 +4,7 @@
 
 
 	
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../_include.php');
+require_once('../../_include.php');
 
 // Include simpleSAMLphp libraries
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
diff --git a/www/saml2/idp/SSOService.php b/www/saml2/idp/SSOService.php
index 3296d0f5286a13697d0f5046d85abe9f2172ca5f..24123aae675cf328ceb7437cf98c62fd5ab7c813 100644
--- a/www/saml2/idp/SSOService.php
+++ b/www/saml2/idp/SSOService.php
@@ -9,7 +9,7 @@
  * @version $Id$
  */
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../../www/_include.php');
+require_once('../../../www/_include.php');
 
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Consent/Consent.php');
diff --git a/www/saml2/idp/SingleLogoutService.php b/www/saml2/idp/SingleLogoutService.php
index ddf7a3d1b288a717618865d64ce3ea969f5d0e72..2a69cc5f9a6e901d2ad42d2b669171944f18d0a1 100644
--- a/www/saml2/idp/SingleLogoutService.php
+++ b/www/saml2/idp/SingleLogoutService.php
@@ -12,7 +12,7 @@
 // TODO: Show error message, when shibboleth sp is logged in.
 // TODO: Propagate HTTP-REDIRECT SLO on SAML 2.0 bridge.
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../../www/_include.php');
+require_once('../../../www/_include.php');
 
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/saml2/idp/initSLO.php b/www/saml2/idp/initSLO.php
index e3eec8d4b0aa75b228d2704e088eaf856cbef30c..95dbdc4d8137c6b4071bdf394b2a356a51f63165 100644
--- a/www/saml2/idp/initSLO.php
+++ b/www/saml2/idp/initSLO.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../../www/_include.php');
+require_once('../../../www/_include.php');
 
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/saml2/idp/metadata.php b/www/saml2/idp/metadata.php
index 4faaae62ead323b569bc4932853dfd48635ef40e..9fcda4e2d0a11e2de8b865495e9a72f243e98cb9 100644
--- a/www/saml2/idp/metadata.php
+++ b/www/saml2/idp/metadata.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../_include.php');
+require_once('../../_include.php');
 
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/saml2/sp/AssertionConsumerService.php b/www/saml2/sp/AssertionConsumerService.php
index 376f5b26a204e4a1ca025e4b692e576429dc454d..e4786e58af072cc43785b00ac0938f9c005fbe90 100644
--- a/www/saml2/sp/AssertionConsumerService.php
+++ b/www/saml2/sp/AssertionConsumerService.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../_include.php');
+require_once('../../_include.php');
 
 
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Configuration.php');
diff --git a/www/saml2/sp/SingleLogoutService.php b/www/saml2/sp/SingleLogoutService.php
index 647c890439dce46fcd8793c64175ab7c9e330082..a5b230b3e62b27b52b11f215f3f636e4a1430e67 100644
--- a/www/saml2/sp/SingleLogoutService.php
+++ b/www/saml2/sp/SingleLogoutService.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../_include.php');
+require_once('../../_include.php');
 
 
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
diff --git a/www/saml2/sp/idpdisco.php b/www/saml2/sp/idpdisco.php
index dd753c8794ea799c9fa7b4af0edddb1d746f41ce..c4f72506d365af078c012f8a4bea3495cbf65dc5 100644
--- a/www/saml2/sp/idpdisco.php
+++ b/www/saml2/sp/idpdisco.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../_include.php');
+require_once('../../_include.php');
 
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/saml2/sp/initSLO.php b/www/saml2/sp/initSLO.php
index cbbaa2874a61f3e7de1dbbf4d1cbd3e6e1e11822..fc72466284b6f76042cd3837293e9b607514727b 100644
--- a/www/saml2/sp/initSLO.php
+++ b/www/saml2/sp/initSLO.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../_include.php');
+require_once('../../_include.php');
 
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Configuration.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Logger.php');
diff --git a/www/saml2/sp/initSSO.php b/www/saml2/sp/initSSO.php
index 7219e4e1cef5e61d2bad55889553e2aac2025378..e2825be0698c9a6a8eb582ffa9c609473ba2fec6 100644
--- a/www/saml2/sp/initSSO.php
+++ b/www/saml2/sp/initSSO.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../_include.php');
+require_once('../../_include.php');
 
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/saml2/sp/metadata.php b/www/saml2/sp/metadata.php
index 0a793991337fdec4298c9b7c78cc31fec1a1573e..2efc97f73d52c2edeef2ccdf7baefc6d2c846ed3 100644
--- a/www/saml2/sp/metadata.php
+++ b/www/saml2/sp/metadata.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../_include.php');
+require_once('../../_include.php');
 
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/shib13/idp/SSOService.php b/www/shib13/idp/SSOService.php
index 9372e070aa99b5f3547f5f593001f703215f9d67..2eb81ecee3eb42f3108ce62003028af4f25b9cda 100644
--- a/www/shib13/idp/SSOService.php
+++ b/www/shib13/idp/SSOService.php
@@ -9,7 +9,7 @@
  * @version $Id$
  */
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../../www/_include.php');
+require_once('../../../www/_include.php');
 
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/shib13/idp/metadata.php b/www/shib13/idp/metadata.php
index 72cd4e995d2165af0cf0d9d5011ee3f33413cfc8..9c7cf1c2ba1533fdc75f5a0c5c3cb5c86c582178 100644
--- a/www/shib13/idp/metadata.php
+++ b/www/shib13/idp/metadata.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../_include.php');
+require_once('../../_include.php');
 
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/shib13/sp/AssertionConsumerService.php b/www/shib13/sp/AssertionConsumerService.php
index feb70c0bce099de9626cafca18bf4e311c4a62bc..c789efd18d6f609c628c29de8743dec8ed80fafa 100644
--- a/www/shib13/sp/AssertionConsumerService.php
+++ b/www/shib13/sp/AssertionConsumerService.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../_include.php');
+require_once('../../_include.php');
 
 
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Configuration.php');
diff --git a/www/shib13/sp/idpdisco.php b/www/shib13/sp/idpdisco.php
index 7c9a32fce431e459c56cc12f9361f4d1a055ca93..c30ee7c20fca96d1bb3cf00c513742560675dbfd 100644
--- a/www/shib13/sp/idpdisco.php
+++ b/www/shib13/sp/idpdisco.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../_include.php');
+require_once('../../_include.php');
 
 
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
diff --git a/www/shib13/sp/initSSO.php b/www/shib13/sp/initSSO.php
index 8ac65ece00fb64b5da41ac5e19e41a96ac814808..9b71e61ad781fb90068227ead97179b9202f6196 100644
--- a/www/shib13/sp/initSSO.php
+++ b/www/shib13/sp/initSSO.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../_include.php');
+require_once('../../_include.php');
 
 
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
diff --git a/www/shib13/sp/metadata.php b/www/shib13/sp/metadata.php
index 4810280aea769ffe8f3f3a468b8d677f1822c388..463a4d382ce5e2ba8562f0874174587bd24fac04 100644
--- a/www/shib13/sp/metadata.php
+++ b/www/shib13/sp/metadata.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../_include.php');
+require_once('../../_include.php');
 
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');