diff --git a/contrib/dblink/dblink.cpp b/contrib/dblink/dblink.cpp
index 01586432b..6598bc845 100755
--- a/contrib/dblink/dblink.cpp
+++ b/contrib/dblink/dblink.cpp
@@ -35,7 +35,7 @@
 
 #include <limits.h>
 
-#include "libpq-fe.h"
+#include "libpq/libpq-fe.h"
 #include "funcapi.h"
 #include "catalog/indexing.h"
 #include "catalog/namespace.h"
@@ -2520,8 +2520,8 @@ static int applyRemoteGucs(PGconn* conn)
 {
     static const char* const GUCsAffectingIO[] = {"DateStyle", "IntervalStyle"};
 
-    int nestlevel = -1;
-    int i;
+    int 	nestlevel = -1;
+    uint32	i;
 
     for (i = 0; i < lengthof(GUCsAffectingIO); i++) {
         const char* gucName = GUCsAffectingIO[i];