diff --git a/opcodes/ChangeLog.mpw b/opcodes/ChangeLog.mpw
index 1472c01607..a7609a5267 100644
--- a/opcodes/ChangeLog.mpw
+++ b/opcodes/ChangeLog.mpw
@@ -1,3 +1,9 @@
+Mon Jan 24 12:07:22 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* mpw-config.in (varargs.h): Don't create.
+	(sysdep.h): Create using forward-include.
+	* mpw-make.in (CSEARCH): Add include/mpw to search path.
+
 Fri Jan  7 11:26:29 1994  Stan Shebs  (shebs@andros.cygnus.com)
 
 	* mpw-make.in: Replace 8-bit chars with their names.
diff --git a/opcodes/mpw-config.in b/opcodes/mpw-config.in
index 62b766214d..66495df316 100644
--- a/opcodes/mpw-config.in
+++ b/opcodes/mpw-config.in
@@ -1,12 +1,3 @@
 # Configuration fragment for opcodes.
 
-duplicate -y -d {topsrcdir}bfd:hosts:mpw.h sysdep.h
-
-Echo "#ifndef __va_list__" >varargs.h
-Echo "#define __va_list__" >>varargs.h
-Echo "typedef char *va_list;" >>varargs.h
-Echo "#endif" >>varargs.h
-Echo "#define va_dcl int va_alist;" >>varargs.h
-Echo "#define va_start(list) list = (char *) &va_alist" >>varargs.h
-Echo "#define va_end(list)" >>varargs.h
-Echo "#define va_arg(list,mode) ((mode *)(list += sizeof(mode)))[-1]" >>varargs.h
+forward-include "{srcroot}"bfd:hosts:mpw.h sysdep.h
diff --git a/opcodes/mpw-make.in b/opcodes/mpw-make.in
index 066b071bbe..41b3c40d88 100644
--- a/opcodes/mpw-make.in
+++ b/opcodes/mpw-make.in
@@ -70,7 +70,7 @@ RANLIB = ranlib
 
 INCDIR = "{topsrcdir}"include
 BFDDIR = "{topsrcdir}"bfd
-CSEARCH =  -i {INCDIR},{INCDIR}:,{BFDDIR}:,::bfd:
+CSEARCH =  -i {INCDIR},{INCDIR}:,{BFDDIR}:,::bfd:,"{INCDIR}":mpw:
 DEP = mkdep
 
 ALL_CFLAGS =  -mc68020 -mc68881 -model far {CSEARCH}