diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 83ae5d4746646e98c7ec16f8f8e9226dd1d64532..9138266324b50e74e202f4c860754a7bae8097e4 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -129,7 +129,6 @@ bool		XLOG_DEBUG = false;
 /* these are derived from XLOG_sync_method by assign_xlog_sync_method */
 int			sync_method = DEFAULT_SYNC_METHOD;
 static int	open_sync_bit = DEFAULT_SYNC_FLAGBIT;
-static Relation	XLogSaveBufferForHint_Relation = NULL;
 
 /*
  * walreceiver process receives xlog data from walsender process.
diff --git a/src/backend/cdb/dispatcher/cdbgang.c b/src/backend/cdb/dispatcher/cdbgang.c
index 3910808792f8091042a91610edf2a7f53fcb4e7c..d0e3e4068482f87df414f40cf1e84d7cf812177b 100644
--- a/src/backend/cdb/dispatcher/cdbgang.c
+++ b/src/backend/cdb/dispatcher/cdbgang.c
@@ -99,7 +99,9 @@ static CdbComponentDatabaseInfo *findDatabaseInfoBySegIndex(
 		CdbComponentDatabases *cdbs, int segIndex);
 static void addGangToAllocated(Gang *gp);
 static Gang *getAvailableGang(GangType type, int size, int content);
+#ifdef USE_ASSERT_CHECKING
 static bool readerGangsExist(void);
+#endif
 
 /*
  * Create a reader gang.
diff --git a/src/backend/executor/nodePartitionSelector.c b/src/backend/executor/nodePartitionSelector.c
index 7131eabd00bf394e095bab730f375532fee097cd..dfbd89df914cfe8178ad1ba3bd8ca138672ac039 100644
--- a/src/backend/executor/nodePartitionSelector.c
+++ b/src/backend/executor/nodePartitionSelector.c
@@ -259,7 +259,7 @@ ExecPartitionSelector(PartitionSelectorState *node)
 	return candidateOutputSlot;
 }
 
-static void LogSelectedPartitionsForScan(int32 selectorId, const HTAB *pidIndex, const int32 scanId);
+static void LogSelectedPartitionsForScan(int32 selectorId, HTAB *pidIndex, const int32 scanId);
 
 void LogPartitionSelection(EState *estate, int32 selectorId)
 {
@@ -283,7 +283,7 @@ void LogPartitionSelection(EState *estate, int32 selectorId)
 	}
 }
 
-void LogSelectedPartitionsForScan(int32 selectorId, const HTAB *pidIndex, const int32 scanId)
+void LogSelectedPartitionsForScan(int32 selectorId, HTAB *pidIndex, const int32 scanId)
 {
 	int32 numPartitionsSelected = 0;
 	Datum *selectedPartOids = palloc(sizeof(Datum) * hash_get_num_entries(pidIndex));
diff --git a/src/backend/optimizer/util/walkers.c b/src/backend/optimizer/util/walkers.c
index cbd5d109f6be78d2743bde66965edca09c5d9106..2c60ca457885ae7168fc75f0250da89e9efc2f45 100644
--- a/src/backend/optimizer/util/walkers.c
+++ b/src/backend/optimizer/util/walkers.c
@@ -8,6 +8,7 @@
 #include "postgres.h"
 
 #include "miscadmin.h"
+#include "nodes/nodeFuncs.h"
 #include "optimizer/walkers.h"
 #include "optimizer/var.h"