diff --git a/db_qbe.php b/db_qbe.php
index 940758cccf..003b2fe033 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -11,6 +11,9 @@
  */
 require_once 'libraries/common.inc.php';
 require_once 'libraries/DBQbe.class.php';
+require_once 'libraries/bookmark.lib.php';
+require_once 'libraries/sql.lib.php';
+
 $response = PMA_Response::getInstance();
 
 // Gets the relation settings
@@ -25,8 +28,15 @@ if (isset($_REQUEST['submit_sql']) && ! empty($sql_query)) {
         $message_to_display = true;
     } else {
         $goto      = 'db_sql.php';
-        include 'sql.php';
-        exit;
+        
+        // Parse and analyze the query
+        require_once 'libraries/parse_analyze.inc.php';
+
+        PMA_executeQueryAndSendQueryResponse(
+            $analyzed_sql_results, false, $_REQUEST['db'], null, null, null, null,
+            false, null, null, null, null, $goto, $pmaThemeImage, null, null, null,
+            $sql_query, null, null
+        );
     }
 }
 
diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php
index bb50899c51..bbb7f90a8f 100644
--- a/libraries/sql.lib.php
+++ b/libraries/sql.lib.php
@@ -2253,7 +2253,7 @@ function PMA_executeQueryAndSendQueryResponse($analyzed_sql_results,
     $query_type, $sql_query, $selected, $complete_query
 ) {
     // Include PMA_Index class for use in PMA_DisplayResults class
-    include './libraries/Index.class.php';
+    include_once './libraries/Index.class.php';
 
     include 'libraries/DisplayResults.class.php';
 
diff --git a/tbl_structure.php b/tbl_structure.php
index c2f8bb1c9a..de4a4ffd2c 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -18,6 +18,8 @@ require_once 'libraries/mysql_charsets.inc.php';
  */
 require_once 'libraries/structure.lib.php';
 require_once 'libraries/index.lib.php';
+require_once 'libraries/sql.lib.php';
+require_once 'libraries/bookmark.lib.php';
 
 $response = PMA_Response::getInstance();
 $header   = $response->getHeader();
@@ -103,8 +105,15 @@ if (! empty($submit_mult)) {
             }
             $sql_query .= ' FROM ' . PMA_Util::backquote($db)
             . '.' . PMA_Util::backquote($table);
-            include 'sql.php';
-            exit;
+            
+            // Parse and analyze the query
+            require_once 'libraries/parse_analyze.inc.php';
+            
+            PMA_executeQueryAndSendQueryResponse(
+                $analyzed_sql_results, false, $db, $table, null, null, null, false, null,
+                null, null, null, $goto, $pmaThemeImage, null, null, null, $sql_query,
+                null, null
+            );
         } else {
             // handle multiple field commands
             // handle confirmation of deleting multiple fields/columns