diff --git a/_compile.php b/_compile.php
index 6977f8ba..ce152f30 100644
--- a/_compile.php
+++ b/_compile.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__) . "/version.inc.php";
+include dirname(__FILE__) . "/include/version.inc.php";
 include dirname(__FILE__) . "/externals/jsmin-php/jsmin.php";
 
 function add_apo_slashes($s) {
@@ -52,7 +52,7 @@ function put_file($match) {
 		return "switch (\$LANG) {\n$return}\n";
 	}
 	$return = file_get_contents(dirname(__FILE__) . "/$match[3]");
-	if ($match[3] == "./lang.inc.php" && $_COOKIE["lang"] && (preg_match("~case '$_COOKIE[lang]': (.*) break;~", $return, $match2) || preg_match("~default: (.*)~", $return, $match2))) {
+	if ($match[3] == "./include/lang.inc.php" && $_COOKIE["lang"] && (preg_match("~case '$_COOKIE[lang]': (.*) break;~", $return, $match2) || preg_match("~default: (.*)~", $return, $match2))) {
 		return "$match[1]\nfunction lang(\$ar, \$number) {\n\t$match2[1]\n\treturn sprintf(\$ar[\$pos], \$number);\n}\n$match[4]";
 	}
 	$return = preg_replace("~\\?>\n?\$~", '', $return);
@@ -151,7 +151,7 @@ function php_shrink($input) {
 error_reporting(E_ALL & ~E_NOTICE);
 if ($_SERVER["argc"] > 1) {
 	$_COOKIE["lang"] = $_SERVER["argv"][1];
-	include dirname(__FILE__) . "/lang.inc.php";
+	include dirname(__FILE__) . "/include/lang.inc.php";
 	if ($_SERVER["argc"] != 2 || !isset($langs[$_COOKIE["lang"]])) {
 		echo "Usage: php _compile.php [lang]\nPurpose: Compile phpMinAdmin[-lang].php from index.php.\n";
 		exit(1);
diff --git a/auth.inc.php b/include/auth.inc.php
similarity index 100%
rename from auth.inc.php
rename to include/auth.inc.php
diff --git a/connect.inc.php b/include/connect.inc.php
similarity index 100%
rename from connect.inc.php
rename to include/connect.inc.php
diff --git a/design.inc.php b/include/design.inc.php
similarity index 100%
rename from design.inc.php
rename to include/design.inc.php
diff --git a/editing.inc.php b/include/editing.inc.php
similarity index 100%
rename from editing.inc.php
rename to include/editing.inc.php
diff --git a/export.inc.php b/include/export.inc.php
similarity index 100%
rename from export.inc.php
rename to include/export.inc.php
diff --git a/functions.inc.php b/include/functions.inc.php
similarity index 100%
rename from functions.inc.php
rename to include/functions.inc.php
diff --git a/lang.inc.php b/include/lang.inc.php
similarity index 100%
rename from lang.inc.php
rename to include/lang.inc.php
diff --git a/mysql.inc.php b/include/mysql.inc.php
similarity index 100%
rename from mysql.inc.php
rename to include/mysql.inc.php
diff --git a/pdo.inc.php b/include/pdo.inc.php
similarity index 100%
rename from pdo.inc.php
rename to include/pdo.inc.php
diff --git a/version.inc.php b/include/version.inc.php
similarity index 100%
rename from version.inc.php
rename to include/version.inc.php
diff --git a/index.php b/index.php
index 4b7e8464..1c71dcef 100644
--- a/index.php
+++ b/index.php
@@ -46,17 +46,17 @@ if (get_magic_quotes_gpc()) {
 set_magic_quotes_runtime(false);
 $SELF = preg_replace('~^[^?]*/([^?]*).*~', '\\1?', $_SERVER["REQUEST_URI"]) . (strlen($_GET["server"]) ? 'server=' . urlencode($_GET["server"]) . '&' : '') . (strlen($_GET["db"]) ? 'db=' . urlencode($_GET["db"]) . '&' : '');
 
-include "./version.inc.php";
-include "./functions.inc.php";
-include "./lang.inc.php";
+include "./include/version.inc.php";
+include "./include/functions.inc.php";
+include "./include/lang.inc.php";
 include "./lang/$LANG.inc.php";
-include "./pdo.inc.php";
-include "./mysql.inc.php";
-include "./design.inc.php";
-include "./auth.inc.php";
-include "./connect.inc.php";
-include "./editing.inc.php";
-include "./export.inc.php";
+include "./include/pdo.inc.php";
+include "./include/mysql.inc.php";
+include "./include/design.inc.php";
+include "./include/auth.inc.php";
+include "./include/connect.inc.php";
+include "./include/editing.inc.php";
+include "./include/export.inc.php";
 
 if (isset($_GET["download"])) {
 	include "./download.inc.php";