diff --git a/src/disable_core_macro.h b/src/disable_core_macro.h
new file mode 100644
index 0000000000..ed27ed3c2e
--- /dev/null
+++ b/src/disable_core_macro.h
@@ -0,0 +1,24 @@
+/*-------------------------------------------------------------------------
+ *
+ * disable_core_macro.h
+ *	  Support including tuplesort.c from postgresql core code.
+ *
+ * Copyright (c) 2022, Postgres Professional
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#ifndef __DISABLE_CORE_MACRO_H__
+#define __DISABLE_CORE_MACRO_H__
+
+#undef TRACE_SORT
+#undef DEBUG_BOUNDED_SORT
+#undef TRACE_POSTGRESQL_SORT_START
+#undef TRACE_POSTGRESQL_SORT_DONE
+
+#define TRACE_POSTGRESQL_SORT_START(arg1, arg2, arg3, arg4, arg5, arg6) \
+			do {} while(0)
+#define TRACE_POSTGRESQL_SORT_DONE(arg1, arg2) \
+			do {} while(0)
+
+#endif /* __DISABLE_CORE_MACRO_H__ */
diff --git a/src/tuplesort10.c b/src/tuplesort10.c
index 80bc67bc9e..5a829a9240 100644
--- a/src/tuplesort10.c
+++ b/src/tuplesort10.c
@@ -143,6 +143,8 @@
 #include "utils/sortsupport.h"
 #include "utils/tuplesort.h"
 
+/* Should be the last include */
+#include "disable_core_macro.h"
 
 /* sort-type codes for sort__start probes */
 #define HEAP_SORT		0
diff --git a/src/tuplesort11.c b/src/tuplesort11.c
index 60223929e5..23de559073 100644
--- a/src/tuplesort11.c
+++ b/src/tuplesort11.c
@@ -114,6 +114,8 @@
 #include "utils/sortsupport.h"
 #include "utils/tuplesort.h"
 
+/* Should be the last include */
+#include "disable_core_macro.h"
 
 /* sort-type codes for sort__start probes */
 #define HEAP_SORT		0
diff --git a/src/tuplesort12.c b/src/tuplesort12.c
index f975d24a98..796c1b8392 100644
--- a/src/tuplesort12.c
+++ b/src/tuplesort12.c
@@ -114,6 +114,8 @@
 #include "utils/sortsupport.h"
 #include "utils/tuplesort.h"
 
+/* Should be the last include */
+#include "disable_core_macro.h"
 
 /* sort-type codes for sort__start probes */
 #define HEAP_SORT		0
diff --git a/src/tuplesort13.c b/src/tuplesort13.c
index 98d68a143d..87354a38b4 100644
--- a/src/tuplesort13.c
+++ b/src/tuplesort13.c
@@ -114,6 +114,8 @@
 #include "utils/sortsupport.h"
 #include "utils/tuplesort.h"
 
+/* Should be the last include */
+#include "disable_core_macro.h"
 
 /* sort-type codes for sort__start probes */
 #define HEAP_SORT		0
diff --git a/src/tuplesort14.c b/src/tuplesort14.c
index b17347b214..85c8b10415 100644
--- a/src/tuplesort14.c
+++ b/src/tuplesort14.c
@@ -114,6 +114,8 @@
 #include "utils/sortsupport.h"
 #include "utils/tuplesort.h"
 
+/* Should be the last include */
+#include "disable_core_macro.h"
 
 /* sort-type codes for sort__start probes */
 #define HEAP_SORT		0
diff --git a/src/tuplesort15.c b/src/tuplesort15.c
index e8da988a73..6f7a59f5d6 100644
--- a/src/tuplesort15.c
+++ b/src/tuplesort15.c
@@ -118,6 +118,8 @@
 #include "utils/sortsupport.h"
 #include "utils/tuplesort.h"
 
+/* Should be the last include */
+#include "disable_core_macro.h"
 
 /* sort-type codes for sort__start probes */
 #define HEAP_SORT		0
diff --git a/src/tuplesort96.c b/src/tuplesort96.c
index d1c29b2f04..743e025b86 100644
--- a/src/tuplesort96.c
+++ b/src/tuplesort96.c
@@ -141,6 +141,8 @@
 #include "utils/sortsupport.h"
 #include "utils/tuplesort.h"
 
+/* Should be the last include */
+#include "disable_core_macro.h"
 
 /* sort-type codes for sort__start probes */
 #define HEAP_SORT		0