#include "config.h"
#endif
-#include "types.h"
-#include "jtag.h"
-#include "ioutil.h"
+#include <helper/types.h>
+#include <jtag/jtag.h>
+#include <helper/ioutil.h>
#include <helper/configuration.h>
-#include "xsvf.h"
-#include "svf.h"
-#include "nand.h"
-#include "pld.h"
-#include "server.h"
-#include "telnet_server.h"
-#include "gdb_server.h"
-#include "openocd.h"
+#include <server/server.h>
+#include <server/telnet_server.h>
+#include <server/gdb_server.h>
+#include <openocd.h>
-#include <time_support.h>
+#include <helper/time_support.h>
#include <sys/time.h>
#include <stdio.h>
#include <stdlib.h>