#include <jtag/jtag.h>
#include <helper/ioutil.h>
#include <helper/configuration.h>
-#include "xsvf.h"
-#include "svf.h"
+#include <xsvf/xsvf.h>
+#include <svf/svf.h>
#include <flash/nand.h>
-#include "pld.h"
+#include <pld/pld.h>
#include <flash/mflash.h>
-#include "server.h"
-#include "gdb_server.h"
-#include "httpd.h"
+#include <server/server.h>
+#include <server/gdb_server.h>
+#include <server/httpd.h>
#ifdef HAVE_STRINGS_H
#include <strings.h>