diff --git a/include.h b/include.h
index 846cae0..ddffcc5 100644
--- a/include.h
+++ b/include.h
@@ -7,9 +7,6 @@
 #include <postgres.h>
 
 #include <executor/spi.h>
-#if PG_VERSION_NUM < 90600
-#include "latch.h"
-#endif
 #if PG_VERSION_NUM < 90500
 #include <lib/stringinfo.h>
 #endif
diff --git a/latch.c b/latch.c
index 2510c8a..4020390 100644
--- a/latch.c
+++ b/latch.c
@@ -1,5 +1,6 @@
 #include "include.h"
 #if PG_VERSION_NUM < 90600
+#include "latch.h"
 /*-------------------------------------------------------------------------
  *
  * latch.c
diff --git a/work.c b/work.c
index e8aa2e1..e1eefb1 100644
--- a/work.c
+++ b/work.c
@@ -11,6 +11,9 @@
 #if PG_VERSION_NUM < 130000
 #include <catalog/pg_type.h>
 #endif
+#if PG_VERSION_NUM < 90600
+#include "latch.h"
+#endif
 #include <libpq/libpq-be.h>
 #if PG_VERSION_NUM < 130000
 #include <miscadmin.h>