diff --git a/src/interfaces/ecpg/compatlib/informix.c b/src/interfaces/ecpg/compatlib/informix.c
index 889faf5440..157809de22 100644
--- a/src/interfaces/ecpg/compatlib/informix.c
+++ b/src/interfaces/ecpg/compatlib/informix.c
@@ -287,7 +287,10 @@ int
 dectoasc(Decimal *np, char *cp, int len, int right)
 {
 	char *str;
-	Numeric *nres;
+	Numeric *nres = PGTYPESnumeric_new();
+
+	if (nres == NULL)
+		return -1211;
 
 	if (PGTYPESnumeric_from_decimal(np, nres) != 0)
 		return -1211;
diff --git a/src/interfaces/ecpg/pgtypeslib/common.c b/src/interfaces/ecpg/pgtypeslib/common.c
index 0be74b21df..03a45870c0 100644
--- a/src/interfaces/ecpg/pgtypeslib/common.c
+++ b/src/interfaces/ecpg/pgtypeslib/common.c
@@ -1,7 +1,4 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
+#include "postgres_fe.h"
 
 #include "extern.h"
 
diff --git a/src/interfaces/ecpg/pgtypeslib/datetime.c b/src/interfaces/ecpg/pgtypeslib/datetime.c
index e0354abf2d..9811571afc 100644
--- a/src/interfaces/ecpg/pgtypeslib/datetime.c
+++ b/src/interfaces/ecpg/pgtypeslib/datetime.c
@@ -1,10 +1,8 @@
-#include <ctype.h>
-#include <errno.h>
+#include "postgres_fe.h"
+
 #include <time.h>
+#include <ctype.h>
 #include <float.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 
 #include "extern.h"
 #include "dt.h"
diff --git a/src/interfaces/ecpg/pgtypeslib/dt_common.c b/src/interfaces/ecpg/pgtypeslib/dt_common.c
index c610163d3b..8d41d6f1e0 100644
--- a/src/interfaces/ecpg/pgtypeslib/dt_common.c
+++ b/src/interfaces/ecpg/pgtypeslib/dt_common.c
@@ -1,10 +1,7 @@
-#include <ctype.h>
-#include <errno.h>
+#include "postgres_fe.h"
+
 #include <time.h>
-#include <float.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <ctype.h>
 #include <math.h>
 
 #include "extern.h"
@@ -1057,8 +1054,7 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct tm * tm, char **tzn)
 				 */
 				StrNCpy(*tzn, tm->tm_zone, MAXTZLEN + 1);
 				if (strlen(tm->tm_zone) > MAXTZLEN)
-					elog(WARNING, "Invalid timezone \'%s\'",
-						 tm->tm_zone);
+					tm->tm_isdst = -1;
 		}
 	}
 	else
@@ -1077,8 +1073,7 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct tm * tm, char **tzn)
 				 */
 				StrNCpy(*tzn, tzname[tm->tm_isdst], MAXTZLEN + 1);
 				if (strlen(tzname[tm->tm_isdst]) > MAXTZLEN)
-					elog(WARNING, "Invalid timezone \'%s\'",
-						 tzname[tm->tm_isdst]);
+					tm->tm_isdst = -1;
 			}
 	}
 	else
diff --git a/src/interfaces/ecpg/pgtypeslib/interval.c b/src/interfaces/ecpg/pgtypeslib/interval.c
index 361eb08610..0646f480f4 100644
--- a/src/interfaces/ecpg/pgtypeslib/interval.c
+++ b/src/interfaces/ecpg/pgtypeslib/interval.c
@@ -1,10 +1,6 @@
-#include <math.h>
+#include "postgres_fe.h"
 #include <time.h>
-#include <string.h>
-#include <errno.h>
-#include <float.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <math.h>
 
 #ifdef __FAST_MATH__
 #error -ffast-math is known to break this code
diff --git a/src/interfaces/ecpg/pgtypeslib/numeric.c b/src/interfaces/ecpg/pgtypeslib/numeric.c
index b2b1e9e612..2e18cffcd3 100644
--- a/src/interfaces/ecpg/pgtypeslib/numeric.c
+++ b/src/interfaces/ecpg/pgtypeslib/numeric.c
@@ -1,11 +1,5 @@
+#include "postgres_fe.h"
 #include <ctype.h>
-#include <float.h>
-#include <limits.h>
-#include <math.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
 
 #include "extern.h"
 #include "pgtypes_error.h"
diff --git a/src/interfaces/ecpg/pgtypeslib/timestamp.c b/src/interfaces/ecpg/pgtypeslib/timestamp.c
index 08d5db19e9..6bc2d5e5ad 100644
--- a/src/interfaces/ecpg/pgtypeslib/timestamp.c
+++ b/src/interfaces/ecpg/pgtypeslib/timestamp.c
@@ -1,9 +1,7 @@
-#include <math.h>
+#include "postgres_fe.h"
 #include <time.h>
-#include <string.h>
-#include <errno.h>
 #include <float.h>
-#include <stdio.h>
+#include <math.h>
 
 #ifdef __FAST_MATH__
 #error -ffast-math is known to break this code