diff --git a/Documentation.html b/Documentation.html
index 62469cc19..355491632 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -2292,9 +2292,9 @@ To create a new, empty mimetype please see libraries/transformations/template_ge
 <p>
     This seems to be a PWS bug. Filippo Simoncini found a workaround (at this
     time there is no better fix): remove or comment the <tt>DOCTYPE</tt>
-    declarations (2 lines) from the scripts <i>header.inc.php</i>,
-    <i>header_printview.inc.php</i>, <i>index.php</i>, <i>left.php</i> and
-    <i>libraries/common.lib.php</i>.
+    declarations (2 lines) from the scripts <i>libraries/header.inc.php</i>,
+    <i>libraries/header_printview.inc.php</i>, <i>index.php</i>,
+    <i>left.php</i> and <i>libraries/common.lib.php</i>.
 </p>
 
 <a name="faq1_7"></a>
@@ -4147,7 +4147,7 @@ RewriteRule ^([a-zA-Z0-9_]+)$ index.php?db=$1 [R]
 </p>
 <ul>
     <li>
-        All files include <i>header.inc.php</i> (layout),
+        All files include <i>libraries/header.inc.php</i> (layout),.
         <i>libraries/common.lib.php</i> (common functions) and
         <i>config.inc.php</i>.
         <br />
diff --git a/chk_rel.php b/chk_rel.php
index 2fde84e22..10fcdde47 100644
--- a/chk_rel.php
+++ b/chk_rel.php
@@ -20,5 +20,5 @@ $cfgRelation = PMA_getRelationsParam(TRUE);
 /**
  * Displays the footer
  */
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 ?>
diff --git a/db_create.php b/db_create.php
index af52d0adc..35a6de244 100644
--- a/db_create.php
+++ b/db_create.php
@@ -8,7 +8,7 @@
  */
 require_once('./libraries/common.lib.php');
 $js_to_run = 'functions.js';
-require_once('./header.inc.php');
+require_once('./libraries/header.inc.php');
 require_once('./libraries/mysql_charsets.lib.php');
 
 
diff --git a/db_datadict.php b/db_datadict.php
index b929e0cf3..37c54b8e4 100644
--- a/db_datadict.php
+++ b/db_datadict.php
@@ -8,7 +8,7 @@
 require_once('./libraries/common.lib.php');
 
 if (!isset($selected_tbl)) {
-    require_once('./header.inc.php');
+    require_once('./libraries/header.inc.php');
 }
 
 
@@ -295,5 +295,5 @@ function printPage()
 <?php
 echo '<br /><br /><input type="button" id="print" value="' . $strPrint . '" onclick="printPage()" />';
 
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 ?>
diff --git a/db_details.php b/db_details.php
index ad83a9656..28feab725 100644
--- a/db_details.php
+++ b/db_details.php
@@ -30,5 +30,5 @@ PMA_sqlQueryForm();
 /**
  * Displays the footer
  */
-require_once './footer.inc.php';
+require_once './libraries/footer.inc.php';
 ?>
diff --git a/db_details_export.php b/db_details_export.php
index 14ab1d531..8ceea1f3f 100644
--- a/db_details_export.php
+++ b/db_details_export.php
@@ -28,7 +28,7 @@ $export_page_title = $strViewDumpDB;
 // exit if no tables in db found
 if ( $num_tables < 1 ) {
     echo $strDatabaseNoTable;
-    require('./footer.inc.php');
+    require('./libraries/footer.inc.php');
     exit;
 } // end if
 
@@ -69,5 +69,5 @@ require_once('./libraries/display_export.lib.php');
 /**
  * Displays the footer
  */
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 ?>
diff --git a/db_details_importdocsql.php b/db_details_importdocsql.php
index 2bfe545c2..ee3beb8f7 100644
--- a/db_details_importdocsql.php
+++ b/db_details_importdocsql.php
@@ -14,7 +14,7 @@ require_once('./libraries/common.lib.php');
  * the headers
  */
 require_once('./libraries/read_dump.lib.php');
-require_once('./header.inc.php');
+require_once('./libraries/header.inc.php');
 
 // Check parameters
 PMA_checkParameters(array('db'));
@@ -291,6 +291,6 @@ if (isset($cfg['docSQLDir']) && !empty($cfg['docSQLDir'])) {
  * Displays the footer
  */
 echo "\n";
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 
 ?>
diff --git a/db_details_qbe.php b/db_details_qbe.php
index a53880c97..ff4ed541d 100644
--- a/db_details_qbe.php
+++ b/db_details_qbe.php
@@ -1065,5 +1065,5 @@ if (!empty($qry_orderby)) {
 /**
  * Displays the footer
  */
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 ?>
diff --git a/db_details_structure.php b/db_details_structure.php
index 7383797e5..061f09b30 100644
--- a/db_details_structure.php
+++ b/db_details_structure.php
@@ -36,7 +36,7 @@ if ( $num_tables == 0 ) {
     /**
      * Displays the footer
      */
-    require_once('./footer.inc.php');
+    require_once('./libraries/footer.inc.php');
     exit;
 }
 
@@ -473,5 +473,5 @@ if ( empty( $db_is_information_schema ) ) {
 /**
  * Displays the footer
  */
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 ?>
diff --git a/db_import.php b/db_import.php
index 64707085e..618d4862c 100644
--- a/db_import.php
+++ b/db_import.php
@@ -16,6 +16,6 @@ require('./libraries/display_import.lib.php');
 /**
  * Displays the footer
  */
-require('./footer.inc.php');
+require('./libraries/footer.inc.php');
 ?>
 
diff --git a/db_operations.php b/db_operations.php
index 2aa40a614..3bcb09d31 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -407,5 +407,5 @@ if (($cfgRelation['pdfwork'] && $num_tables > 0) ||
  * Displays the footer
  */
 echo "\n";
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 ?>
diff --git a/db_printview.php b/db_printview.php
index e7de94c71..c64bcb461 100644
--- a/db_printview.php
+++ b/db_printview.php
@@ -8,7 +8,7 @@ require_once('./libraries/common.lib.php');
  * Gets the variables sent or posted to this script, then displays headers
  */
 $print_view = TRUE;
-require_once('./header.inc.php');
+require_once('./libraries/header.inc.php');
 
 
 PMA_checkParameters(array('db'));
@@ -301,5 +301,5 @@ function printPage()
 <?php
 echo '<br /><br />&nbsp;<input type="button" class="print_ignore" style="width: 100px; height: 25px" id="print" value="' . $strPrint . '" onclick="printPage()" />' . "\n";
 
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 ?>
diff --git a/db_search.php b/db_search.php
index 88829ab89..39059a881 100644
--- a/db_search.php
+++ b/db_search.php
@@ -365,5 +365,5 @@ echo"\n";
  * Displays the footer
  */
 echo "\n";
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 ?>
diff --git a/export.php b/export.php
index ba42a172f..934a1f281 100644
--- a/export.php
+++ b/export.php
@@ -282,7 +282,7 @@ if ($save_on_server) {
     }
     if (isset($message)) {
         $js_to_run = 'functions.js';
-        require_once('./header.inc.php');
+        require_once('./libraries/header.inc.php');
         if ($export_type == 'server') {
             $active_page = 'server_export.php';
             require('./server_export.php');
@@ -325,7 +325,7 @@ if (!$save_on_server) {
     } else {
         // HTML
         $backup_cfgServer = $cfg['Server'];
-        require_once('./header.inc.php');
+        require_once('./libraries/header.inc.php');
         $cfg['Server'] = $backup_cfgServer;
         unset($backup_cfgServer);
         echo "\n" . '<div align="' . $cell_align_left . '">' . "\n";
@@ -346,7 +346,7 @@ if ($export_type == 'database') {
     if ($num_tables == 0) {
         $message = $strNoTablesFound;
         $js_to_run = 'functions.js';
-        require_once('./header.inc.php');
+        require_once('./libraries/header.inc.php');
         if ($export_type == 'server') {
             $active_page = 'server_export.php';
             require('./server_export.php');
@@ -487,7 +487,7 @@ if (!PMA_exportFooter()) break;
 
 if ($save_on_server && isset($message)) {
     $js_to_run = 'functions.js';
-    require_once('./header.inc.php');
+    require_once('./libraries/header.inc.php');
     if ($export_type == 'server') {
         $active_page = 'server_export.php';
         require('./server_export.php');
@@ -524,9 +524,9 @@ if (!empty($asfile)) {
         if (@function_exists('bzcompress')) {
             $dump_buffer = bzcompress($dump_buffer);
             if ($dump_buffer === -8) {
-                require_once('./header.inc.php');
+                require_once('./libraries/header.inc.php');
                 echo sprintf($strBzError, '<a href="http://bugs.php.net/bug.php?id=17300" target="_blank">17300</a>');
-                require_once('./footer.inc.php');
+                require_once('./libraries/footer.inc.php');
             }
         }
     }
@@ -549,7 +549,7 @@ if (!empty($asfile)) {
         }
 
         $js_to_run = 'functions.js';
-        require_once('./header.inc.php');
+        require_once('./libraries/header.inc.php');
         if ($export_type == 'server') {
             $active_page = 'server_export.php';
             require_once('./server_export.php');
@@ -598,6 +598,6 @@ else {
 //-->
 </script>
 <?php
-    require_once('./footer.inc.php');
+    require_once('./libraries/footer.inc.php');
 } // end if
 ?>
diff --git a/import.php b/import.php
index a173adb1e..7dfe56e24 100644
--- a/import.php
+++ b/import.php
@@ -38,10 +38,10 @@ if (!empty($sql_query)) {
 // If we didn't get any parameters, either user called this directly, or 
 // upload limit has been reached, let's assume the second possibility.
 if ($_POST == array() && $_GET == array()) {
-    require_once('./header.inc.php');
+    require_once('./libraries/header.inc.php');
     $show_error_header = TRUE;
     PMA_showMessage(sprintf($strUploadLimit, '[a@./Documentation.html#faq1_16@_blank]', '[/a]'));
-    require('./footer.inc.php');
+    require('./libraries/footer.inc.php');
 }
 
 // Check needed parameters
@@ -357,7 +357,7 @@ if ($timeout_passed) {
 }
 
 // Display back import page
-require_once('./header.inc.php');
+require_once('./libraries/header.inc.php');
 
 // There was an error?
 if (isset($my_die)) {
diff --git a/js/querywindow.js b/js/querywindow.js
index aa5667191..605acf69e 100644
--- a/js/querywindow.js
+++ b/js/querywindow.js
@@ -1,7 +1,7 @@
 var querywindow = '';
 
 /**
- * sets current selected server, table and db (called from footer.inc.php)
+ * sets current selected server, table and db (called from libraries/footer.inc.php)
  */
 function setDb( new_db ) {
     //alert('setDb(' + new_db + ')');
@@ -49,7 +49,7 @@ function refreshLeft() {
 }
 
 /**
- * sets current selected server, table and db (called from footer.inc.php)
+ * sets current selected server, table and db (called from libraries/footer.inc.php)
  */
 function setAll( new_lang, new_collation_connection, new_server, new_db, new_table ) {
     //alert('setAll( ' + new_lang + ', ' + new_collation_connection + ', ' + new_server + ', ' + new_db + ', ' + new_table + ' )');
diff --git a/left.php b/left.php
index 625b18350..d03f81192 100644
--- a/left.php
+++ b/left.php
@@ -49,7 +49,7 @@ $db_start = $db;
 
 
 // garvin: For re-usability, moved http-headers
-// to a seperate file. It can now be included by header.inc.php,
+// to a seperate file. It can now be included by libraries/header.inc.php,
 // querywindow.php.
 
 require_once('./libraries/header_http.inc.php');
diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php
index cacea3308..456e44dde 100644
--- a/libraries/auth/config.auth.lib.php
+++ b/libraries/auth/config.auth.lib.php
@@ -100,7 +100,7 @@ function PMA_auth_fails()
     echo "\n";
     $GLOBALS['is_header_sent'] = TRUE;
 
-    //TODO: I have included this div from header.inc.php to work around
+    //TODO: I have included this div from libraries/header.inc.php to work around
     //      an undefined variable in tooltip.js, when the server
     //      is not responding. Work has to be done to merge all code that
     //      starts the page (DOCTYPE and this div) to one place
@@ -129,7 +129,7 @@ function PMA_auth_fails()
     </tr>
 </table>
 <?php
-    require_once('./footer.inc.php');
+    require_once('./libraries/footer.inc.php');
     return TRUE;
 } // end of the 'PMA_auth_fails()' function
 
diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php
index 000c98101..3cad4cf2d 100644
--- a/libraries/charset_conversion.lib.php
+++ b/libraries/charset_conversion.lib.php
@@ -81,10 +81,10 @@ if (isset($cfg['AllowAnywhereRecoding'])
             $PMA_recoding_engine = PMA_CHARSET_NONE;
 
             if (!isset($GLOBALS['is_header_sent'])) {
-                include('./header.inc.php');
+                include('./libraries/header.inc.php');
             }
             echo $strCantUseRecodeIconv;
-            require_once('./footer.inc.php');
+            require_once('./libraries/footer.inc.php');
             exit();
         }
     } else if ($PMA_recoding_engine == 'recode') {
@@ -93,9 +93,9 @@ if (isset($cfg['AllowAnywhereRecoding'])
         } else {
             $PMA_recoding_engine = PMA_CHARSET_NONE;
 
-            require_once('./header.inc.php');
+            require_once('./libraries/header.inc.php');
             echo $strCantUseRecodeIconv;
-            require_once('./footer.inc.php');
+            require_once('./libraries/footer.inc.php');
             exit;
         }
     } else {
@@ -108,9 +108,9 @@ if (isset($cfg['AllowAnywhereRecoding'])
         } else {
             $PMA_recoding_engine = PMA_CHARSET_NONE;
 
-            require_once('./header.inc.php');
+            require_once('./libraries/header.inc.php');
             echo $strCantUseRecodeIconv;
-            require_once('./footer.inc.php');
+            require_once('./libraries/footer.inc.php');
             exit;
         }
     }
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index bbbbbc87c..8e773669d 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -640,7 +640,7 @@ if ( ! defined( 'PMA_MINIMUM_COMMON' ) ) {
     {
         global $cfg, $table, $db, $sql_query;
 
-        require_once('./header.inc.php');
+        require_once('./libraries/header.inc.php');
 
         if (!$error_message) {
             $error_message = PMA_DBI_getError();
@@ -772,7 +772,7 @@ if ( ! defined( 'PMA_MINIMUM_COMMON' ) ) {
         }
         echo '    </fieldset>' . "\n\n";
         if ($exit) {
-            require_once('./footer.inc.php');
+            require_once('./libraries/footer.inc.php');
         }
     } // end of the 'PMA_mysqlDie()' function
 
diff --git a/libraries/db_details_common.inc.php b/libraries/db_details_common.inc.php
index 4df8ed5ff..7e9f779c3 100644
--- a/libraries/db_details_common.inc.php
+++ b/libraries/db_details_common.inc.php
@@ -51,7 +51,7 @@ if (isset($submitcollation) && !empty($db_collation) && PMA_MYSQL_INT_VERSION >=
 }
 
 $js_to_run = 'functions.js';
-require_once('./header.inc.php');
+require_once('./libraries/header.inc.php');
 
 /**
  * Set parameters for links
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index b97949379..d7ef22acf 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -22,7 +22,7 @@ if (empty($import_list)) {
     $GLOBALS['show_error_header'] = TRUE;
     PMA_showMessage($strCanNotLoadImportPlugins);
     unset($GLOBALS['show_error_header']);
-    require('./footer.inc.php');
+    require('./libraries/footer.inc.php');
 }
 
 function PMA_getString($name) {
diff --git a/footer.inc.php b/libraries/footer.inc.php
similarity index 100%
rename from footer.inc.php
rename to libraries/footer.inc.php
diff --git a/header.inc.php b/libraries/header.inc.php
similarity index 100%
rename from header.inc.php
rename to libraries/header.inc.php
diff --git a/header_printview.inc.php b/libraries/header_printview.inc.php
similarity index 97%
rename from header_printview.inc.php
rename to libraries/header_printview.inc.php
index 0b60d54d6..82c8c5261 100644
--- a/header_printview.inc.php
+++ b/libraries/header_printview.inc.php
@@ -20,7 +20,7 @@ PMA_checkParameters(array('db', 'full_sql_query'));
 
 
 // garvin: For re-usability, moved http-headers
-// to a seperate file. It can now be included by header.inc.php,
+// to a seperate file. It can now be included by libraries/header.inc.php,
 // querywindow.php.
 
 require_once('./libraries/header_http.inc.php');
diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
index d0dda9641..780ded940 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -265,7 +265,7 @@ if ( !empty($submit_mult) && !empty($what)) {
     <input type="submit" name="mult_btn" value="<?php echo $strNo; ?>" id="buttonNo" />
 </fieldset>
     <?php
-    require_once('./footer.inc.php');
+    require_once('./libraries/footer.inc.php');
 } // end if
 
 
diff --git a/libraries/server_common.inc.php b/libraries/server_common.inc.php
index de4290d37..8366c8ccf 100644
--- a/libraries/server_common.inc.php
+++ b/libraries/server_common.inc.php
@@ -30,7 +30,7 @@ $err_url = 'main.php' . $url_query;
 /**
  * Displays the headers
  */
-require_once('./header.inc.php');
+require_once('./libraries/header.inc.php');
 
 /**
  * Checks for superuser privileges
diff --git a/libraries/tbl_properties_table_info.inc.php b/libraries/tbl_properties_table_info.inc.php
index 9585ee23e..7f2312387 100644
--- a/libraries/tbl_properties_table_info.inc.php
+++ b/libraries/tbl_properties_table_info.inc.php
@@ -12,7 +12,7 @@ PMA_checkParameters(array('db', 'table'));
 
 /**
  * Defining global variables, in case this script is included by a function.
- * This is necessary because this script can be included by header.inc.php.
+ * This is necessary because this script can be included by libraries/header.inc.php.
  */
 global $showtable, $tbl_is_view, $tbl_type, $show_comment, $tbl_collation,
        $table_info_num_rows, $auto_increment;
diff --git a/main.php b/main.php
index 4fb5d2135..b525bd19f 100644
--- a/main.php
+++ b/main.php
@@ -43,7 +43,7 @@ if (isset($table)) {
     unset($table);
 }
 $show_query = '1';
-require_once('./header.inc.php');
+require_once('./libraries/header.inc.php');
 
 
 /**
@@ -542,5 +542,5 @@ if (defined('PMA_MYSQL_INT_VERSION') && PMA_MYSQL_INT_VERSION < 32332) {
 /**
  * Displays the footer
  */
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 ?>
diff --git a/pdf_pages.php b/pdf_pages.php
index 3f725d6c3..d9b8814d8 100644
--- a/pdf_pages.php
+++ b/pdf_pages.php
@@ -31,13 +31,13 @@ $query_default_option = PMA_DBI_QUERY_STORE;
 if (!$cfgRelation['relwork']) {
     echo sprintf($strNotSet, 'relation', 'config.inc.php') . '<br />' . "\n"
          . '<a href="./Documentation.html#relation" target="documentation">' . $strDocu . '</a>' . "\n";
-    require_once('./footer.inc.php');
+    require_once('./libraries/footer.inc.php');
 }
 
 if (!$cfgRelation['displaywork']) {
     echo sprintf($strNotSet, 'table_info', 'config.inc.php') . '<br />' . "\n"
          . '<a href="./Documentation.html#table_info" target="documentation">' . $strDocu . '</a>' . "\n";
-    require_once('./footer.inc.php');
+    require_once('./libraries/footer.inc.php');
 }
 
 if (!isset($cfgRelation['table_coords'])){
@@ -532,5 +532,5 @@ ToggleDragDrop('pdflayout');
  * Displays the footer
  */
 echo "\n";
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 ?>
diff --git a/pdf_schema.php b/pdf_schema.php
index 09e78c21a..565f81ee1 100644
--- a/pdf_schema.php
+++ b/pdf_schema.php
@@ -275,7 +275,7 @@ class PMA_PDF extends PMA_FPDF
         global $server, $lang, $convcharset, $db;
         global $charset, $text_dir, $strRunning, $strDatabase;
 
-        require_once('./header.inc.php');
+        require_once('./libraries/header.inc.php');
 
         echo '<p><b>PDF - '. $GLOBALS['strError'] . '</b></p>' . "\n";
         if (!empty($error_message)) {
@@ -289,7 +289,7 @@ class PMA_PDF extends PMA_FPDF
              . '">' . $GLOBALS['strBack'] . '</a>';
         echo "\n";
 
-        require_once('./footer.inc.php');
+        require_once('./libraries/footer.inc.php');
     } // end of the "PMA_PDF_die()" function 
 
 
diff --git a/querywindow.php b/querywindow.php
index 2f02ed8f1..a5d58138b 100644
--- a/querywindow.php
+++ b/querywindow.php
@@ -45,7 +45,7 @@ if ($server > 0) {
 }
 
 // garvin: For re-usability, moved http-headers and stylesheets
-// to a seperate file. It can now be included by header.inc.php,
+// to a seperate file. It can now be included by libraries/header.inc.php,
 // querywindow.php.
 
 require_once('./libraries/header_http.inc.php');
diff --git a/server_binlog.php b/server_binlog.php
index 2657e0304..8b856ad71 100644
--- a/server_binlog.php
+++ b/server_binlog.php
@@ -105,6 +105,6 @@ foreach ($serverProcesses as $value) {
 /**
  * Sends the footer
  */
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 
 ?>
diff --git a/server_collations.php b/server_collations.php
index b466a668b..19b846708 100644
--- a/server_collations.php
+++ b/server_collations.php
@@ -30,7 +30,7 @@ echo '<h2>' . "\n"
  */
 if (PMA_MYSQL_INT_VERSION < 40100) {
     // TODO: Some nice Message :-)
-    require_once('./footer.inc.php');
+    require_once('./libraries/footer.inc.php');
 }
 
 
@@ -102,6 +102,6 @@ echo '            </table>' . "\n"
    . '    </tr>' . "\n"
    . '</table>' . "\n";
 
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 
 ?>
diff --git a/server_databases.php b/server_databases.php
index 354abfe6e..fe5d8bb0a 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -332,6 +332,6 @@ echo '</ul>' . "\n";
 /**
  * Sends the footer
  */
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 
 ?>
diff --git a/server_engines.php b/server_engines.php
index c3896c3c0..fac7d17b1 100644
--- a/server_engines.php
+++ b/server_engines.php
@@ -223,6 +223,6 @@ if (empty($engine) || empty($mysql_storage_engines[$engine])) {
 /**
  * Sends the footer
  */
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 
 ?>
diff --git a/server_export.php b/server_export.php
index c591ad10d..c4b47979d 100644
--- a/server_export.php
+++ b/server_export.php
@@ -58,5 +58,5 @@ require_once('./libraries/display_export.lib.php');
 /**
  * Displays the footer
  */
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 ?>
diff --git a/server_import.php b/server_import.php
index 0bd5cee42..361d5b784 100644
--- a/server_import.php
+++ b/server_import.php
@@ -20,6 +20,6 @@ require('./libraries/display_import.lib.php');
 /**
  * Displays the footer
  */
-require('./footer.inc.php');
+require('./libraries/footer.inc.php');
 ?>
 
diff --git a/server_privileges.php b/server_privileges.php
index 80cd6b0c3..c8df2ae05 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -43,7 +43,7 @@ if (!$is_superuser) {
        . $GLOBALS['strPrivileges'] . "\n"
        . '</h2>' . "\n"
        . $GLOBALS['strNoPrivileges'] . "\n";
-    require_once('./footer.inc.php');
+    require_once('./libraries/footer.inc.php');
 }
 
 /**
@@ -1547,7 +1547,7 @@ if ( empty( $adduser ) && empty( $checkprivs ) ) {
         if ( $user_does_not_exists ) {
             echo $GLOBALS['strUserNotFound'];
             PMA_displayLoginInformationFields();
-            //require_once('./footer.inc.php');
+            //require_once('./libraries/footer.inc.php');
         }
         echo '<form name="usersForm" id="usersForm" action="server_privileges.php" method="post">' . "\n"
            . PMA_generate_common_hidden_inputs('', '', 3)
@@ -2109,6 +2109,6 @@ if ( empty( $adduser ) && empty( $checkprivs ) ) {
  * Displays the footer
  */
 echo "\n\n";
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 
 ?>
diff --git a/server_processlist.php b/server_processlist.php
index 13c9b20ba..25d61c4f8 100644
--- a/server_processlist.php
+++ b/server_processlist.php
@@ -94,5 +94,5 @@ foreach ( $serverProcesses AS $process ) {
 /**
  * Sends the footer
  */
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 ?>
\ No newline at end of file
diff --git a/server_sql.php b/server_sql.php
index a10d2672e..628484d07 100644
--- a/server_sql.php
+++ b/server_sql.php
@@ -26,5 +26,5 @@ PMA_sqlQueryForm();
 /**
  * Displays the footer
  */
-require_once './footer.inc.php';
+require_once './libraries/footer.inc.php';
 ?>
diff --git a/server_status.php b/server_status.php
index dab784c84..d4a3b9b13 100644
--- a/server_status.php
+++ b/server_status.php
@@ -682,5 +682,5 @@ unset( $section_name, $section, $sections, $server_status, $odd_row, $alerts );
 /**
  * Sends the footer
  */
-require_once './footer.inc.php';
+require_once './libraries/footer.inc.php';
 ?>
diff --git a/server_variables.php b/server_variables.php
index 2c0e93358..1d938af8c 100644
--- a/server_variables.php
+++ b/server_variables.php
@@ -110,6 +110,6 @@ foreach ($serverVars as $name => $value) {
 /**
  * Sends the footer
  */
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 
 ?>
diff --git a/sql.php b/sql.php
index 4e087616d..9f5633ed3 100644
--- a/sql.php
+++ b/sql.php
@@ -72,7 +72,7 @@ if (!defined('PMA_CHK_DROP')
     && !$cfg['AllowUserDropDatabase']
     && $is_drop_database
     && !$is_superuser) {
-    require_once('./header.inc.php');
+    require_once('./libraries/header.inc.php');
     PMA_mysqlDie($strNoDropDatabases, '', '', $err_url);
 } // end if
 
@@ -221,7 +221,7 @@ if (!$cfg['Confirm']
 
 if ( $do_confirm ) {
     $stripped_sql_query = $sql_query;
-    require_once('./header.inc.php');
+    require_once('./libraries/header.inc.php');
     if ( $is_drop_database) {
         echo '<h1 class="warning">' . $strDropDatabaseStrongWarning . '</h1>';
     }
@@ -382,7 +382,7 @@ else {
 
         // Displays an error message if required and stop parsing the script
         if ($error        = PMA_DBI_getError()) {
-            require_once('./header.inc.php');
+            require_once('./libraries/header.inc.php');
             $full_err_url = (preg_match('@^(db_details|tbl_properties)@', $err_url))
                           ? $err_url . '&amp;show_query=1&amp;sql_query=' . urlencode($sql_query)
                           : $err_url;
@@ -666,7 +666,7 @@ else {
                 $js_to_run = 'functions.js';
             }
             if ($goto != 'main.php') {
-                require_once('./header.inc.php');
+                require_once('./libraries/header.inc.php');
             }
             $active_page = $goto;
             require('./' . $goto);
@@ -684,7 +684,7 @@ else {
             unset($show_query);
         }
         if (isset($printview) && $printview == '1') {
-            require_once('./header_printview.inc.php');
+            require_once('./libraries/header_printview.inc.php');
         } else {
             $js_to_run = 'functions.js';
             unset($message);
@@ -916,5 +916,5 @@ echo "\n\n";
 /**
  * Displays the footer
  */
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 ?>
diff --git a/tbl_addfield.php b/tbl_addfield.php
index 1597bd072..04aae32ac 100644
--- a/tbl_addfield.php
+++ b/tbl_addfield.php
@@ -8,7 +8,7 @@
 require_once('./libraries/common.lib.php');
 
 $js_to_run = 'functions.js';
-require_once('./header.inc.php');
+require_once('./libraries/header.inc.php');
 
 // Check parameters
 PMA_checkParameters(array('db', 'table'));
@@ -226,7 +226,7 @@ if ($abort == FALSE) {
 
     // Diplays the footer
     echo "\n";
-    require_once('./footer.inc.php');
+    require_once('./libraries/footer.inc.php');
 }
 
 ?>
diff --git a/tbl_alter.php b/tbl_alter.php
index 8faaa4b29..10165377d 100644
--- a/tbl_alter.php
+++ b/tbl_alter.php
@@ -8,7 +8,7 @@
 require_once('./libraries/common.lib.php');
 
 $js_to_run = 'functions.js';
-require_once('./header.inc.php');
+require_once('./libraries/header.inc.php');
 
 // Check parameters
 PMA_checkParameters(array('db', 'table'));
@@ -201,5 +201,5 @@ if ($abort == FALSE) {
 /**
  * Displays the footer
  */
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 ?>
diff --git a/tbl_change.php b/tbl_change.php
index 76fbe875c..45f4fc0cd 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -8,7 +8,7 @@
 require_once('./libraries/common.lib.php');
 
 $js_to_run = 'tbl_change.js';
-require_once('./header.inc.php');
+require_once('./libraries/header.inc.php');
 require_once('./libraries/relation.lib.php'); // foreign keys
 require_once('./libraries/file_listing.php'); // file listing
 
@@ -146,7 +146,7 @@ if (isset($primary_key)) {
                 unset($sql_query_cpy);
             }
             echo "\n";
-            require_once('./footer.inc.php');
+            require_once('./libraries/footer.inc.php');
         } // end if (no record returned)
     }
 } else {
@@ -944,5 +944,5 @@ if (isset($primary_key))
  * Displays the footer
  */
 echo "\n";
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 ?>
diff --git a/tbl_create.php b/tbl_create.php
index de9a68f3c..59991efd2 100644
--- a/tbl_create.php
+++ b/tbl_create.php
@@ -13,7 +13,7 @@ if (isset($table)) {
     $table = PMA_sanitize($table);
 }
 
-require_once('./header.inc.php');
+require_once('./libraries/header.inc.php');
 
 // Check parameters
 PMA_checkParameters(array('db', 'table'));
@@ -231,7 +231,7 @@ if ($abort == FALSE) {
         require('./libraries/tbl_properties.inc.php');
         // Displays the footer
         echo "\n";
-        require_once('./footer.inc.php');
+        require_once('./libraries/footer.inc.php');
    }
 }
 
diff --git a/tbl_import.php b/tbl_import.php
index 47489e401..267561abb 100644
--- a/tbl_import.php
+++ b/tbl_import.php
@@ -20,6 +20,6 @@ require_once('./libraries/display_import.lib.php');
 /**
  * Displays the footer
  */
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 ?>
 
diff --git a/tbl_indexes.php b/tbl_indexes.php
index 8714c09c9..14c767ab0 100644
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@@ -42,7 +42,7 @@ if (!defined('PMA_IDX_INCLUDED')) {
 
     // Displays headers (if needed)
     $js_to_run = ((isset($index) && isset($do_save_data)) ? 'functions.js' : 'indexes.js');
-    require_once('./header.inc.php');
+    require_once('./libraries/header.inc.php');
 } // end if
 
 
@@ -422,6 +422,6 @@ else if (!defined('PMA_IDX_INCLUDED')
 echo "\n";
 
 if (!defined('PMA_IDX_INCLUDED')){
-    require_once('./footer.inc.php');
+    require_once('./libraries/footer.inc.php');
 }
 ?>
diff --git a/tbl_move_copy.php b/tbl_move_copy.php
index 6892d76a6..43213f309 100644
--- a/tbl_move_copy.php
+++ b/tbl_move_copy.php
@@ -51,7 +51,7 @@ if (isset($new_name) && trim($new_name) != '') {
             }
         }
     }
-    require_once('./header.inc.php');
+    require_once('./libraries/header.inc.php');
 } // end is target table name
 
 
@@ -59,7 +59,7 @@ if (isset($new_name) && trim($new_name) != '') {
  * No new name for the table!
  */
 else {
-    require_once('./header.inc.php');
+    require_once('./libraries/header.inc.php');
     PMA_mysqlDie($strTableEmpty, '', '', $err_url);
 }
 
diff --git a/tbl_printview.php b/tbl_printview.php
index 2878c1baf..0a8ec7e47 100644
--- a/tbl_printview.php
+++ b/tbl_printview.php
@@ -8,7 +8,7 @@ require_once('./libraries/common.lib.php');
  */
 $print_view = TRUE;
 if (!isset($selected_tbl)) {
-    require_once('./header.inc.php');
+    require_once('./libraries/header.inc.php');
 }
 
 // Check parameters
@@ -56,7 +56,7 @@ $multi_tables     = (count($the_tables) > 1);
 
 if ($multi_tables) {
     if (empty($GLOBALS['is_header_sent'])) {
-        require_once('./header.inc.php');
+        require_once('./libraries/header.inc.php');
     }
     $tbl_list     = '';
     foreach ($the_tables AS $key => $table) {
@@ -557,5 +557,5 @@ function printPage()
 <?php
 echo '<br /><br />&nbsp;<input type="button" class="print_ignore" style="width: 100px; height: 25px" id="print" value="' . $strPrint . '" onclick="printPage()" />' . "\n";
 
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 ?>
diff --git a/tbl_properties.php b/tbl_properties.php
index 7a50fb0cf..502d553ed 100644
--- a/tbl_properties.php
+++ b/tbl_properties.php
@@ -32,5 +32,5 @@ PMA_sqlQueryForm();
 /**
  * Displays the footer
  */
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 ?>
diff --git a/tbl_properties_common.php b/tbl_properties_common.php
index c008a9f6e..87329fade 100644
--- a/tbl_properties_common.php
+++ b/tbl_properties_common.php
@@ -35,7 +35,7 @@ require_once('./libraries/db_table_exists.lib.php');
  * Displays headers
  */
 $js_to_run = 'functions.js';
-require_once('./header.inc.php');
+require_once('./libraries/header.inc.php');
 
 
 /**
diff --git a/tbl_properties_export.php b/tbl_properties_export.php
index 3d99930a6..54191dddb 100644
--- a/tbl_properties_export.php
+++ b/tbl_properties_export.php
@@ -113,5 +113,5 @@ require_once('./libraries/display_export.lib.php');
 /**
  * Displays the footer
  */
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 ?>
diff --git a/tbl_properties_operations.php b/tbl_properties_operations.php
index 1947d79e3..12456b2c2 100644
--- a/tbl_properties_operations.php
+++ b/tbl_properties_operations.php
@@ -596,5 +596,5 @@ if ($cfgRelation['relwork'] && $tbl_type != "INNODB") {
  * Displays the footer
  */
 echo "\n";
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 ?>
diff --git a/tbl_properties_structure.php b/tbl_properties_structure.php
index 77a96d7b3..e0d9c1a33 100644
--- a/tbl_properties_structure.php
+++ b/tbl_properties_structure.php
@@ -787,5 +787,5 @@ echo '</div>' . "\n";
 /**
  * Displays the footer
  */
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 ?>
diff --git a/tbl_relation.php b/tbl_relation.php
index 02bed21e6..b72eb4aca 100644
--- a/tbl_relation.php
+++ b/tbl_relation.php
@@ -539,5 +539,5 @@ if ( $tbl_type === 'INNODB' && PMA_MYSQL_INT_VERSION < 40013 ) {
 /**
  * Displays the footer
  */
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 ?>
diff --git a/tbl_rename.php b/tbl_rename.php
index ddd22783e..1e9d0006c 100644
--- a/tbl_rename.php
+++ b/tbl_rename.php
@@ -29,7 +29,7 @@ if (isset($new_name) && trim($new_name) != '' && strpos($new_name,'.') === FALSE
         exit();
     }
 
-    require_once('./header.inc.php');
+    require_once('./libraries/header.inc.php');
     PMA_DBI_select_db($db);
     $sql_query = 'ALTER TABLE ' . PMA_backquote($old_name) . ' RENAME ' . PMA_backquote($new_name) . ';';
     $result    = PMA_DBI_query($sql_query);
@@ -93,7 +93,7 @@ if (isset($new_name) && trim($new_name) != '' && strpos($new_name,'.') === FALSE
  * No new name for the table!
  */
 else {
-    require_once('./header.inc.php');
+    require_once('./libraries/header.inc.php');
     if (strpos($new_name,'.') === FALSE) {
         PMA_mysqlDie($strTableEmpty, '', '', $err_url);
     } else {
diff --git a/tbl_replace.php b/tbl_replace.php
index 1458799ae..da6217d9d 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -204,7 +204,7 @@ if (empty($valuelist) && empty($query)) {
     $message = $strNoModification;
     if ($is_gotofile) {
         $js_to_run = 'functions.js';
-        require_once('./header.inc.php');
+        require_once('./libraries/header.inc.php');
         require('./' . PMA_securePath($goto));
     } else {
         PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . $goto . '&disp_message=' . urlencode($message) . '&disp_query=');
@@ -257,7 +257,7 @@ if ($is_gotofile) {
     }
     $js_to_run = 'functions.js';
     $active_page = $goto;
-    require_once('./header.inc.php');
+    require_once('./libraries/header.inc.php');
     require('./' . PMA_securePath($goto));
 } else {
     // I don't understand this one:
diff --git a/tbl_row_action.php b/tbl_row_action.php
index 0b1a166b3..eed0d23bf 100644
--- a/tbl_row_action.php
+++ b/tbl_row_action.php
@@ -11,7 +11,7 @@ if ((!isset($rows_to_delete) || !is_array($rows_to_delete)) && !isset($mult_btn)
     $disp_message = $strNoRowsSelected;
     $disp_query = '';
     require('./sql.php');
-    require_once('./footer.inc.php');
+    require_once('./libraries/footer.inc.php');
 }
 
 /**
@@ -63,7 +63,7 @@ if ($submit_mult == 'row_delete' || $submit_mult == 'row_export') {
     $js_to_run = 'functions.js';
 }
 
-require_once('./header.inc.php');
+require_once('./libraries/header.inc.php');
 
 if (!empty($submit_mult)) {
     switch($submit_mult) {
@@ -141,7 +141,7 @@ if (!empty($submit_mult)) {
             /**
              * Displays the footer
              */
-            require_once('./footer.inc.php');
+            require_once('./libraries/footer.inc.php');
         break;
     }
 }
diff --git a/tbl_select.php b/tbl_select.php
index 0f2095247..08d64cd88 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -301,7 +301,7 @@ while (list($operator) = each($GLOBALS['cfg']['UnaryOperators'])) {
 </fieldset>
 </form>
     <?php
-    require_once('./footer.inc.php');
+    require_once('./libraries/footer.inc.php');
 }
 
 
diff --git a/transformation_overview.php b/transformation_overview.php
index 03088eff8..18095142a 100644
--- a/transformation_overview.php
+++ b/transformation_overview.php
@@ -11,7 +11,7 @@ define('PMA_DISPLAY_HEADING', 0);
  * Gets some core libraries and displays a top message if required
  */
 require_once('./libraries/common.lib.php');
-require_once('./header.inc.php');
+require_once('./libraries/header.inc.php');
 require_once('./libraries/relation.lib.php');
 require_once('./libraries/transformations.lib.php');
 $cfgRelation = PMA_getRelationsParam();
@@ -65,6 +65,6 @@ foreach ($types['transformation'] AS $key => $transform) {
  * Displays the footer
  */
 echo "\n";
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 
 ?>
diff --git a/transformation_wrapper.php b/transformation_wrapper.php
index 5caeb6a3c..944721a97 100644
--- a/transformation_wrapper.php
+++ b/transformation_wrapper.php
@@ -50,7 +50,7 @@ if ($cfgRelation['commwork'] && $cfgRelation['mimework']) {
 }
 
 // garvin: For re-usability, moved http-headers and stylesheets
-// to a seperate file. It can now be included by header.inc.php,
+// to a seperate file. It can now be included by libraries/header.inc.php,
 // querywindow.php.
 
 require_once('./libraries/header_http.inc.php');
diff --git a/user_password.php b/user_password.php
index 6ef48500a..a17de2616 100644
--- a/user_password.php
+++ b/user_password.php
@@ -16,10 +16,10 @@ if (!$cfg['ShowChgPassword']) {
     $cfg['ShowChgPassword'] = PMA_DBI_select_db('mysql');
 }
 if ($cfg['Server']['auth_type'] == 'config' || !$cfg['ShowChgPassword']) {
-    require_once('./header.inc.php');
+    require_once('./libraries/header.inc.php');
     echo '<p><b>' . $strError . '</b></p>' . "\n"
        . '<p>&nbsp;&nbsp;&nbsp;&nbsp;' .  $strNoRights . '</p>' . "\n";
-    require_once('./footer.inc.php');
+    require_once('./libraries/footer.inc.php');
 } // end if
 
 
@@ -72,7 +72,7 @@ if (isset($nopass)) {
                      : '';
 
         // Displays the page
-        require_once('./header.inc.php');
+        require_once('./libraries/header.inc.php');
         echo '<h1>' . $strChangePassword . '</h1>' . "\n\n";
         $show_query = 'y';
         PMA_showMessage($strUpdateProfileMessage);
@@ -91,7 +91,7 @@ if (isset($nopass)) {
  */
 // Loads the headers
 $js_to_run = 'user_password.js';
-require_once('./header.inc.php');
+require_once('./libraries/header.inc.php');
 echo '<h1>' . $strChangePassword . '</h1>' . "\n\n";
 
 // Displays an error message if required
@@ -171,5 +171,5 @@ if (PMA_MYSQL_INT_VERSION >= 40102) {
 /**
  * Displays the footer
  */
-require_once('./footer.inc.php');
+require_once('./libraries/footer.inc.php');
 ?>