diff --git a/arch-wrs/ppsi-wrs.h b/arch-wrs/include/ppsi-wrs.h
similarity index 100%
rename from arch-wrs/ppsi-wrs.h
rename to arch-wrs/include/ppsi-wrs.h
diff --git a/arch-wrs/main-loop.c b/arch-wrs/main-loop.c
index f2cb96727dc411953fc7049dea71ef18524e4cba..2f4cfdb38f8922c062815e07d1e933533e4da8bf 100644
--- a/arch-wrs/main-loop.c
+++ b/arch-wrs/main-loop.c
@@ -11,7 +11,7 @@
 #include <linux/if_ether.h>
 
 #include <ppsi/ppsi.h>
-#include "ppsi-wrs.h"
+#include <ppsi-wrs.h>
 
 /* Call pp_state_machine for each instance. To be called periodically,
  * when no packets are incoming */
diff --git a/arch-wrs/wrs-calibration.c b/arch-wrs/wrs-calibration.c
index 80a6cf7acc762a79f9a4f32eb7c534dbf4b3eee2..23c24f5fafb1088f5a975102a9c5fdc7b51ffef0 100644
--- a/arch-wrs/wrs-calibration.c
+++ b/arch-wrs/wrs-calibration.c
@@ -4,7 +4,7 @@
 
 #include <ppsi/ppsi.h>
 
-#include "ppsi-wrs.h"
+#include <ppsi-wrs.h>
 
 #define HAL_EXPORT_STRUCTURES
 #include <hal_exports.h>
diff --git a/arch-wrs/wrs-startup.c b/arch-wrs/wrs-startup.c
index a68b9762c808a3b17cda8bbc1ea88b48ea3d7215..ba2eb648963d847248e73f68c230435099caa2a7 100644
--- a/arch-wrs/wrs-startup.c
+++ b/arch-wrs/wrs-startup.c
@@ -19,7 +19,7 @@
 #include <hal_exports.h>
 
 #include <ppsi/ppsi.h>
-#include "ppsi-wrs.h"
+#include <ppsi-wrs.h>
 
 CONST_VERBOSITY int pp_diag_verbosity = 0;
 
diff --git a/time-wrs/wrs-time.c b/time-wrs/wrs-time.c
index 4b561d2ae414a8e155499380d5059592f490f552..d01f6a92d975ca9538944ddf25912c709536e269 100644
--- a/time-wrs/wrs-time.c
+++ b/time-wrs/wrs-time.c
@@ -4,8 +4,7 @@
 
 #include <ppsi/ppsi.h>
 #include <unix-time.h>
-#include "../arch-wrs/ppsi-wrs.h"	/* FIXME include path: move ppsi-wrs.h into
-									* arch-wrs/include ? */
+#include <ppsi-wrs.h>
 
 #include <hal_exports.h>
 /* FIXME: these externs are needed here because we can not include