From 55e81ce23d0ba295a86c8ea2e786b1426894d5b3 Mon Sep 17 00:00:00 2001
From: Matthew Seaman <m.seaman@infracaninophile.co.uk>
Date: Sat, 26 Mar 2016 12:26:18 +0000
Subject: [PATCH 1/3] Add sys/stat.h include to files using S_IRUSR and S_IWUSR
 macros.

---
 src/backend/distributed/executor/multi_real_time_executor.c    | 1 +
 src/backend/distributed/executor/multi_task_tracker_executor.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/backend/distributed/executor/multi_real_time_executor.c b/src/backend/distributed/executor/multi_real_time_executor.c
index 51af20ad7..665276ca8 100644
--- a/src/backend/distributed/executor/multi_real_time_executor.c
+++ b/src/backend/distributed/executor/multi_real_time_executor.c
@@ -19,6 +19,7 @@
 #include "postgres.h"
 #include "miscadmin.h"
 
+#include <sys/stat.h>
 #include <unistd.h>
 
 #include "commands/dbcommands.h"
diff --git a/src/backend/distributed/executor/multi_task_tracker_executor.c b/src/backend/distributed/executor/multi_task_tracker_executor.c
index e0acb43ff..fd0638741 100644
--- a/src/backend/distributed/executor/multi_task_tracker_executor.c
+++ b/src/backend/distributed/executor/multi_task_tracker_executor.c
@@ -20,6 +20,7 @@
 #include "postgres.h"
 #include "miscadmin.h"
 
+#include <sys/stat.h>
 #include <unistd.h>
 
 #include "commands/dbcommands.h"

From 897a1126e73d13a6f48032e7d4ac404d4d4d1177 Mon Sep 17 00:00:00 2001
From: Matthew Seaman <m.seaman@infracaninophile.co.uk>
Date: Sat, 26 Mar 2016 12:33:07 +0000
Subject: [PATCH 2/3] Include appropriate headers for htons() and htonl().

---
 src/backend/distributed/worker/worker_partition_protocol.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/backend/distributed/worker/worker_partition_protocol.c b/src/backend/distributed/worker/worker_partition_protocol.c
index f2d5fa1cc..d391fd1fa 100644
--- a/src/backend/distributed/worker/worker_partition_protocol.c
+++ b/src/backend/distributed/worker/worker_partition_protocol.c
@@ -17,11 +17,13 @@
 #include "postgres.h"
 #include "funcapi.h"
 
-#include <sys/stat.h>
-#include <unistd.h>
+#include <arpa/inet.h>
 #ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
 #endif
+#include <netinet/in.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #include "access/hash.h"
 #include "access/htup_details.h"

From b1a3801e589c242102bf6a8c192073f2983de6ed Mon Sep 17 00:00:00 2001
From: Matthew Seaman <m.seaman@infracaninophile.co.uk>
Date: Wed, 30 Mar 2016 12:20:35 +0100
Subject: [PATCH 3/3] Regularize include paths for some postgresql headers.

Addresses #411
---
 src/backend/distributed/test/connection_utils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/backend/distributed/test/connection_utils.c b/src/backend/distributed/test/connection_utils.c
index b5048ccdd..e944c1f87 100644
--- a/src/backend/distributed/test/connection_utils.c
+++ b/src/backend/distributed/test/connection_utils.c
@@ -13,9 +13,9 @@
  *-------------------------------------------------------------------------
  */
 
-#include "internal/c.h"
+#include "c.h"
 #include "libpq-fe.h"
-#include "internal/libpq-int.h"
+#include "libpq-int.h"
 
 #include "distributed/test_helper_functions.h"