Explicitly specify the path to wpp.h so we don't need to change the
include path, to avoid conflicts with multiple y.tab.h files.
diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in
index 98b2c08..6776485 100644
--- a/tools/widl/Makefile.in
+++ b/tools/widl/Makefile.in
@@ -6,7 +6,6 @@
LEXOPT = -Cf #-w -b
YACCOPT = #-v
EXEEXT = @EXEEXT@
-EXTRAINCL = -I$(TOPSRCDIR)/tools/wpp
EXTRALIBS = -L$(TOPOBJDIR)/tools/wpp -lwpp
PROGRAMS = widl$(EXEEXT)
diff --git a/tools/widl/parser.l b/tools/widl/parser.l
index 47a4748..0ff67cf 100644
--- a/tools/widl/parser.l
+++ b/tools/widl/parser.l
@@ -42,7 +42,7 @@
#include "widl.h"
#include "utils.h"
#include "parser.h"
-#include "wpp.h"
+#include "../wpp/wpp.h"
#include "y.tab.h"
diff --git a/tools/widl/widl.c b/tools/widl/widl.c
index f726d2b..8dfbcd5 100644
--- a/tools/widl/widl.c
+++ b/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"
diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in
index 8cbd6f6..7d2d165 100644
--- a/tools/wrc/Makefile.in
+++ b/tools/wrc/Makefile.in
@@ -6,7 +6,6 @@
LEXOPT = -Cf #-w -b
YACCOPT = #-v
EXEEXT = @EXEEXT@
-EXTRAINCL = -I$(TOPSRCDIR)/tools/wpp
EXTRALIBS = -L$(TOPOBJDIR)/tools/wpp -lwpp
PROGRAMS = wrc$(EXEEXT)
diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y
index 7cdcb82..942725d 100644
--- a/tools/wrc/parser.y
+++ b/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"
diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c
index 9041c13..9b9330c 100644
--- a/tools/wrc/wrc.c
+++ b/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"
