diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index d8fd9344..db557d66 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,3 +1,11 @@
+2003-03-14  Marcel Telka  <marcel@telka.sk>
+
+	* configure.ac (CPPFLAGS): Added common include paths.
+	* src/Makefile.am (INCLUDES): Removed common include paths.
+	* src/bus/Makefile.am (INCLUDES): Ditto.
+	* src/part/Makefile.am (INCLUDES): Ditto.
+	* src/tap/Makefile.am (INCLUDES): Ditto.
+
 2003-03-13  Marcel Telka  <marcel@telka.sk>
 
 	* configure.ac (AC_CONFIG_HEADERS): Replaced this `new' macro ...
diff --git a/jtag/configure.ac b/jtag/configure.ac
index 1af3f15e..968d709c 100644
--- a/jtag/configure.ac
+++ b/jtag/configure.ac
@@ -68,13 +68,10 @@ AC_CACHE_CHECK([for the openwince includes], openwince_includes_path, [
 		fi
 	done
 ])
-
 if test "$openwince_includes_path" = "no"; then
 	AC_MSG_ERROR([The openwince include package not found.])
 fi
-
-AC_SUBST(OPENWINCE_INC)
-OPENWINCE_INC="-I$openwince_includes_path -I$openwince_includes_path/device"
+CPPFLAGS="$CPPFLAGS -I$openwince_includes_path -I$openwince_includes_path/device"
 
 AC_SEARCH_LIBS([ioperm], [ioperm])
 AC_CHECK_FUNCS(getline getdelim)
@@ -128,5 +125,6 @@ AC_CHECK_FUNCS(getline getdelim)
 #])dnl
 
 CFLAGS="$CFLAGS -Wall"
+CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/include"
 
 AC_OUTPUT
diff --git a/jtag/src/Makefile.am b/jtag/src/Makefile.am
index 480e2cb4..0fb06fd9 100644
--- a/jtag/src/Makefile.am
+++ b/jtag/src/Makefile.am
@@ -47,4 +47,4 @@ jtag_DEPENDENCIES = lib/libjtaglib.a tap/libtap.a part/libpart.a bus/libbus.a
 jtag_LDADD = -Ltap -ltap -Lpart -lpart -Llib -ljtaglib -Lbus -lbus @LIBINTL@
 
 localedir = $(datadir)/locale
-INCLUDES = -I$(top_srcdir)/include $(OPENWINCE_INC) -DLOCALEDIR=\"$(localedir)\" -DJTAG_DATA_DIR=\"$(pkgdatadir)\"
+INCLUDES = -DLOCALEDIR=\"$(localedir)\" -DJTAG_DATA_DIR=\"$(pkgdatadir)\"
diff --git a/jtag/src/bus/Makefile.am b/jtag/src/bus/Makefile.am
index b977fb45..c06506af 100644
--- a/jtag/src/bus/Makefile.am
+++ b/jtag/src/bus/Makefile.am
@@ -27,5 +27,3 @@ libbus_a_SOURCES = \
 	ixp425.c \
 	pxa2x0.c \
 	sa1110.c
-
-INCLUDES = -I$(top_srcdir)/include $(OPENWINCE_INC)
diff --git a/jtag/src/part/Makefile.am b/jtag/src/part/Makefile.am
index 35ba423b..e7147374 100644
--- a/jtag/src/part/Makefile.am
+++ b/jtag/src/part/Makefile.am
@@ -30,5 +30,3 @@ libpart_a_SOURCES = \
 	bsbit.c \
 	part.c \
 	parse.c
-
-INCLUDES = -I$(top_srcdir)/include
diff --git a/jtag/src/tap/Makefile.am b/jtag/src/tap/Makefile.am
index 56f85cc1..83c5aeb5 100644
--- a/jtag/src/tap/Makefile.am
+++ b/jtag/src/tap/Makefile.am
@@ -36,5 +36,3 @@ libtap_a_SOURCES = \
 	cable/ei012.c \
 	cable/mpcbdm.c \
 	cable/wiggler.c
-
-INCLUDES = -I$(top_srcdir)/include $(OPENWINCE_INC)