diff --git a/contrib/gms_tcp/gms_tcp.cpp b/contrib/gms_tcp/gms_tcp.cpp
index 93093b08751b188df3884572f27243e47bc2362b..d61b892b654cbdaf696298a8a31074e7c08d5058 100644
--- a/contrib/gms_tcp/gms_tcp.cpp
+++ b/contrib/gms_tcp/gms_tcp.cpp
@@ -712,7 +712,7 @@ gms_tcp_encode_data_by_charset(GMS_TCP_CONNECTION_STATE *c_state, GMS_TCP_CONNEC
         cd = iconv_open(client_encoding_name, c_state->c_info.charset);
     }
 
-    if (cd < 0) {
+    if (cd < (iconv_t)0) {
         return NULL;
     }
 
diff --git a/src/gausskernel/optimizer/commands/sequence/sequence.cpp b/src/gausskernel/optimizer/commands/sequence/sequence.cpp
index edb1a5f49b933f28479db1cb02196ce1c323c291..434d81128d5b244998628e90fd8ac240019a1a05 100644
--- a/src/gausskernel/optimizer/commands/sequence/sequence.cpp
+++ b/src/gausskernel/optimizer/commands/sequence/sequence.cpp
@@ -781,7 +781,7 @@ static T_Int FetchLogLocal(T_Int* next, T_Int* result, T_Int* last, T_Int maxv,
 }
 
 template<typename T, bool large>
-static Datum GetIntDefVal(TypeName* name, T value)
+static Datum GetIntDefVal(TypeName** name, T value)
 {
     if (large) {
         *name = makeTypeNameFromOid(INT16OID, -1);
diff --git a/src/include/client_logic/cstrings_map.h b/src/include/client_logic/cstrings_map.h
index b5f4875799427e71ac8bdde3667e12f3457366db..f2a3381116e0804abfea46b5fe9368140f4f35d7 100644
--- a/src/include/client_logic/cstrings_map.h
+++ b/src/include/client_logic/cstrings_map.h
@@ -25,6 +25,7 @@
 #define C_STRINGS_MAP_H
 #include <cstdio>
 #include <string>
+#include <cstdint>
 
 #define MAX_VAL_LEN 1024
 #define NAMEDATALEN 64
diff --git a/src/include/knl/knl_instance.h b/src/include/knl/knl_instance.h
index 8a8538370aa1d93846ab108e3a4536e172d00245..ab69fe563de3711aa472a08a5aa82c4e9e6086c9 100755
--- a/src/include/knl/knl_instance.h
+++ b/src/include/knl/knl_instance.h
@@ -81,6 +81,14 @@
 #include "access/htap/imcstore_delta.h"
 #endif
 
+#ifdef KRB5
+#include <krb5.h>
+/* Some old versions of Kerberos do not include <com_err.h> in <krb5.h> */
+#if !defined(__COM_ERR_H) && !defined(__COM_ERR_H__)
+#include <com_err.h>
+#endif
+#endif /* KRB5 */
+
 const int NUM_PERCENTILE_COUNT = 2;
 const int INIT_NUMA_ALLOC_COUNT = 32;
 const int HOTKEY_ABANDON_LENGTH = 100;