diff --git a/libraries/entry_points/server/export.php b/libraries/entry_points/server/export.php
index 02ddf6eff5..c6ddb7b44c 100644
--- a/libraries/entry_points/server/export.php
+++ b/libraries/entry_points/server/export.php
@@ -15,7 +15,7 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-global $db, $table, $sql_query, $num_tables, $unlim_num_rows;
+global $db, $table, $sql_query, $num_tables, $unlim_num_rows, $tmp_select, $select_item, $multi_values;
 
 require_once ROOT_PATH . 'libraries/server_common.inc.php';
 
diff --git a/libraries/entry_points/server/privileges.php b/libraries/entry_points/server/privileges.php
index ca932bbe70..5741781d66 100644
--- a/libraries/entry_points/server/privileges.php
+++ b/libraries/entry_points/server/privileges.php
@@ -23,7 +23,20 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-global $containerBuilder, $db, $err_url, $message, $pmaThemeImage, $text_dir, $url_query;
+global $containerBuilder, $db, $err_url, $message, $pmaThemeImage, $text_dir, $url_query, $post_patterns;
+global $username, $hostname, $dbname, $tablename, $routinename, $db_and_table, $dbname_is_wildcard;
+global $queries, $password, $ret_message, $ret_queries, $queries_for_display, $sql_query, $_add_user_error;
+global $itemType, $tables, $num_tables, $total_num_tables, $sub_part, $is_show_stats, $db_is_system_schema;
+global $tooltip_truename, $tooltip_aliasname, $pos, $title, $export, $grants, $one_grant, $url_dbname;
+global $strPrivDescAllPrivileges, $strPrivDescAlter, $strPrivDescAlterRoutine, $strPrivDescCreateDb,
+       $strPrivDescCreateRoutine, $strPrivDescCreateTbl, $strPrivDescCreateTmpTable, $strPrivDescCreateUser,
+       $strPrivDescCreateView, $strPrivDescDelete, $strPrivDescDeleteHistoricalRows, $strPrivDescDropDb,
+       $strPrivDescDropTbl, $strPrivDescEvent, $strPrivDescExecute, $strPrivDescFile,
+       $strPrivDescGrantTbl, $strPrivDescIndex, $strPrivDescInsert, $strPrivDescLockTables,
+       $strPrivDescMaxConnections, $strPrivDescMaxQuestions, $strPrivDescMaxUpdates, $strPrivDescMaxUserConnections,
+       $strPrivDescProcess, $strPrivDescReferences, $strPrivDescReload, $strPrivDescReplClient,
+       $strPrivDescReplSlave, $strPrivDescSelect, $strPrivDescShowDb, $strPrivDescShowView,
+       $strPrivDescShutdown, $strPrivDescSuper, $strPrivDescTrigger, $strPrivDescUpdate, $strPrivDescUsage;
 
 /** @var Response $response */
 $response = $containerBuilder->get(Response::class);
diff --git a/libraries/entry_points/table/addfield.php b/libraries/entry_points/table/addfield.php
index 04edd0f028..b37cf1962b 100644
--- a/libraries/entry_points/table/addfield.php
+++ b/libraries/entry_points/table/addfield.php
@@ -21,7 +21,7 @@ if (! defined('PHPMYADMIN')) {
 }
 
 global $containerBuilder, $err_url, $message, $action, $active_page, $num_fields, $sql_query;
-global $abort, $num_fields, $regenerate, $result;
+global $abort, $num_fields, $regenerate, $result, $db, $table;
 
 /** @var Response $response */
 $response = $containerBuilder->get(Response::class);
diff --git a/libraries/entry_points/table/create.php b/libraries/entry_points/table/create.php
index cdba8e0b5c..122532eeb0 100644
--- a/libraries/entry_points/table/create.php
+++ b/libraries/entry_points/table/create.php
@@ -20,7 +20,7 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-global $containerBuilder, $num_fields, $action, $sql_query, $result;
+global $containerBuilder, $num_fields, $action, $sql_query, $result, $db, $table;
 
 /** @var Response $response */
 $response = $containerBuilder->get(Response::class);
diff --git a/libraries/entry_points/table/export.php b/libraries/entry_points/table/export.php
index 65569ecaff..e83405af7d 100644
--- a/libraries/entry_points/table/export.php
+++ b/libraries/entry_points/table/export.php
@@ -18,8 +18,8 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-global $containerBuilder, $db, $url_query, $url_params, $table;
-global $sql_query, $where_clause, $num_tables, $unlim_num_rows, $multi_values;
+global $containerBuilder, $db, $url_query, $url_params, $table, $export_page_title, $replaces;
+global $sql_query, $where_clause, $num_tables, $unlim_num_rows, $multi_values, $aliases;
 
 /** @var Response $response */
 $response = $containerBuilder->get(Response::class);