diff --git a/src/helper/system.h b/src/helper/system.h
index 2e3906d46..07b0cb9f2 100644
--- a/src/helper/system.h
+++ b/src/helper/system.h
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <assert.h>
 #include <ctype.h>
 #include <errno.h>
 
diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index 55d035a49..3d43bc9e6 100644
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -33,7 +33,7 @@
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#include <assert.h>
+
 
 int jtag_flush_queue_count; /* count # of flushes for profiling / debugging purposes */
 
diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c
index b62de349d..2400ae39a 100644
--- a/src/xsvf/xsvf.c
+++ b/src/xsvf/xsvf.c
@@ -44,8 +44,6 @@
 #include "xsvf.h"
 #include "jtag.h"
 
-#include <assert.h>
-
 
 /* XSVF commands, from appendix B of xapp503.pdf  */
 #define XCOMPLETE		0x00