diff --git a/src/backend/port/Makefile b/src/backend/port/Makefile
index 8ebb6d5703..2560d6b16e 100644
--- a/src/backend/port/Makefile
+++ b/src/backend/port/Makefile
@@ -23,6 +23,10 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS = dynloader.o pg_sema.o pg_shmem.o pg_latch.o $(TAS)
 
+ifneq (,$(filter $(PORTNAME),cygwin win32))
+OBJS += pipe.o
+endif
+
 ifeq ($(PORTNAME), darwin)
 SUBDIRS += darwin
 endif
diff --git a/src/port/pipe.c b/src/backend/port/pipe.c
similarity index 96%
rename from src/port/pipe.c
rename to src/backend/port/pipe.c
index 95839c6583..eeed3fc2e1 100644
--- a/src/port/pipe.c
+++ b/src/backend/port/pipe.c
@@ -10,16 +10,12 @@
  *	must be replaced with recv/send.
  *
  * IDENTIFICATION
- *	  src/port/pipe.c
+ *	  src/backend/port/pipe.c
  *
  *-------------------------------------------------------------------------
  */
 
-#ifndef FRONTEND
 #include "postgres.h"
-#else
-#include "postgres_fe.h"
-#endif
 
 #ifdef WIN32
 int
diff --git a/src/port/Makefile b/src/port/Makefile
index c005140f83..60295dcdef 100644
--- a/src/port/Makefile
+++ b/src/port/Makefile
@@ -34,10 +34,6 @@ OBJS = $(LIBOBJS) chklocale.o dirmod.o exec.o inet_net_ntop.o noblock.o \
 	path.o pgcheckdir.o pgmkdirp.o pgsleep.o pgstrcasecmp.o \
 	qsort.o qsort_arg.o sprompt.o thread.o
 
-ifneq (,$(filter $(PORTNAME),cygwin win32))
-OBJS += pipe.o
-endif
-
 # foo_srv.o and foo.o are both built from foo.c, but only foo.o has -DFRONTEND
 OBJS_SRV = $(OBJS:%.o=%_srv.o)