diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 73f1950c..44b9842b 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,3 +1,14 @@
+2003-05-21  Marcel Telka  <marcel@telka.sk>
+
+	* include/signal.h: Renamed this file ...
+	* include/bssignal.h: ... to this one.
+	All includes changed.
+	* include/Makefile.am (noinst_HEADERS): Renamed signal.h to bssignal.h.
+
+	* include/data_register.h: Marked local include files with double quotes.
+	* include/instruction.h: Ditto.
+	* include/part.h: Ditto.
+
 2003-05-21  Marcel Telka  <marcel@telka.sk>
 
 	* include/bsbit.h (bsbit, bsbit_t): Renamed typedef bsbit to bsbit_t.
diff --git a/jtag/include/Makefile.am b/jtag/include/Makefile.am
index b51c0f58..e2b70e42 100644
--- a/jtag/include/Makefile.am
+++ b/jtag/include/Makefile.am
@@ -34,7 +34,7 @@ noinst_HEADERS = \
 	parport.h \
 	part.h \
 	register.h \
-	signal.h \
+	bssignal.h \
 	state.h \
 	jtag.h \
 	tap.h
diff --git a/jtag/include/bsbit.h b/jtag/include/bsbit.h
index b69adaab..ef28ac49 100644
--- a/jtag/include/bsbit.h
+++ b/jtag/include/bsbit.h
@@ -27,7 +27,7 @@
 
 typedef struct bsbit bsbit_t;
 
-#include <signal.h>
+#include "bssignal.h"
 
 #define	BSBIT_INPUT	1
 #define	BSBIT_OUTPUT	2
diff --git a/jtag/include/signal.h b/jtag/include/bssignal.h
similarity index 98%
rename from jtag/include/signal.h
rename to jtag/include/bssignal.h
index eeda9e8d..dfaf844b 100644
--- a/jtag/include/signal.h
+++ b/jtag/include/bssignal.h
@@ -27,7 +27,7 @@
 
 typedef struct signal signal_t;
 
-#include <bsbit.h>
+#include "bsbit.h"
 
 struct signal {
 	char *name;
diff --git a/jtag/include/data_register.h b/jtag/include/data_register.h
index da417e43..0e48fcc7 100644
--- a/jtag/include/data_register.h
+++ b/jtag/include/data_register.h
@@ -25,7 +25,7 @@
 #ifndef DATA_REGISTER_H
 #define	DATA_REGISTER_H
 
-#include <register.h>
+#include "register.h"
 
 #define	MAXLEN_DATA_REGISTER	10
 
diff --git a/jtag/include/instruction.h b/jtag/include/instruction.h
index 40908d65..68e566d1 100644
--- a/jtag/include/instruction.h
+++ b/jtag/include/instruction.h
@@ -25,8 +25,8 @@
 #ifndef INSTRUCTION_H
 #define	INSTRUCTION_H
 
-#include <register.h>
-#include <data_register.h>
+#include "register.h"
+#include "data_register.h"
 
 #define	MAXLEN_INSTRUCTION	20
 
diff --git a/jtag/include/part.h b/jtag/include/part.h
index 1635accd..4e919732 100644
--- a/jtag/include/part.h
+++ b/jtag/include/part.h
@@ -27,10 +27,10 @@
 
 #include <stdio.h>
 
-#include <signal.h>
-#include <instruction.h>
-#include <data_register.h>
-#include <bsbit.h>
+#include "bssignal.h"
+#include "instruction.h"
+#include "data_register.h"
+#include "bsbit.h"
 
 #define	MAXLEN_MANUFACTURER	20
 #define	MAXLEN_PART		20
diff --git a/jtag/src/bus/ixp425.c b/jtag/src/bus/ixp425.c
index 291bd1f4..ac11931c 100644
--- a/jtag/src/bus/ixp425.c
+++ b/jtag/src/bus/ixp425.c
@@ -39,7 +39,7 @@
 #include "part.h"
 #include "bus.h"
 #include "chain.h"
-#include "signal.h"
+#include "bssignal.h"
 
 typedef struct {
 	chain_t *chain;
diff --git a/jtag/src/bus/pxa2x0.c b/jtag/src/bus/pxa2x0.c
index 1e36056c..321d0328 100644
--- a/jtag/src/bus/pxa2x0.c
+++ b/jtag/src/bus/pxa2x0.c
@@ -43,7 +43,7 @@
 
 #include "part.h"
 #include "bus.h"
-#include "signal.h"
+#include "bssignal.h"
 
 typedef struct {
 	chain_t *chain;
diff --git a/jtag/src/bus/sa1110.c b/jtag/src/bus/sa1110.c
index 575218fa..a313536d 100644
--- a/jtag/src/bus/sa1110.c
+++ b/jtag/src/bus/sa1110.c
@@ -42,7 +42,7 @@
 #include "part.h"
 #include "bus.h"
 #include "chain.h"
-#include "signal.h"
+#include "bssignal.h"
 
 typedef struct {
 	chain_t *chain;
diff --git a/jtag/src/cmd/get.c b/jtag/src/cmd/get.c
index a54f3143..6364952e 100644
--- a/jtag/src/cmd/get.c
+++ b/jtag/src/cmd/get.c
@@ -35,7 +35,7 @@
 #include <string.h>
 
 #include "part.h"
-#include "signal.h"
+#include "bssignal.h"
 #include "jtag.h"
 
 #include "cmd.h"
diff --git a/jtag/src/cmd/set.c b/jtag/src/cmd/set.c
index 44db851f..18b1f57b 100644
--- a/jtag/src/cmd/set.c
+++ b/jtag/src/cmd/set.c
@@ -35,7 +35,7 @@
 #include <string.h>
 
 #include "part.h"
-#include "signal.h"
+#include "bssignal.h"
 #include "jtag.h"
 
 #include "cmd.h"
diff --git a/jtag/src/part/signal.c b/jtag/src/part/signal.c
index 348cd79d..e53baee9 100644
--- a/jtag/src/part/signal.c
+++ b/jtag/src/part/signal.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "signal.h"
+#include "bssignal.h"
 
 signal_t *
 signal_alloc( const char *name )