REORG: include: move spoe.h to haproxy/spoe{,-t}.h
Only minor change was to make sure all defines were before the structs
in spoe-t.h, everything else went smoothly.
diff --git a/contrib/mod_defender/defender.c b/contrib/mod_defender/defender.c
index 8bc3e97..5e759b5 100644
--- a/contrib/mod_defender/defender.c
+++ b/contrib/mod_defender/defender.c
@@ -21,10 +21,9 @@
#include <haproxy/api.h>
#include <haproxy/tools.h>
#include <haproxy/chunk.h>
+#include <haproxy/spoe.h>
#include <haproxy/time.h>
-#include <proto/spoe.h>
-
#include <http_core.h>
#include <http_main.h>
#include <http_log.h>
diff --git a/contrib/mod_defender/spoa.c b/contrib/mod_defender/spoa.c
index b4c990b..35b3dd8 100644
--- a/contrib/mod_defender/spoa.c
+++ b/contrib/mod_defender/spoa.c
@@ -33,8 +33,7 @@
#include <haproxy/list.h>
#include <haproxy/chunk.h>
-
-#include <proto/spoe.h>
+#include <haproxy/spoe.h>
#include "spoa.h"
#include "defender.h"
diff --git a/contrib/modsecurity/modsec_wrapper.c b/contrib/modsecurity/modsec_wrapper.c
index 7407674..b5840c3 100644
--- a/contrib/modsecurity/modsec_wrapper.c
+++ b/contrib/modsecurity/modsec_wrapper.c
@@ -19,12 +19,12 @@
#include <haproxy/global.h>
#include <haproxy/hlua.h>
#include <haproxy/log.h>
+#include <haproxy/spoe.h>
#include <haproxy/time.h>
#include <types/stream.h>
#include <haproxy/arg.h>
-#include <proto/spoe.h>
#include <api.h>
diff --git a/contrib/modsecurity/spoa.c b/contrib/modsecurity/spoa.c
index b9d61ed..2c0b545 100644
--- a/contrib/modsecurity/spoa.c
+++ b/contrib/modsecurity/spoa.c
@@ -38,8 +38,7 @@
#include <haproxy/list.h>
#include <haproxy/chunk.h>
-
-#include <proto/spoe.h>
+#include <haproxy/spoe.h>
#include "spoa.h"
#include "modsec_wrapper.h"