diff --git a/src/backend/commands/Makefile b/src/backend/commands/Makefile
index 9e57883debad4127d9d8b5dbb7ee2bfb0e0c9c49..6b8e06d93c9e64ea4e2256e7d17bef4b960ef603 100644
--- a/src/backend/commands/Makefile
+++ b/src/backend/commands/Makefile
@@ -4,16 +4,18 @@
 #    Makefile for commands
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.8 1997/12/04 00:26:44 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.9 1997/12/17 04:44:47 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR = ../..
 include ../../Makefile.global
 
-INCLUDE_OPT = -I.. \
-              -I../port/$(PORTNAME) \
-              -I../../include
+INCLUDE_OPT = -I.. 
+
+ifdef PORTNAME
+INCLUDE_OPT+=-I../port/$(PORTNAME) 
+endif
 
 CFLAGS+=$(INCLUDE_OPT)
 
diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index 42a607051f3d69ba37858fb5045edae07d9cc8b6..0ce2d6403cff8ce989c69ee6718248edd024e968 100644
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.25 1997/12/06 22:56:24 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.26 1997/12/17 04:44:49 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -82,7 +82,9 @@
 #include <commands/async.h>
 #include <libpq/libpq.h>
 
-#include <port-protos.h>		/* for strdup() */
+#ifndef HAVE_STRDUP
+#  include <port-protos.h>		/* for strdup() */
+#endif
 
 #include <storage/lmgr.h>
 
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 2de53600ceb8f1a9049704fc656a30765b948113..025c00ded6a0a8a079ca59578edb57d836d09d2b 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.53 1997/11/25 21:59:09 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.54 1997/12/17 04:44:50 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -54,7 +54,7 @@
 #include <sys/resource.h>
 #endif
 
-#include <port-protos.h>
+/* #include <port-protos.h> */
 
 extern int BlowawayRelationBuffers(Relation rdesc, BlockNumber block);