diff --git a/jtag/src/detect.c b/jtag/src/detect.c
index b1bb8849..e26af4ea 100644
--- a/jtag/src/detect.c
+++ b/jtag/src/detect.c
@@ -26,10 +26,10 @@
 #include <ctype.h>
 #include <string.h>
 
-#include <jtag/register.h>
-#include <jtag/tap.h>
-#include <jtag/ctrl.h>
-#include <jtag/part.h>
+#include "register.h"
+#include "tap.h"
+#include "ctrl.h"
+#include "part.h"
 
 #include "detect.h"
 
diff --git a/jtag/src/detect.h b/jtag/src/detect.h
index d7497e80..1b529f1d 100644
--- a/jtag/src/detect.h
+++ b/jtag/src/detect.h
@@ -25,7 +25,7 @@
 #ifndef DETECT_H
 #define DETECT_H
 
-#include <jtag/part.h>
+#include "part.h"
 
 parts *detect_parts( char *db_path );
 
diff --git a/jtag/src/jtag.c b/jtag/src/jtag.c
index 4d2e6a99..7b6bd879 100644
--- a/jtag/src/jtag.c
+++ b/jtag/src/jtag.c
@@ -31,9 +31,9 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
-#include <jtag/part.h>
-#include <jtag/ctrl.h>
-#include <jtag/tap.h>
+#include "part.h"
+#include "ctrl.h"
+#include "tap.h"
 
 #include "detect.h"
 
diff --git a/jtag/src/part/bsbit.c b/jtag/src/part/bsbit.c
index 046d8891..42422bda 100644
--- a/jtag/src/part/bsbit.c
+++ b/jtag/src/part/bsbit.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <jtag/bsbit.h>
+#include "bsbit.h"
 
 bsbit *
 bsbit_alloc( int bit, const char *name, int type, signal* signals, int safe )
diff --git a/jtag/src/part/data_register.c b/jtag/src/part/data_register.c
index aa3dc64d..5e4f1414 100644
--- a/jtag/src/part/data_register.c
+++ b/jtag/src/part/data_register.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <jtag/data_register.h>
+#include "data_register.h"
 
 data_register *
 data_register_alloc( const char *name, int len )
diff --git a/jtag/src/part/instruction.c b/jtag/src/part/instruction.c
index 19b601bf..2dc11dbf 100644
--- a/jtag/src/part/instruction.c
+++ b/jtag/src/part/instruction.c
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <jtag/instruction.h>
+#include "instruction.h"
 
 instruction *
 instruction_alloc( const char *name, int len, const char *val )
diff --git a/jtag/src/part/parse.c b/jtag/src/part/parse.c
index 8459c2be..48308f71 100644
--- a/jtag/src/part/parse.c
+++ b/jtag/src/part/parse.c
@@ -26,8 +26,8 @@
 #include <string.h>
 #include <stdio.h>
 
-#include <jtag/part.h>
-#include <jtag/register.h>
+#include "part.h"
+#include "register.h"
 
 static char *
 get_token( char *buf )
diff --git a/jtag/src/part/part.c b/jtag/src/part/part.c
index 861c143e..c4e5907a 100644
--- a/jtag/src/part/part.c
+++ b/jtag/src/part/part.c
@@ -25,8 +25,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <jtag/part.h>
-#include <jtag/tap.h>
+#include "part.h"
+#include "tap.h"
 
 /* part */
 
diff --git a/jtag/src/part/signal.c b/jtag/src/part/signal.c
index 2a8b1613..4b70ac10 100644
--- a/jtag/src/part/signal.c
+++ b/jtag/src/part/signal.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <jtag/signal.h>
+#include "signal.h"
 
 signal *
 signal_alloc( const char *name )
diff --git a/jtag/src/readmem.c b/jtag/src/readmem.c
index 48421440..480fdab3 100644
--- a/jtag/src/readmem.c
+++ b/jtag/src/readmem.c
@@ -22,7 +22,7 @@
  *
  */
 
-#include <jtag/part.h>
+#include "part.h"
 
 void
 readmem( parts *ps )
diff --git a/jtag/src/tap/ctrl.c b/jtag/src/tap/ctrl.c
index 8fca7e2a..5a11b800 100644
--- a/jtag/src/tap/ctrl.c
+++ b/jtag/src/tap/ctrl.c
@@ -24,8 +24,8 @@
 
 #include <sys/io.h>
 
-#include <jtag/ctrl.h>
-#include <jtag/state.h>
+#include "ctrl.h"
+#include "state.h"
 
 #define	TCK	0
 #define	TDI	1
diff --git a/jtag/src/tap/register.c b/jtag/src/tap/register.c
index eaea4879..3ea0bd00 100644
--- a/jtag/src/tap/register.c
+++ b/jtag/src/tap/register.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <jtag/register.h>
+#include "register.h"
 
 tap_register *
 register_alloc( int len )
diff --git a/jtag/src/tap/state.c b/jtag/src/tap/state.c
index c65448a8..8205fc69 100644
--- a/jtag/src/tap/state.c
+++ b/jtag/src/tap/state.c
@@ -23,7 +23,7 @@
  *
  */
 
-#include <jtag/state.h>
+#include "state.h"
 
 static int state = Unknown_State;
 static int trst = 0;
diff --git a/jtag/src/tap/tap.c b/jtag/src/tap/tap.c
index 81b93f38..20074636 100644
--- a/jtag/src/tap/tap.c
+++ b/jtag/src/tap/tap.c
@@ -24,10 +24,10 @@
 
 #include <stdio.h>
 
-#include <jtag/register.h>
-#include <jtag/tap.h>
-#include <jtag/ctrl.h>
-#include <jtag/state.h>
+#include "register.h"
+#include "tap.h"
+#include "ctrl.h"
+#include "state.h"
 
 void
 tap_reset( void )