diff -Naruw a/contrib/adminpack/Makefile b/contrib/adminpack/Makefile
--- a/contrib/adminpack/Makefile	2013-06-24 18:55:41.000000000 +0000
+++ b/contrib/adminpack/Makefile	2013-07-02 11:48:44.485660773 +0000
@@ -2,7 +2,7 @@
 
 MODULE_big = adminpack
 OBJS = adminpack.o
-PG_CPPFLAGS = -I$(libpq_srcdir)
+PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/
 
 EXTENSION = adminpack
 DATA = adminpack--1.0.sql
diff -Naruw a/contrib/dblink/Makefile b/contrib/dblink/Makefile
--- a/contrib/dblink/Makefile	2013-06-24 18:55:41.000000000 +0000
+++ b/contrib/dblink/Makefile	2013-07-02 11:49:29.708947869 +0000
@@ -2,7 +2,7 @@
 
 MODULE_big = dblink
 OBJS	= dblink.o
-PG_CPPFLAGS = -I$(libpq_srcdir)
+PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/
 SHLIB_LINK = $(libpq)
 SHLIB_PREREQS = submake-libpq
 
diff -Naruw a/contrib/Makefile b/contrib/Makefile
--- a/contrib/Makefile	2013-06-24 18:55:41.000000000 +0000
+++ b/contrib/Makefile	2013-07-02 11:50:20.868133459 +0000
@@ -26,7 +26,6 @@
 		isn		\
 		lo		\
 		ltree		\
-		oid2name	\
 		pageinspect	\
 		passwordcheck	\
 		pg_archivecleanup \
@@ -39,7 +38,6 @@
 		pg_trgm		\
 		pg_upgrade	\
 		pg_upgrade_support \
-		pgbench		\
 		pgcrypto	\
 		pgrowlocks	\
 		pgstattuple	\
@@ -52,7 +50,6 @@
 		test_parser	\
 		tsearch2	\
 		unaccent	\
-		vacuumlo	\
 		worker_spi
 
 ifeq ($(with_openssl),yes)
diff -Naruw a/contrib/uuid-ossp/Makefile b/contrib/uuid-ossp/Makefile
--- a/contrib/uuid-ossp/Makefile	2013-06-24 18:55:41.000000000 +0000
+++ b/contrib/uuid-ossp/Makefile	2013-07-02 11:51:29.915023515 +0000
@@ -6,7 +6,7 @@
 EXTENSION = uuid-ossp
 DATA = uuid-ossp--1.0.sql uuid-ossp--unpackaged--1.0.sql
 
-SHLIB_LINK += $(OSSP_UUID_LIBS)
+SHLIB_LINK += -lossp-uuid
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff -Naruw a/contrib/xml2/Makefile b/contrib/xml2/Makefile
--- a/contrib/xml2/Makefile	2013-06-24 18:55:41.000000000 +0000
+++ b/contrib/xml2/Makefile	2013-07-02 11:57:07.591066516 +0000
@@ -8,7 +8,8 @@
 
 REGRESS = xml2
 
-SHLIB_LINK += $(filter -lxslt, $(LIBS)) -lxml2
+PG_CPPFLAGS = $(shell xml2-config --cflags)
+SHLIB_LINK += $(shell xml2-config --libs) $(shell xslt-config --libs)
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff -Naruw a/GNUmakefile.in b/GNUmakefile.in
--- a/GNUmakefile.in	2013-06-24 18:55:41.000000000 +0000
+++ b/GNUmakefile.in	2013-07-02 11:58:45.762013959 +0000
@@ -8,7 +8,7 @@
 top_builddir = .
 include $(top_builddir)/src/Makefile.global
 
-$(call recurse,all install,src config)
+$(call recurse,all install,src)
 
 all:
 	+@echo "All of PostgreSQL successfully made. Ready to install."
@@ -16,7 +16,7 @@
 docs:
 	$(MAKE) -C doc all
 
-$(call recurse,world,doc src config contrib,all)
+$(call recurse,world,doc src contrib,all)
 world:
 	+@echo "PostgreSQL, contrib, and documentation successfully made. Ready to install."
 
@@ -32,14 +32,14 @@
 install-docs:
 	$(MAKE) -C doc install
 
-$(call recurse,install-world,doc src config contrib,install)
+$(call recurse,install-world,doc src contrib,install)
 install-world:
 	+@echo "PostgreSQL, contrib, and documentation installation complete."
 
 # build src/ before contrib/
 install-world-contrib-recurse: install-world-src-recurse
 
-$(call recurse,installdirs uninstall coverage init-po update-po,doc src config)
+$(call recurse,installdirs uninstall coverage init-po update-po,doc src)
 
 $(call recurse,distprep,doc src config contrib)
 
diff -Naruw a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
--- a/src/bin/initdb/Makefile	2013-06-24 18:55:41.000000000 +0000
+++ b/src/bin/initdb/Makefile	2013-07-02 11:59:27.689537553 +0000
@@ -16,7 +16,7 @@
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) -I$(top_srcdir)/src/timezone $(CPPFLAGS)
+override CPPFLAGS := -DFRONTEND -I$(top_srcdir)/src/interfaces/libpq -I$(top_srcdir)/src/timezone $(CPPFLAGS)
 
 # use system timezone data?
 ifneq (,$(with_system_tzdata))
diff -Naruw a/src/bin/Makefile b/src/bin/Makefile
--- a/src/bin/Makefile	2013-06-24 18:55:41.000000000 +0000
+++ b/src/bin/Makefile	2013-07-02 12:00:31.684783271 +0000
@@ -13,8 +13,7 @@
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
-SUBDIRS = initdb pg_ctl pg_dump \
-	psql scripts pg_config pg_controldata pg_resetxlog pg_basebackup
+SUBDIRS = initdb pg_ctl pg_controldata pg_resetxlog pg_basebackup
 
 ifeq ($(PORTNAME), win32)
 SUBDIRS += pgevent
diff -Naruw a/src/Makefile b/src/Makefile
--- a/src/Makefile	2013-06-24 18:55:41.000000000 +0000
+++ b/src/Makefile	2013-07-02 12:37:39.341299813 +0000
@@ -19,12 +19,9 @@
 	backend \
 	backend/utils/mb/conversion_procs \
 	backend/snowball \
-	include \
-	interfaces \
 	backend/replication/libpqwalreceiver \
 	bin \
 	pl \
-	makefiles \
 	test/regress
 
 # There are too many interdependencies between the subdirectories, so
@@ -33,7 +30,7 @@
 
 $(recurse)
 
-install: install-local
+install:
 
 install-local: installdirs-local
 	$(INSTALL_DATA) Makefile.global '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global'
diff -Naruw a/src/Makefile.global.in b/src/Makefile.global.in
--- a/src/Makefile.global.in	2013-06-24 18:55:41.000000000 +0000
+++ b/src/Makefile.global.in	2013-07-02 12:04:23.848715753 +0000
@@ -492,6 +492,7 @@
    LDFLAGS += $(PROFILE)
 endif
 
+CFLAGS += -I$(top_srcdir)/src/include
 
 ##########################################################################
 #
diff -Naruw a/src/port/Makefile b/src/port/Makefile
--- a/src/port/Makefile	2013-06-24 18:55:41.000000000 +0000
+++ b/src/port/Makefile	2013-07-02 12:05:34.221193705 +0000
@@ -39,11 +39,10 @@
 # foo_srv.o and foo.o are both built from foo.c, but only foo.o has -DFRONTEND
 OBJS_SRV = $(OBJS:%.o=%_srv.o)
 
-all: libpgport.a libpgport_srv.a
+all: libpgport_srv.a
 
 # libpgport is needed by some contrib
-install: all installdirs
-	$(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a'
+install:
 
 installdirs:
 	$(MKDIR_P) '$(DESTDIR)$(libdir)'