4 files changed, 9 insertions, 9 deletions
diff --git a/sql/my_json_writer.cc b/sql/my_json_writer.cc
index 8284c9bbfca..54eb8423caf 100644
--- a/sql/my_json_writer.cc
+++ b/sql/my_json_writer.cc
@@ -13,13 +13,10 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
 
-#include "mariadb.h"
-#include "sql_priv.h"
-#include "sql_string.h"
+#include "my_global.h"
 #include "my_json_writer.h"
 
 #if !defined(NDEBUG) || defined(JSON_WRITER_UNIT_TEST)
-#include <iostream>
 
 bool Json_writer::named_item_expected() const
 {
diff --git a/sql/my_json_writer.h b/sql/my_json_writer.h
index a4e8c825582..9e7081c96d1 100644
--- a/sql/my_json_writer.h
+++ b/sql/my_json_writer.h
@@ -17,7 +17,7 @@
 #define JSON_WRITER_INCLUDED
 
 #include "my_base.h"
-#include "sql_select.h"
+#include "sql_string.h"
 
 #if !defined(NDEBUG) || defined(JSON_WRITER_UNIT_TEST) || defined ENABLED_JSON_WRITER_CONSISTENCY_CHECKS
 #include <set>
@@ -27,11 +27,11 @@
 #endif
 
 #ifdef JSON_WRITER_UNIT_TEST
-#include "sql_string.h"
-constexpr uint FAKE_SELECT_LEX_ID= UINT_MAX;
 // Also, mock objects are defined in my_json_writer-t.cc
 #define VALIDITY_ASSERT(x) if (!(x)) this->invalid_json= true;
 #else
+#include "sql_class.h"  // For class THD
+#include "log.h" // for sql_print_error
 #define VALIDITY_ASSERT(x) DBUG_ASSERT(x)
 #endif
 
@@ -40,8 +40,10 @@ constexpr uint FAKE_SELECT_LEX_ID= UINT_MAX;
 class Opt_trace_stmt;
 class Opt_trace_context;
 class Json_writer;
-struct TABLE_LIST;
 
+struct TABLE;
+struct st_join_table;
+using JOIN_TAB= struct st_join_table;
 
 /*
   Single_line_formatting_helper is used by Json_writer to do better formatting
diff --git a/sql/sql_explain.h b/sql/sql_explain.h
index bfd52290374..88fae9d4f1a 100644
--- a/sql/sql_explain.h
+++ b/sql/sql_explain.h
@@ -74,7 +74,6 @@ class Json_writer;
 *************************************************************************************/
 
 
-const uint FAKE_SELECT_LEX_ID= UINT_MAX;
 
 class Explain_query;
 
diff --git a/sql/sql_priv.h b/sql/sql_priv.h
index f7d8ef0da67..b5efe53dfa4 100644
--- a/sql/sql_priv.h
+++ b/sql/sql_priv.h
@@ -334,6 +334,8 @@
 #define UNCACHEABLE_DEPENDENT (UNCACHEABLE_DEPENDENT_GENERATED | \
                                UNCACHEABLE_DEPENDENT_INJECTED)
 
+#define FAKE_SELECT_LEX_ID UINT_MAX
+
 /* Used to check GROUP BY list in the MODE_ONLY_FULL_GROUP_BY mode */
 #define UNDEF_POS (-1)