2 files changed, 21 insertions, 13 deletions
diff --git a/apps/examples/pashello/Makefile b/apps/examples/pashello/Makefile
index 5876b9d2a..bb525c925 100644
--- a/apps/examples/pashello/Makefile
+++ b/apps/examples/pashello/Makefile
@@ -39,30 +39,38 @@ include $(APPDIR)/Make.defs
 
 # Pascal Add-On Example
 
-ASRCS		=
-CSRCS		= pashello.c device.c
+ifeq ($(WINTOOL),y)
+INCDIROPT = -w
+endif
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \
+  "." \
+  "$(APPDIR)$(DELIM)interpreters$(DELIM)pcode$(DELIM)include" \
+  "$(APPDIR)$(DELIM)interpreters$(DELIM)pcode$(DELIM)insn$(DELIM)include"}
+
+ASRCS =
+CSRCS = pashello.c device.c
 
-AOBJS		= $(ASRCS:.S=$(OBJEXT))
-COBJS		= $(CSRCS:.c=$(OBJEXT))
+AOBJS = $(ASRCS:.S=$(OBJEXT))
+COBJS = $(CSRCS:.c=$(OBJEXT))
 
-SRCS		= $(ASRCS) $(CSRCS)
-OBJS		= $(AOBJS) $(COBJS)
+SRCS = $(ASRCS) $(CSRCS)
+OBJS = $(AOBJS) $(COBJS)
 
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-  BIN		= ..\..\libapps$(LIBEXT)
+  BIN = ..\..\libapps$(LIBEXT)
 else
 ifeq ($(WINTOOL),y)
-  BIN		= ..\\..\\libapps$(LIBEXT)
+  BIN = ..\\..\\libapps$(LIBEXT)
 else
-  BIN		= ../../libapps$(LIBEXT)
+  BIN = ../../libapps$(LIBEXT)
 endif
 endif
 
-ROOTDEPPATH	= --dep-path .
+ROOTDEPPATH = --dep-path .
 
 # Common build
 
-VPATH		= 
+VPATH = 
 
 all: .built
 .PHONY: clean depend distclean
diff --git a/apps/examples/pashello/pashello.c b/apps/examples/pashello/pashello.c
index b8c19b6a4..8f9fc8b22 100644
--- a/apps/examples/pashello/pashello.c
+++ b/apps/examples/pashello/pashello.c
@@ -43,8 +43,8 @@
 #include <stdlib.h>
 #include <debug.h>
 
-#include "apps/pcode/insn/pexec.h"
-#include "apps/pcode/pedefs.h"
+#include "pexec.h"
+#include "pedefs.h"
 #include "pashello.h"
 
 /****************************************************************************