diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index a9f440b8569780be33b0895d3f7a45cb18917b51..3f50a2f84337dfcf9b4a7d391a5c9877ce2af0df 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -9003,8 +9003,8 @@ RecoveryRestartPoint(const CheckPoint *checkPoint)
 {
 //	int			elapsed_secs;
 	int			rmid;
-	uint _logId = 0;
-	uint _logSeg = 0;
+	uint32 _logId = 0;
+	uint32 _logSeg = 0;
 
 	/* use volatile pointer to prevent code rearrangement */
 	volatile XLogCtlData *xlogctl = XLogCtl;
diff --git a/src/backend/cdb/cdbtm.c b/src/backend/cdb/cdbtm.c
index 30c607a45d70fde346527e3cdcb21048683bb400..e9912472c24e5fdf0c447cc74215690362a100a8 100644
--- a/src/backend/cdb/cdbtm.c
+++ b/src/backend/cdb/cdbtm.c
@@ -4460,7 +4460,7 @@ performDtxProtocolCommand(DtxProtocolCommand dtxProtocolCommand,
 						gid, contextInfo->nestingLevel, GetCurrentTransactionNestLevel())));
 			}
 			
-			uint i = GetCurrentTransactionNestLevel() - contextInfo->nestingLevel;
+			unsigned int i = GetCurrentTransactionNestLevel() - contextInfo->nestingLevel;
 			while (i > 0)
 			{
 				RollbackAndReleaseCurrentSubTransaction();
diff --git a/src/backend/gpopt/gpdbwrappers.cpp b/src/backend/gpopt/gpdbwrappers.cpp
index 9ed8c7fe17fc3eef31e8256a2327b34d78b39123..3a29c69fe7041be81a9dbf4a3fd9d8816572062e 100644
--- a/src/backend/gpopt/gpdbwrappers.cpp
+++ b/src/backend/gpopt/gpdbwrappers.cpp
@@ -1239,7 +1239,7 @@ gpdb::FCastFunc
 	return false;
 }
 
-uint
+unsigned int
 gpdb::UlCmpt
 	(
 	Oid oidOp,
@@ -1261,7 +1261,7 @@ gpdb::OidScCmp
 	(
 	Oid oidLeft, 
 	Oid oidRight,
-	uint ulCmpt
+	unsigned int ulCmpt
 	)
 {
 	GP_WRAP_START;
diff --git a/src/backend/utils/mmgr/test/memaccounting_test.c b/src/backend/utils/mmgr/test/memaccounting_test.c
index 4c22495d33cf217f460476f2ecbc7dc8dde5a9cf..55b42ba9273705dac8b762cb376c0fd04adb21e4 100755
--- a/src/backend/utils/mmgr/test/memaccounting_test.c
+++ b/src/backend/utils/mmgr/test/memaccounting_test.c
@@ -1198,7 +1198,7 @@ test__MemoryAccounting_Serialize_Deserialize__Validate(void **state)
 	StringInfoData buffer;
     initStringInfo(&buffer);
 
-    uint totalSerialized = MemoryAccounting_Serialize(&buffer);
+    uint32 totalSerialized = MemoryAccounting_Serialize(&buffer);
 
     /*
      * We haven't created any new account, so we should have
diff --git a/src/bin/pg_dump/cdb/cdb_dump_util.c b/src/bin/pg_dump/cdb/cdb_dump_util.c
index 9a36ce1f3955fc0585295cd4f5c190053e3d2925..ea717a5cc1c4e3f6237ce722790c9944b435ddeb 100644
--- a/src/bin/pg_dump/cdb/cdb_dump_util.c
+++ b/src/bin/pg_dump/cdb/cdb_dump_util.c
@@ -1688,7 +1688,7 @@ initDDSystem(ddp_inst_desc_t *ddp_inst, ddp_conn_desc_t *ddp_conn, ddp_client_in
             bool createStorageUnit, char **default_backup_directory, bool remote)
 {
 	int err = DD_ERR_NONE;
-	uint POOL_SIZE = DDBOOST_POOL_SIZE;
+	unsigned int POOL_SIZE = DDBOOST_POOL_SIZE;
 	char *storage_unit_name = NULL;
 	char *dd_boost_username = NULL;
 	char *dd_boost_passwd = NULL;
diff --git a/src/include/cdb/cdbinterconnect.h b/src/include/cdb/cdbinterconnect.h
index 642b1974e56e4c66734100f4dc680fc191dc1606..38f10fde5da6dc5db6a9fc8b1a4cce0ef7b82b7b 100644
--- a/src/include/cdb/cdbinterconnect.h
+++ b/src/include/cdb/cdbinterconnect.h
@@ -414,14 +414,14 @@ typedef struct MotionNodeEntry
 	 * Variable that records the total number of senders to this motion node.
 	 * This is expected to always be (number of qExecs).
 	 */
-	uint            num_senders;
+	uint32          num_senders;
 
 	/*
 	 * Variable that tracks number of senders that have reported end-of-stream
 	 * for this motion node.  When the local node sends end-of-stream, that is
 	 * also recorded.
 	 */
-	uint            num_stream_ends_recvd;
+	uint32          num_stream_ends_recvd;
 
 	bool            cleanedUp;
 	bool            valid;
diff --git a/src/include/cdb/htupfifo.h b/src/include/cdb/htupfifo.h
index d4f7fdd2c536ba72a528a75548f831e41208ebac..f4e3dbf196e042391dfe730778f8f17437ef1b1b 100644
--- a/src/include/cdb/htupfifo.h
+++ b/src/include/cdb/htupfifo.h
@@ -16,11 +16,6 @@
 #ifndef HTUPFIFO_H
 #define HTUPFIFO_H
 
-#ifdef WIN32
-typedef unsigned int uint;
-#endif
-
-
 /* An entry in the HeapTuple FIFO.	Entries are formed into queues. */
 typedef struct htf_entry_data
 {
@@ -57,7 +52,7 @@ typedef struct htup_fifo_state
 	 * The maximum size that the FIFO is allowed to grow to, in bytes, before
 	 * it will cause an error to be reported.
 	 */
-	uint		max_mem_size;
+	uint32		max_mem_size;
 
 }	htup_fifo_state, *htup_fifo;
 
diff --git a/src/include/gpopt/gpdbwrappers.h b/src/include/gpopt/gpdbwrappers.h
index c2623010fadd7bbc6c8427f85e0d557ba4c2965e..621ea17f8163f85ca1f9dfd1ab8b7a8ae7ba52cc 100644
--- a/src/include/gpopt/gpdbwrappers.h
+++ b/src/include/gpopt/gpdbwrappers.h
@@ -248,10 +248,10 @@ namespace gpdb {
 	bool FCastFunc(Oid oidSrc, Oid oidDest, bool *is_binary_coercible, Oid *oidCastFunc);
 	
 	// get type of operator
-	uint UlCmpt(Oid oidOp, Oid oidLeft, Oid oidRight);
+	unsigned int UlCmpt(Oid oidOp, Oid oidLeft, Oid oidRight);
 	
 	// get scalar comparison between given types
-	Oid OidScCmp(Oid oidLeft, Oid oidRight, uint ulCmpt);
+	Oid OidScCmp(Oid oidLeft, Oid oidRight, unsigned int ulCmpt);
 
 	// get equality operator for given type
 	Oid OidEqualityOp(Oid oidType);