diff --git a/setup/config.php b/setup/config.php
index e4917a561c..9e18436a48 100644
--- a/setup/config.php
+++ b/setup/config.php
@@ -41,6 +41,7 @@ if (Core::ifSetOr($_POST['submit_clear'], '')) {
     // Output generated config file
     //
     Core::downloadHeader('config.inc.php', 'text/plain');
+    $response->disable();
     echo ConfigGenerator::getConfigFile($GLOBALS['ConfigFile']);
     exit;
 } else {
diff --git a/setup/lib/common.inc.php b/setup/lib/common.inc.php
index fbd6649ec1..b754ae28cb 100644
--- a/setup/lib/common.inc.php
+++ b/setup/lib/common.inc.php
@@ -22,6 +22,8 @@ require_once './libraries/common.inc.php';
 require_once './libraries/config/config_functions.lib.php';
 require_once './libraries/config/messages.inc.php';
 require_once './libraries/user_preferences.lib.php';
+require_once './libraries/database_interface.inc.php';
+require_once './setup/lib/ConfigGenerator.php';
 
 // use default error handler
 restore_error_handler();