diff --git a/configure.ac b/configure.ac
index 546b534f8e4613f2cb5c64b28d08a8205b642274..61a7f3f204a4f3f3db44224d6e5d1f83ae6ce61b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -937,7 +937,8 @@ if test "$PG_CONFIG" != "" ; then
 
     PGSQL_CPPFLAGS=`$PG_CONFIG --cppflags`
     PGSQL_INCLUDEDIR=`$PG_CONFIG --includedir`
-    PGSQL_CPPFLAGS="$PGSQL_CPPFLAGS -I$PGSQL_INCLUDEDIR"
+    PGSQL_INCLUDEDIR_SERVER=`$PG_CONFIG --includedir-server`
+    PGSQL_CPPFLAGS="$PGSQL_CPPFLAGS -I$PGSQL_INCLUDEDIR -I$PGSQL_INCLUDEDIR_SERVER"
     PGSQL_LIBS=`$PG_CONFIG --libdir`
     PGSQL_LIBS="-L$PGSQL_LIBS -lpq"
     PGSQL_VERSION=`$PG_CONFIG --version`
diff --git a/src/lib/dhcpsrv/pgsql_lease_mgr.cc b/src/lib/dhcpsrv/pgsql_lease_mgr.cc
index 8bdf83999b949ae91a478027dd7c8dc7be2e7e64..f84f517dbf4b749bf460695e21f81308f6313e85 100644
--- a/src/lib/dhcpsrv/pgsql_lease_mgr.cc
+++ b/src/lib/dhcpsrv/pgsql_lease_mgr.cc
@@ -36,7 +36,7 @@
 // completion.  PostgreSQL deliberately omits this macro from errocodes.h
 // so callers can supply their own.
 #define MAKE_SQLSTATE(ch1,ch2,ch3,ch4,ch5) {ch1,ch2,ch3,ch4,ch5}
-#include <server/utils/errcodes.h>
+#include <utils/errcodes.h>
 const size_t STATECODE_LEN = 5;
 
 // Currently the only one we care to look for is duplicate key.