diff --git a/apps/decawave-demo/dw-sync-demo.c b/apps/decawave-demo/dw-sync-demo.c
index d430cbe30df3b23beaf5f8c8953e32cfc7027c29..0d42267c436408ea10e4b4b8dfcf8ee977ee51e8 100644
--- a/apps/decawave-demo/dw-sync-demo.c
+++ b/apps/decawave-demo/dw-sync-demo.c
@@ -1,4 +1,5 @@
 /*
+
  * dw1000, driver for decawave dw1000 UVB chip
  *  Copyright (C) 2014  Kim Albertsson
  *
@@ -144,4 +145,4 @@ PROCESS_THREAD(dw_interrupt_callback_proc, ev, data)
 	}
 	PROCESS_END();
 }
-/*---------------------------------------------------------------------------*/
\ No newline at end of file
+/*---------------------------------------------------------------------------*/
diff --git a/apps/decawave-range/dw-range.h b/apps/decawave-range/dw-range.h
index 42c2cca50e0091e75bf974718635b955c9b07c84..fba2524e8462738bf6025bb5ff9a598292775207 100644
--- a/apps/decawave-range/dw-range.h
+++ b/apps/decawave-range/dw-range.h
@@ -22,26 +22,8 @@
 #include <stdint.h>
 #include "contiki.h"
 #include "dwFrameTypes.h"
+#include "dw1000.h"
 
-typedef enum
-{
-	IDLE = 0,
-	RECEIVING,
-	BLINK_RECEIVED,
-	RANGE_INIT_RECEIVED,
-	POLL_RECEIVED,
-	RESPONSE_RECEIVED,
-	FINAL_RECEIVED,
-	MEASUREMENT_ADDED,
-	ERROR
-} ranging_state_t;
-
-typedef struct
-{
-	uint32_t num_packets_rx;
-	uint32_t num_packets_tx;
-	uint32_t num_errors;
-} packet_stats_t;
 
 packet_stats_t packet_stats;
 
@@ -76,4 +58,4 @@ uint32_t parseMessageRangeInit( uint8_t * pData, uint32_t dataLen, dw_message_ra
 struct process * interrupt_handler_callback;
 struct process dw_interrupt_callback_proc;
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/dw1000.h b/src/dw1000.h
new file mode 100644
index 0000000000000000000000000000000000000000..76e1ab078edda4385f122caea12f7e657db1ddc0
--- /dev/null
+++ b/src/dw1000.h
@@ -0,0 +1,26 @@
+#ifndef DW1000_H
+#define DW1000_H
+
+#include "dw1000-base.h"
+
+typedef enum
+{
+	DW_IDLE = 0,
+	DW_RECEIVING,
+	DW_BLINK_RECEIVED,
+	DW_RANGE_INIT_RECEIVED,
+	DW_POLL_RECEIVED,
+	DW_RESPONSE_RECEIVED,
+	DW_FINAL_RECEIVED,
+	DW_MEASUREMENT_ADDED,
+	DW_ERROR
+} ranging_state_t;
+
+typedef struct
+{
+	uint32_t num_packets_rx;
+	uint32_t num_packets_tx;
+	uint32_t num_errors;
+} packet_stats_t;
+
+#endif DW1000_H