diff --git a/src/backend/cdb/motion/ic_common.c b/src/backend/cdb/motion/ic_common.c
index 0c5f08b578479c0d6f8b553ff525302c376b55e8..092b2efc5fd300603aa35f60087513955b71ace8 100644
--- a/src/backend/cdb/motion/ic_common.c
+++ b/src/backend/cdb/motion/ic_common.c
@@ -271,7 +271,10 @@ InitMotionLayerIPC(void)
 	/*activated = false;*/
 	savedSeqServerFd = -1;
 
-	InitMotionUDPIFC(&UDP_listenerFd, &Gp_listener_port);
+	/* use a local uint16 to remove warning of 'incompatible type' */
+	uint16 port;
+	InitMotionUDPIFC(&UDP_listenerFd, &port);
+	Gp_listener_port = port;
 
 	elog(DEBUG1, "Interconnect listening on udp port %d", Gp_listener_port);
 }
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index 5786ef4a5f17f89e61f867bc61fd6231c899f00a..0c34a6741602ac53197c7131fa3553067cc952f7 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -1666,7 +1666,7 @@ _SPI_execute_plan(_SPI_plan * plan, ParamListInfo paramLI,
 	volatile int res = 0;
 	Snapshot	saveActiveSnapshot;
 	const char *saved_query_string;
-	const char *current_query_string = NULL;
+	char *current_query_string = NULL;
 
 	/* Be sure to restore ActiveSnapshot on error exit */
 	saveActiveSnapshot = ActiveSnapshot;
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index a2ee46b3a3fcd02402a9a97d75375f197d6b790e..c15b11fc8691b832a98d26f0b346c445ebb69a36 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -404,7 +404,7 @@ _outScanInfo(StringInfo str, Scan *node)
 		 * subquery, but this is serialized elsewhere in outSubqueryScan, no
 		 * need to duplicate it here
 		 */
-		if (rte->type != RTE_SUBQUERY)
+		if (rte->rtekind != RTE_SUBQUERY)
 		{
 			_outNode(str,rte);
 		}
diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
index 494ae0e4240460710e26036922fff62e5e33b980..aeb83abdc2cdf566737e774c2f58ed40e20b377c 100644
--- a/src/backend/optimizer/path/costsize.c
+++ b/src/backend/optimizer/path/costsize.c
@@ -70,6 +70,7 @@
 #include "optimizer/cost.h"
 #include "optimizer/pathnode.h"
 #include "optimizer/planmain.h"
+#include "parser/parse_expr.h"
 #include "parser/parsetree.h"
 #include "utils/lsyscache.h"
 #include "utils/selfuncs.h"
diff --git a/src/backend/storage/file/compress_zlib.c b/src/backend/storage/file/compress_zlib.c
index 4b9e62cb43ee071602b9a494778fdf792382db6c..133aca327045476929159c603d641c55b59b4d7b 100644
--- a/src/backend/storage/file/compress_zlib.c
+++ b/src/backend/storage/file/compress_zlib.c
@@ -59,7 +59,7 @@ bfz_zlib_write_ex(bfz_t *thiz, const char *buffer, int size)
 {
 	struct bfz_zlib_freeable_stuff *fs = (void *) thiz->freeable_stuff;
 
-	ssize_t written = gfile_write(fs->gfile, buffer, size);
+	ssize_t written = gfile_write(fs->gfile, (void *)buffer, size);
 	if (written < 0)
 	{
 		ereport(ERROR,