diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h
index c831662b1..92eb298fa 100644
--- a/src/include/utils/elog.h
+++ b/src/include/utils/elog.h
@@ -4,7 +4,7 @@
  *	  POSTGRES error reporting/logging definitions.
  *
  *
- * Portions Copyright (c) 2003-2023, PgPool Global Development Group
+ * Portions Copyright (c) 2003-2024, PgPool Global Development Group
  * Portions Copyright (c) 1996-2013, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
diff --git a/src/include/utils/fe_ports.h b/src/include/utils/fe_ports.h
index eff29a9fb..1eb6797ea 100644
--- a/src/include/utils/fe_ports.h
+++ b/src/include/utils/fe_ports.h
@@ -5,7 +5,7 @@
  * pgpool: a language independent connection pool server for PostgreSQL
  * written by Tatsuo Ishii
  *
- * Copyright (c) 2003-2023	PgPool Global Development Group
+ * Copyright (c) 2003-2024	PgPool Global Development Group
  *
  * Permission to use, copy, modify, and distribute this software and
  * its documentation for any purpose and without fee is hereby
@@ -39,17 +39,17 @@
 extern char *simple_prompt(const char *prompt, int maxlen, bool echo);
 extern int	_fe_error_level;
 
-void	   *pg_malloc(size_t size);
+void	   *pg_malloc(Size size);
 
 void	   *pg_malloc0(size_t size);
-void	   *pg_realloc(void *ptr, size_t size);
+void	   *pg_realloc(void *ptr, Size size);
 char	   *pg_strdup(const char *in);
 void		pg_free(void *ptr);
-void	   *palloc(unsigned int size);
-void	   *palloc0(unsigned int size);
+void	   *palloc(Size size);
+void	   *palloc0(Size size);
 void		pfree(void *pointer);
 char	   *pstrdup(const char *in);
-void	   *repalloc(void *pointer, unsigned int size);
+void	   *repalloc(void *pointer, Size size);
 
 #ifdef __GNUC__
 extern int
@@ -69,8 +69,8 @@ extern int	errdetail(const char *fmt,...);
 extern void errmsg(const char *fmt,...);
 #endif
 
-extern int errstart(int elevel, const char *filename, int lineno,
-		 const char *funcname);
+extern bool errstart(int elevel, const char *filename, int lineno,
+					const char *funcname, const char *domain);
 extern void errfinish(int dummy,...);
 
 /*
@@ -133,7 +133,7 @@ extern void errfinish(int dummy,...);
 do { \
 	const int elevel_ = (elevel); \
 	_fe_error_level = elevel_; \
-	if (errstart(elevel_, __FILE__, __LINE__, __FUNCTION__)) \
+	if (errstart(elevel_, __FILE__, __LINE__, __FUNCTION__, "")) \
 		rest; \
 	if (elevel_ >= ERROR  && elevel_ != FRONTEND_ONLY_ERROR) \
 		exit(-1); \
diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h
index 2ed586ed0..bf6cdb2ef 100644
--- a/src/include/utils/palloc.h
+++ b/src/include/utils/palloc.h
@@ -18,7 +18,7 @@
  * everything that should be freed.  See utils/mmgr/README for more info.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/palloc.h
@@ -61,7 +61,7 @@ typedef struct MemoryContextCallback
  * Avoid accessing it directly!  Instead, use MemoryContextSwitchTo()
  * to change the setting.
  */
-extern PGDLLIMPORT MemoryContext CurrentMemoryContext;
+extern MemoryContext CurrentMemoryContext;
 
 /*
  * Flags for MemoryContextAllocExtended.
diff --git a/src/tools/fe_memutils.c b/src/tools/fe_memutils.c
index 0f6ccb314..0938f1755 100644
--- a/src/tools/fe_memutils.c
+++ b/src/tools/fe_memutils.c
@@ -3,7 +3,7 @@
  * fe_memutils.c
  *	  memory management support for frontend code
  *
- * Portions Copyright (c) 1996-2013, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -23,7 +23,7 @@
 #include "utils/fe_ports.h"
 
 void *
-pg_malloc(size_t size)
+pg_malloc(Size size)
 {
 	void	   *tmp;
 
@@ -40,7 +40,7 @@ pg_malloc(size_t size)
 }
 
 void *
-pg_malloc0(size_t size)
+pg_malloc0(Size size)
 {
 	void	   *tmp;
 
@@ -50,7 +50,7 @@ pg_malloc0(size_t size)
 }
 
 void *
-pg_realloc(void *ptr, size_t size)
+pg_realloc(void *ptr, Size size)
 {
 	void	   *tmp;
 
@@ -101,13 +101,13 @@ pg_free(void *ptr)
  * programs that compile backend files.
  */
 void *
-palloc(unsigned int size)
+palloc(Size size)
 {
 	return pg_malloc(size);
 }
 
 void *
-palloc0(unsigned int size)
+palloc0(Size size)
 {
 	return pg_malloc0(size);
 }
@@ -125,7 +125,7 @@ pstrdup(const char *in)
 }
 
 void *
-repalloc(void *pointer, unsigned int size)
+repalloc(void *pointer, Size size)
 {
 	return pg_realloc(pointer, size);
 }
diff --git a/src/tools/fe_port.c b/src/tools/fe_port.c
index 881cd1dbe..3704c2730 100644
--- a/src/tools/fe_port.c
+++ b/src/tools/fe_port.c
@@ -2,7 +2,7 @@
  * pgpool: a language independent connection pool server for PostgreSQL
  * written by Tatsuo Ishii
  *
- * Copyright (c) 2003-2023	PgPool Global Development Group
+ * Copyright (c) 2003-2024	PgPool Global Development Group
  *
  * Permission to use, copy, modify, and distribute this software and
  * its documentation for any purpose and without fee is hereby
@@ -162,9 +162,8 @@ nowsec(void)
 	return strbuf;
 }
 
-int
-errstart(int elevel, const char *filename, int lineno,
-		 const char *funcname)
+bool errstart(int elevel, const char *filename, int lineno,
+		 const char *funcname, const char *domain)
 {
 	_fe_error_level = elevel;