diff --git a/ChangeLog b/ChangeLog
index 373ef1abe..c5b705a97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #1981043 [export] HTML in exports getting corrupted,
   thanks to Jason Judge - jasonjudge
 - bug #1936761 [interface] BINARY not treated as BLOB: update/delete issues 
+- protection against XSS when register_globals is on and .htaccess has
+  no effect, thanks to Tim Starling
 - bug #1996943 [export] Firefox 3 and .sql.gz (corrupted); detect Gecko 1.9,
   thanks to Jürgen Wind - windkiel
 
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index 3746fe0e5..653ae1e3c 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -8,12 +8,8 @@
  * @version $Id$
  */
 
-/**
- * @todo replace by constant
- * $coming_from_common can be set from outside with register_globals on
- */
-if (!isset($coming_from_common)) {
-   exit;
+if (! defined('PHPMYADMIN')) {
+    exit;
 }
 
 if (function_exists('mcrypt_encrypt') || PMA_dl('mcrypt')) {
diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php
index 8ec0fa3b9..7adeb90ae 100644
--- a/libraries/charset_conversion.lib.php
+++ b/libraries/charset_conversion.lib.php
@@ -5,7 +5,9 @@
  *
  * @version $Id$
  */
-
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  * Loads the recode or iconv extensions if any of it is not loaded yet
diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php
index 977d85460..1164e76ef 100644
--- a/libraries/check_user_privileges.lib.php
+++ b/libraries/check_user_privileges.lib.php
@@ -7,6 +7,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index f602897f2..7bf04a032 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -52,6 +52,11 @@ if (version_compare(phpversion(), '6', 'lt')) {
     @ini_set('magic_quotes_runtime', false);
 }
 
+/**
+ * for verification in all procedural scripts under libraries
+ */
+define('PHPMYADMIN', true);
+
 /**
  * core functions
  */
@@ -730,9 +735,6 @@ if (! defined('PMA_MINIMUM_COMMON')) {
         // Gets the authentication library that fits the $cfg['Server'] settings
         // and run authentication
 
-        // (for a quick check of path disclosure in auth/cookies:)
-        $coming_from_common = true;
-
         // to allow HTTP or http
         $cfg['Server']['auth_type'] = strtolower($cfg['Server']['auth_type']);
         if (! file_exists('./libraries/auth/' . $cfg['Server']['auth_type'] . '.auth.lib.php')) {
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index 96467074d..b32274c3c 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -5,6 +5,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php
index f21437acb..693d28aec 100644
--- a/libraries/db_common.inc.php
+++ b/libraries/db_common.inc.php
@@ -4,6 +4,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  * Gets some core libraries
diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php
index 2717bf4d1..adc546527 100644
--- a/libraries/db_info.inc.php
+++ b/libraries/db_info.inc.php
@@ -34,6 +34,9 @@
  * @uses    addslashes()
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  * requirements
diff --git a/libraries/db_links.inc.php b/libraries/db_links.inc.php
index d22e59e11..417392d43 100644
--- a/libraries/db_links.inc.php
+++ b/libraries/db_links.inc.php
@@ -4,6 +4,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/db_routines.inc.php b/libraries/db_routines.inc.php
index 873d3eb2e..f3d24741f 100644
--- a/libraries/db_routines.inc.php
+++ b/libraries/db_routines.inc.php
@@ -4,6 +4,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  * @todo Support seeing the "results" of the called procedure or
diff --git a/libraries/db_table_exists.lib.php b/libraries/db_table_exists.lib.php
index 8486cc7d7..19a5827b9 100644
--- a/libraries/db_table_exists.lib.php
+++ b/libraries/db_table_exists.lib.php
@@ -6,6 +6,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/dbg/setup.php b/libraries/dbg/setup.php
index 30d870000..af4f34aa0 100644
--- a/libraries/dbg/setup.php
+++ b/libraries/dbg/setup.php
@@ -3,6 +3,9 @@
 /**
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  * checks for DBG extension and trys to load if not loaded
@@ -24,4 +27,4 @@ if ($GLOBALS['cfg']['DBG']['enable']) {
         $GLOBALS['DBG'] = true;
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php
index bd4bd1227..3ae84b803 100644
--- a/libraries/dbi/mysql.dbi.lib.php
+++ b/libraries/dbi/mysql.dbi.lib.php
@@ -5,6 +5,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php
index 0aa518450..705477ebf 100644
--- a/libraries/dbi/mysqli.dbi.lib.php
+++ b/libraries/dbi/mysqli.dbi.lib.php
@@ -5,6 +5,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 // MySQL client API
 if (!defined('PMA_MYSQL_CLIENT_API')) {
diff --git a/libraries/display_change_password.lib.php b/libraries/display_change_password.lib.php
index b1fdc3abc..550f271c7 100644
--- a/libraries/display_change_password.lib.php
+++ b/libraries/display_change_password.lib.php
@@ -5,6 +5,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 // loic1: autocomplete feature of IE kills the "onchange" event handler and it
 //        must be replaced by the "onpropertychange" one in this case
diff --git a/libraries/display_create_database.lib.php b/libraries/display_create_database.lib.php
index 65c37d6c8..b5b5ba485 100644
--- a/libraries/display_create_database.lib.php
+++ b/libraries/display_create_database.lib.php
@@ -5,6 +5,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/display_create_table.lib.php b/libraries/display_create_table.lib.php
index 62d522b68..f31fcfe8e 100644
--- a/libraries/display_create_table.lib.php
+++ b/libraries/display_create_table.lib.php
@@ -5,6 +5,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 60fe0dd4c..858c26572 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -4,6 +4,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index d77280422..9f1b0eec7 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -4,6 +4,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/display_select_lang.lib.php b/libraries/display_select_lang.lib.php
index e7a48ab47..6f7a5215d 100644
--- a/libraries/display_select_lang.lib.php
+++ b/libraries/display_select_lang.lib.php
@@ -5,6 +5,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  * Sorts available languages by their true english names
diff --git a/libraries/display_tbl_links.lib.php b/libraries/display_tbl_links.lib.php
index f9a42ec2f..a851484d0 100644
--- a/libraries/display_tbl_links.lib.php
+++ b/libraries/display_tbl_links.lib.php
@@ -9,6 +9,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/export/csv.php b/libraries/export/csv.php
index 0c6f525e5..b1f5a6ef4 100644
--- a/libraries/export/csv.php
+++ b/libraries/export/csv.php
@@ -3,6 +3,9 @@
 /**
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  * Set of functions used to build CSV dumps of tables
diff --git a/libraries/export/excel.php b/libraries/export/excel.php
index efa859871..5df0b3fe3 100644
--- a/libraries/export/excel.php
+++ b/libraries/export/excel.php
@@ -5,6 +5,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/export/htmlexcel.php b/libraries/export/htmlexcel.php
index b380cd52e..5edc684b4 100644
--- a/libraries/export/htmlexcel.php
+++ b/libraries/export/htmlexcel.php
@@ -5,6 +5,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php
index 94d0add9c..9141f8192 100644
--- a/libraries/export/htmlword.php
+++ b/libraries/export/htmlword.php
@@ -5,6 +5,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/export/latex.php b/libraries/export/latex.php
index 4ea8188d6..3711d37eb 100644
--- a/libraries/export/latex.php
+++ b/libraries/export/latex.php
@@ -5,6 +5,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/export/ods.php b/libraries/export/ods.php
index 09ba82505..51cf28eca 100644
--- a/libraries/export/ods.php
+++ b/libraries/export/ods.php
@@ -5,6 +5,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/export/odt.php b/libraries/export/odt.php
index c4a106ab0..c4439471f 100644
--- a/libraries/export/odt.php
+++ b/libraries/export/odt.php
@@ -5,6 +5,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php
index 12bfd7987..6cc2b902f 100644
--- a/libraries/export/pdf.php
+++ b/libraries/export/pdf.php
@@ -5,6 +5,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index a65ff6a87..e78ac948a 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -5,6 +5,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/export/xls.php b/libraries/export/xls.php
index c9ec6ca5b..7f7ef27e6 100644
--- a/libraries/export/xls.php
+++ b/libraries/export/xls.php
@@ -5,6 +5,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/export/xml.php b/libraries/export/xml.php
index 9f3da1021..bc99eb006 100644
--- a/libraries/export/xml.php
+++ b/libraries/export/xml.php
@@ -5,6 +5,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php
index e5850ae9f..f55e9153a 100644
--- a/libraries/export/yaml.php
+++ b/libraries/export/yaml.php
@@ -5,6 +5,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php
index 26fed3756..e02c69ac6 100644
--- a/libraries/footer.inc.php
+++ b/libraries/footer.inc.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * finishs HTML output
+ * finishes HTML output
  *
  * updates javascript variables in index.php for coorect working with querywindow
  * and navigation frame refreshing
@@ -44,6 +44,9 @@
  * @uses    file_exists()
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  * for PMA_setHistory()
diff --git a/libraries/get_foreign.lib.php b/libraries/get_foreign.lib.php
index 4d4e1a7be..0c2bcee7a 100644
--- a/libraries/get_foreign.lib.php
+++ b/libraries/get_foreign.lib.php
@@ -4,6 +4,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/grab_globals.lib.php b/libraries/grab_globals.lib.php
index d191d8a55..3b2ceb7a9 100644
--- a/libraries/grab_globals.lib.php
+++ b/libraries/grab_globals.lib.php
@@ -8,6 +8,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  * copy values from one array to another, usally from a superglobal into $GLOBALS
diff --git a/libraries/header.inc.php b/libraries/header.inc.php
index 2b166e1a8..e9cbf22fe 100644
--- a/libraries/header.inc.php
+++ b/libraries/header.inc.php
@@ -4,6 +4,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/header_http.inc.php b/libraries/header_http.inc.php
index ab1207638..a75c3488e 100644
--- a/libraries/header_http.inc.php
+++ b/libraries/header_http.inc.php
@@ -4,6 +4,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php
index 12cc1313d..2aa4ba1db 100644
--- a/libraries/header_meta_style.inc.php
+++ b/libraries/header_meta_style.inc.php
@@ -4,6 +4,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/header_printview.inc.php b/libraries/header_printview.inc.php
index 73724ffcf..1a89dde3a 100644
--- a/libraries/header_printview.inc.php
+++ b/libraries/header_printview.inc.php
@@ -4,6 +4,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  * Gets a core script and starts output buffering work
diff --git a/libraries/iconv_wrapper.lib.php b/libraries/iconv_wrapper.lib.php
index 6104e82d4..26566e728 100644
--- a/libraries/iconv_wrapper.lib.php
+++ b/libraries/iconv_wrapper.lib.php
@@ -4,6 +4,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/import.lib.php b/libraries/import.lib.php
index 4a259c9b8..861a239f2 100644
--- a/libraries/import.lib.php
+++ b/libraries/import.lib.php
@@ -5,6 +5,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  * We need to know something about user
diff --git a/libraries/import/csv.php b/libraries/import/csv.php
index eeaa35a14..7acb3eeea 100644
--- a/libraries/import/csv.php
+++ b/libraries/import/csv.php
@@ -6,6 +6,9 @@
  * @todo    add an option for handling NULL values
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/import/docsql.php b/libraries/import/docsql.php
index 6b8d46c0f..5c051f6f9 100644
--- a/libraries/import/docsql.php
+++ b/libraries/import/docsql.php
@@ -5,6 +5,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 require_once './libraries/relation.lib.php';
 $cfgRelation = PMA_getRelationsParam();
diff --git a/libraries/import/ldi.php b/libraries/import/ldi.php
index 393a43e31..00a5df8e0 100644
--- a/libraries/import/ldi.php
+++ b/libraries/import/ldi.php
@@ -5,6 +5,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/import/sql.php b/libraries/import/sql.php
index a430c00ab..280210661 100644
--- a/libraries/import/sql.php
+++ b/libraries/import/sql.php
@@ -5,6 +5,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/kanji-encoding.lib.php b/libraries/kanji-encoding.lib.php
index 2e5b9f83f..f9e58b266 100644
--- a/libraries/kanji-encoding.lib.php
+++ b/libraries/kanji-encoding.lib.php
@@ -11,6 +11,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  * Gets the php internal encoding codes and sets the available encoding
diff --git a/libraries/language.lib.php b/libraries/language.lib.php
index cc2a606bb..522be4ee4 100644
--- a/libraries/language.lib.php
+++ b/libraries/language.lib.php
@@ -5,6 +5,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  * lang detection is done here
diff --git a/libraries/mcrypt.lib.php b/libraries/mcrypt.lib.php
index 7d6d21cc3..e6b7277dc 100644
--- a/libraries/mcrypt.lib.php
+++ b/libraries/mcrypt.lib.php
@@ -4,6 +4,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  * Initialization
diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
index fb9cb85a2..b9cff104d 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -4,6 +4,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  * Prepares the work and runs some other scripts if required
diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php
index b4a6d3b07..e5f20f011 100644
--- a/libraries/mysql_charsets.lib.php
+++ b/libraries/mysql_charsets.lib.php
@@ -4,6 +4,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php
index 6a8748e9d..fbe649ce9 100644
--- a/libraries/navigation_header.inc.php
+++ b/libraries/navigation_header.inc.php
@@ -5,6 +5,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/opendocument.lib.php b/libraries/opendocument.lib.php
index 116655607..dfa27ffc8 100644
--- a/libraries/opendocument.lib.php
+++ b/libraries/opendocument.lib.php
@@ -5,6 +5,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/parse_analyze.lib.php b/libraries/parse_analyze.lib.php
index 7885b253b..ad05fb0d3 100644
--- a/libraries/parse_analyze.lib.php
+++ b/libraries/parse_analyze.lib.php
@@ -4,6 +4,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index 272bcda1c..7b4be9225 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -5,6 +5,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/relation_cleanup.lib.php b/libraries/relation_cleanup.lib.php
index 62ecce944..a82ba6797 100644
--- a/libraries/relation_cleanup.lib.php
+++ b/libraries/relation_cleanup.lib.php
@@ -5,6 +5,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php
index 454c44e30..540cab282 100644
--- a/libraries/select_lang.lib.php
+++ b/libraries/select_lang.lib.php
@@ -5,9 +5,12 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
- * trys to find the language to use
+ * tries to find the language to use
  *
  * @uses    $GLOBALS['cfg']['lang']
  * @uses    $GLOBALS['cfg']['DefaultLang']
diff --git a/libraries/server_common.inc.php b/libraries/server_common.inc.php
index b1ed96c0a..07005ffe2 100644
--- a/libraries/server_common.inc.php
+++ b/libraries/server_common.inc.php
@@ -9,6 +9,9 @@
  * @uses    $userlink
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  * Gets some core libraries
diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php
index 96ad5bb1f..ee35efd01 100644
--- a/libraries/server_links.inc.php
+++ b/libraries/server_links.inc.php
@@ -4,6 +4,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  * Check parameters
diff --git a/libraries/session.inc.php b/libraries/session.inc.php
index c1b30197a..bcc8993e0 100644
--- a/libraries/session.inc.php
+++ b/libraries/session.inc.php
@@ -13,6 +13,9 @@
  * @uses    version_compare()
  * @uses    PHP_VERSION
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 // verify if PHP supports session, die if it does not
 
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index c4af277c3..a08595137 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -10,6 +10,9 @@
  * @usedby  tbl_structure.php
  * @usedby  querywindow.php
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php
index 69c99f8c0..6dbe5b3f9 100644
--- a/libraries/sqlparser.data.php
+++ b/libraries/sqlparser.data.php
@@ -21,6 +21,9 @@
  *
  * @version$Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  * @global array MySQL function names
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index d7d4d6cd2..def36f978 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -29,7 +29,9 @@
  *
  * @version $Id$
  */
-
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  * Minimum inclusion? (i.e. for the stylesheet builder)
diff --git a/libraries/sqlvalidator.class.php b/libraries/sqlvalidator.class.php
index 8f46b0737..19fc46a5f 100644
--- a/libraries/sqlvalidator.class.php
+++ b/libraries/sqlvalidator.class.php
@@ -27,6 +27,9 @@
 *
 * @version  $Id$
 */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 @include_once 'SOAP/Client.php';
 
diff --git a/libraries/sqlvalidator.lib.php b/libraries/sqlvalidator.lib.php
index a2d61e154..4c75f3d0e 100644
--- a/libraries/sqlvalidator.lib.php
+++ b/libraries/sqlvalidator.lib.php
@@ -29,6 +29,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  * We need the PEAR libraries, so do a minimum version check first
diff --git a/libraries/string.lib.php b/libraries/string.lib.php
index 2f76bd3f7..550bd5f38 100644
--- a/libraries/string.lib.php
+++ b/libraries/string.lib.php
@@ -22,6 +22,9 @@
  * @uses    defined()
  * @todo a .lib filename should not have code in main(), split or rename file
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /* Try to load mbstring, unless we're using buggy php version */
 if (PMA_PHP_INT_VERSION != 40203) {
diff --git a/libraries/tbl_common.php b/libraries/tbl_common.php
index 75dab272a..ec0eb032c 100644
--- a/libraries/tbl_common.php
+++ b/libraries/tbl_common.php
@@ -4,6 +4,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  * Gets some core libraries
diff --git a/libraries/tbl_info.inc.php b/libraries/tbl_info.inc.php
index 9aeb9ceea..30a7aec8d 100644
--- a/libraries/tbl_info.inc.php
+++ b/libraries/tbl_info.inc.php
@@ -4,6 +4,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  *
diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php
index 9887728b3..85e515d6c 100644
--- a/libraries/tbl_links.inc.php
+++ b/libraries/tbl_links.inc.php
@@ -4,6 +4,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  * Check parameters
diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
index 3b1018aa7..e933ed32a 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -4,6 +4,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  * Check parameters
diff --git a/libraries/tbl_replace_fields.inc.php b/libraries/tbl_replace_fields.inc.php
index 06fdfc057..64a9d1b34 100644
--- a/libraries/tbl_replace_fields.inc.php
+++ b/libraries/tbl_replace_fields.inc.php
@@ -29,6 +29,9 @@
  * @uses PMA_NO_VARIABLES_IMPORT
  * @uses PMA_sqlAddslashes()
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 /**
  * do not import request variable into global scope
diff --git a/libraries/tbl_triggers.lib.php b/libraries/tbl_triggers.lib.php
index af6f0b235..659cc2c40 100644
--- a/libraries/tbl_triggers.lib.php
+++ b/libraries/tbl_triggers.lib.php
@@ -4,6 +4,9 @@
  *
  * @version $Id$
  */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
 
 $url_query .= '&amp;goto=tbl_structure.php';