diff --git a/urjtag/include/Makefile.am b/urjtag/include/Makefile.am
index 6164309a..d9c72419 100644
--- a/urjtag/include/Makefile.am
+++ b/urjtag/include/Makefile.am
@@ -44,7 +44,7 @@ noinst_HEADERS = \
 	part.h \
 	register.h \
 	bssignal.h \
-	state.h \
+	tap_state.h \
 	jtag.h \
 	tap.h \
 	fclock.h \
diff --git a/urjtag/include/tap_state.h b/urjtag/include/tap_state.h
index 5ec1f03a..556e89a0 100644
--- a/urjtag/include/tap_state.h
+++ b/urjtag/include/tap_state.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef	STATE_H
-#define	STATE_H
+#ifndef	TAP_STATE_H
+#define	TAP_STATE_H
 
 #include <bitmask.h>
 
@@ -63,4 +63,4 @@ int tap_state_reset (chain_t * chain);
 int tap_state_set_trst (chain_t * chain, int old_trst, int new_trst);
 int tap_state_clock (chain_t * chain, int tms);
 
-#endif /* STATE_H */
+#endif /* TAP_STATE_H */
diff --git a/urjtag/src/bus/bscoach.c b/urjtag/src/bus/bscoach.c
index e4b13009..bd37486a 100644
--- a/urjtag/src/bus/bscoach.c
+++ b/urjtag/src/bus/bscoach.c
@@ -37,7 +37,7 @@
 #include "jtag.h"
 #include "buses.h"
 #include "generic_bus.h"
-#include "state.h"
+#include "tap_state.h"
 
 
 typedef struct
diff --git a/urjtag/src/bus/ejtag.c b/urjtag/src/bus/ejtag.c
index 36f668ed..eae31439 100644
--- a/urjtag/src/bus/ejtag.c
+++ b/urjtag/src/bus/ejtag.c
@@ -40,7 +40,7 @@
 #include "jtag.h"
 #include "buses.h"
 #include "generic_bus.h"
-#include "state.h"
+#include "tap_state.h"
 
 typedef struct
 {
diff --git a/urjtag/src/bus/ejtag_dma.c b/urjtag/src/bus/ejtag_dma.c
index f528f1a3..247b5a64 100644
--- a/urjtag/src/bus/ejtag_dma.c
+++ b/urjtag/src/bus/ejtag_dma.c
@@ -47,7 +47,7 @@
 #include "jtag.h"
 #include "buses.h"
 #include "generic_bus.h"
-#include "state.h"
+#include "tap_state.h"
 
 typedef struct
 {
diff --git a/urjtag/src/bus/jopcyc.c b/urjtag/src/bus/jopcyc.c
index 00fecbfa..ab81bd21 100644
--- a/urjtag/src/bus/jopcyc.c
+++ b/urjtag/src/bus/jopcyc.c
@@ -67,7 +67,7 @@
 #include "jtag.h"
 #include "buses.h"
 #include "generic_bus.h"
-#include "state.h"
+#include "tap_state.h"
 
 #define RAM_ADDR_WIDTH 18
 #define RAM_DATA_WIDTH 16
diff --git a/urjtag/src/bus/pxa2x0.c b/urjtag/src/bus/pxa2x0.c
index f40d24d3..692c2eae 100644
--- a/urjtag/src/bus/pxa2x0.c
+++ b/urjtag/src/bus/pxa2x0.c
@@ -42,7 +42,7 @@
 #include "jtag.h"
 #include "buses.h"
 #include "generic_bus.h"
-#include "state.h"
+#include "tap_state.h"
 
 #include "pxa2x0_mc.h"
 
diff --git a/urjtag/src/bus/s3c4510x.c b/urjtag/src/bus/s3c4510x.c
index 464f20ec..8b9f53ab 100644
--- a/urjtag/src/bus/s3c4510x.c
+++ b/urjtag/src/bus/s3c4510x.c
@@ -65,7 +65,7 @@
 #include "jtag.h"
 #include "buses.h"
 #include "generic_bus.h"
-#include "state.h"
+#include "tap_state.h"
 
 
 #ifndef DEBUG_LVL2
diff --git a/urjtag/src/bus/zefant-xs3.c b/urjtag/src/bus/zefant-xs3.c
index 44e64754..312438b1 100644
--- a/urjtag/src/bus/zefant-xs3.c
+++ b/urjtag/src/bus/zefant-xs3.c
@@ -67,7 +67,7 @@
 #include "jtag.h"
 #include "buses.h"
 #include "generic_bus.h"
-#include "state.h"
+#include "tap_state.h"
 
 /* EEPROM commands */
 #define EEPROM_CMD_WREN  0x06
diff --git a/urjtag/src/svf/svf.c b/urjtag/src/svf/svf.c
index cba541dc..1b473f9b 100644
--- a/urjtag/src/svf/svf.c
+++ b/urjtag/src/svf/svf.c
@@ -43,7 +43,7 @@
 
 #include <jtag.h>
 #include <tap.h>
-#include <state.h>
+#include <tap_state.h>
 
 #include <cmd.h>
 
diff --git a/urjtag/src/tap/chain.c b/urjtag/src/tap/chain.c
index 18b6d5a3..a544b9f9 100644
--- a/urjtag/src/tap/chain.c
+++ b/urjtag/src/tap/chain.c
@@ -28,7 +28,7 @@
 #include <string.h>
 
 #include "chain.h"
-#include "state.h"
+#include "tap_state.h"
 #include "tap.h"
 
 #include "bsdl.h"
diff --git a/urjtag/src/tap/state.c b/urjtag/src/tap/state.c
index 09e305b9..49b1ca4c 100644
--- a/urjtag/src/tap/state.c
+++ b/urjtag/src/tap/state.c
@@ -23,7 +23,7 @@
  *
  */
 
-#include "state.h"
+#include "tap_state.h"
 #include "chain.h"
 
 int
diff --git a/urjtag/src/tap/tap.c b/urjtag/src/tap/tap.c
index b6b59adc..6a2cf9ca 100644
--- a/urjtag/src/tap/tap.c
+++ b/urjtag/src/tap/tap.c
@@ -28,7 +28,7 @@
 
 #include "register.h"
 #include "tap.h"
-#include "state.h"
+#include "tap_state.h"
 #include "chain.h"
 
 void