diff --git a/www/_include.php b/www/_include.php
index 3cbffa24a66efc3288587312206720f05666a395..cf3f991291bdcdad3a9c01d56886aff9b80534c6 100644
--- a/www/_include.php
+++ b/www/_include.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 // initialize the autoloader
 require_once(dirname(dirname(__FILE__)) . '/src/_autoload.php');
 
diff --git a/www/index.php b/www/index.php
index a01831ec12fd6e37e32ad5a880a897dd08205c44..74feb0689739ee962e0a43d00e5d8dfbbd976a9c 100644
--- a/www/index.php
+++ b/www/index.php
@@ -1,9 +1,13 @@
 <?php
 
+declare(strict_types=1);
+
+namespace SimpleSAML;
+
 require_once('_include.php');
 
-$config = \SimpleSAML\Configuration::getInstance();
-$httpUtils = new \SimpleSAML\Utils\HTTP();
+$config = Configuration::getInstance();
+$httpUtils = new Utils\HTTP();
 
-$redirect = $config->getOptionalString('frontpage.redirect', SimpleSAML\Module::getModuleURL('core/welcome'));
+$redirect = $config->getOptionalString('frontpage.redirect', Module::getModuleURL('core/welcome'));
 $httpUtils->redirectTrustedURL($redirect);
diff --git a/www/logout.php b/www/logout.php
index 5be736361740a34afe287d5575acaff1cb484b9a..a9fa178cb4bae5baf530b0d1a87a3fd5f05555c5 100644
--- a/www/logout.php
+++ b/www/logout.php
@@ -1,9 +1,17 @@
 <?php
 
+declare(strict_types=1);
+
+namespace SimpleSAML;
+
+use SimpleSAML\XHTML\Template;
+
+use function array_key_exists;
+
 require_once('_include.php');
 
-$config = \SimpleSAML\Configuration::getInstance();
-$httpUtils = new \SimpleSAML\Utils\HTTP();
+$config = Configuration::getInstance();
+$httpUtils = new Utils\HTTP();
 
 if (array_key_exists('link_href', $_REQUEST)) {
     $link = $httpUtils->checkURLAllowed($_REQUEST['link_href']);
@@ -17,8 +25,7 @@ if (array_key_exists('link_text', $_REQUEST)) {
     $text = '{logout:default_link_text}';
 }
 
-$t = new \SimpleSAML\XHTML\Template($config, 'logout.twig');
+$t = new Template($config, 'logout.twig');
 $t->data['link'] = $link;
 $t->data['text'] = $text;
 $t->send();
-exit();
diff --git a/www/module.php b/www/module.php
index ebdc6b19c4f4611070b66d43d6b79098ddb9aa35..f59c2f05fec356bf28e0e716a1e076fe56a16788 100644
--- a/www/module.php
+++ b/www/module.php
@@ -5,6 +5,10 @@
  * the process() handler in the Module class.
  */
 
+declare(strict_types=1);
+
+namespace SimpleSAML;
+
 require_once('_include.php');
 
-\SimpleSAML\Module::process()->send();
+Module::process()->send();