Explicitly specify the path to wpp.h so we don't need to change the

tools/widl/Makefile.in

@@ -6,7 +6,6 @@ VPATH     = @srcdir@
 LEXOPT    = -Cf #-w -b
 YACCOPT   = #-v
 EXEEXT    = @EXEEXT@
-EXTRAINCL = -I$(TOPSRCDIR)/tools/wpp
 EXTRALIBS = -L$(TOPOBJDIR)/tools/wpp -lwpp
 
 PROGRAMS = widl$(EXEEXT)

tools/widl/parser.l

@@ -42,7 +42,7 @@ uuid	{hexd}{8}-{hexd}{4}-{hexd}{4}-{hexd}{4}-{hexd}{12}
 #include "widl.h"
 #include "utils.h"
 #include "parser.h"
-#include "wpp.h"
+#include "../wpp/wpp.h"
 
 #include "y.tab.h"
 

tools/widl/widl.c

@@ -35,7 +35,7 @@
 #include "utils.h"
 #include "parser.h"
 #include "proxy.h"
-#include "wpp.h"
+#include "../wpp/wpp.h"
 
 static char usage[] =
 "Usage: widl [options...] infile.idl\n"

tools/wrc/Makefile.in

@@ -6,7 +6,6 @@ VPATH     = @srcdir@
 LEXOPT    = -Cf #-w -b
 YACCOPT   = #-v
 EXEEXT    = @EXEEXT@
-EXTRAINCL = -I$(TOPSRCDIR)/tools/wpp
 EXTRALIBS = -L$(TOPOBJDIR)/tools/wpp -lwpp
 
 PROGRAMS = wrc$(EXEEXT)

tools/wrc/parser.y

@@ -136,7 +136,7 @@
 #include "utils.h"
 #include "newstruc.h"
 #include "dumpres.h"
-#include "wpp.h"
+#include "../wpp/wpp.h"
 #include "parser.h"
 #include "windef.h"
 #include "winbase.h"

tools/wrc/wrc.c

@@ -65,7 +65,7 @@
 #include "genres.h"
 #include "newstruc.h"
 #include "parser.h"
-#include "wpp.h"
+#include "../wpp/wpp.h"
 
 static char usage[] =
 	"Usage: wrc [options...] [infile[.rc|.res]]\n"