6 files changed, 15 insertions, 16 deletions
diff --git a/src/interfaces/ecpg/pgtypeslib/datetime.c b/src/interfaces/ecpg/pgtypeslib/datetime.c
index 1249a606fdb..e0354abf2df 100644
--- a/src/interfaces/ecpg/pgtypeslib/datetime.c
+++ b/src/interfaces/ecpg/pgtypeslib/datetime.c
@@ -6,8 +6,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "dt.h"
 #include "extern.h"
+#include "dt.h"
 #include "pgtypes_error.h"
 #include "pgtypes_date.h"
 
diff --git a/src/interfaces/ecpg/pgtypeslib/dt.h b/src/interfaces/ecpg/pgtypeslib/dt.h
index 2294cb2a8e8..ce40bf9a759 100644
--- a/src/interfaces/ecpg/pgtypeslib/dt.h
+++ b/src/interfaces/ecpg/pgtypeslib/dt.h
@@ -15,18 +15,6 @@ typedef double fsec_t;
 #define JROUND(j) (rint(((double) (j))*TIME_PREC_INV)/TIME_PREC_INV)
 #endif
 
-#ifndef bool
-#define bool char
-#endif   /* ndef bool */
-
-#ifndef FALSE
-#define FALSE   0
-#endif   /* FALSE */
-
-#ifndef TRUE
-#define TRUE       1
-#endif  /* TRUE */
-
 #define USE_POSTGRES_DATES              0
 #define USE_ISO_DATES                   1
 #define USE_SQL_DATES                   2
diff --git a/src/interfaces/ecpg/pgtypeslib/dt_common.c b/src/interfaces/ecpg/pgtypeslib/dt_common.c
index 229ec270a0c..c610163d3b9 100644
--- a/src/interfaces/ecpg/pgtypeslib/dt_common.c
+++ b/src/interfaces/ecpg/pgtypeslib/dt_common.c
@@ -7,8 +7,8 @@
 #include <string.h>
 #include <math.h>
 
-#include "dt.h"
 #include "extern.h"
+#include "dt.h"
 
 static int day_tab[2][13] = {
 	        {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 0},
diff --git a/src/interfaces/ecpg/pgtypeslib/extern.h b/src/interfaces/ecpg/pgtypeslib/extern.h
index 222128767bb..90125ffd452 100644
--- a/src/interfaces/ecpg/pgtypeslib/extern.h
+++ b/src/interfaces/ecpg/pgtypeslib/extern.h
@@ -35,6 +35,17 @@ int pgtypes_fmt_replace(union un_fmt_replace, int, char**, int*);
 char *pgtypes_alloc(long);
 char *pgtypes_strdup(char *);
 
+#ifndef bool
+#define bool char
+#endif   /* ndef bool */
+
+#ifndef FALSE
+#define FALSE   0
+#endif   /* FALSE */
+
+#ifndef TRUE
+#define TRUE       1
+#endif  /* TRUE */
 
 #endif /* __PGTYPES_COMMON_H__ */
 
diff --git a/src/interfaces/ecpg/pgtypeslib/interval.c b/src/interfaces/ecpg/pgtypeslib/interval.c
index 62a3141a4ed..361eb086102 100644
--- a/src/interfaces/ecpg/pgtypeslib/interval.c
+++ b/src/interfaces/ecpg/pgtypeslib/interval.c
@@ -10,8 +10,8 @@
 #error -ffast-math is known to break this code
 #endif
 
-#include "dt.h"
 #include "extern.h"
+#include "dt.h"
 #include "pgtypes_error.h"
 #include "pgtypes_interval.h"
 #include "datetime.h"
diff --git a/src/interfaces/ecpg/pgtypeslib/timestamp.c b/src/interfaces/ecpg/pgtypeslib/timestamp.c
index 59449941eaf..e65929b0d26 100644
--- a/src/interfaces/ecpg/pgtypeslib/timestamp.c
+++ b/src/interfaces/ecpg/pgtypeslib/timestamp.c
@@ -9,8 +9,8 @@
 #error -ffast-math is known to break this code
 #endif
 
-#include "dt.h"
 #include "extern.h"
+#include "dt.h"
 #include "pgtypes_timestamp.h"
 #include "pgtypes_date.h"
 #include "datetime.h"