diff --git a/lib/pbio/sys/cc.h b/lib/pbio/sys/cc.h
index 55567a954..fff11fadd 100644
--- a/lib/pbio/sys/cc.h
+++ b/lib/pbio/sys/cc.h
@@ -45,7 +45,7 @@
 #ifndef CC_H_
 #define CC_H_
 
-#include "contiki-conf.h"
+#include "pbio-conf.h"
 #include "sys/cc-gcc.h"
 
 /**
diff --git a/lib/pbio/sys/clock.h b/lib/pbio/sys/clock.h
index 4cbfdb223..4a3ba4729 100644
--- a/lib/pbio/sys/clock.h
+++ b/lib/pbio/sys/clock.h
@@ -69,7 +69,7 @@
 #ifndef CLOCK_H_
 #define CLOCK_H_
 
-#include "contiki-conf.h"
+#include "pbio-conf.h"
 
 /**
  * A second, measured in system clock time.
diff --git a/lib/pbio/sys/compower.c b/lib/pbio/sys/compower.c
index 02a0f3c4c..e89d2d005 100644
--- a/lib/pbio/sys/compower.c
+++ b/lib/pbio/sys/compower.c
@@ -42,7 +42,7 @@
  * @{
  */
 
-#include "contiki-conf.h"
+#include "pbio-conf.h"
 #include "sys/energest.h"
 #include "sys/compower.h"
 #include "net/packetbuf.h"
diff --git a/lib/pbio/sys/energest.c b/lib/pbio/sys/energest.c
index 5b0f6cb86..d815353d8 100644
--- a/lib/pbio/sys/energest.c
+++ b/lib/pbio/sys/energest.c
@@ -38,7 +38,7 @@
  */
 
 #include "sys/energest.h"
-#include "contiki-conf.h"
+#include "pbio-conf.h"
 
 #if ENERGEST_CONF_ON
 
diff --git a/lib/pbio/sys/etimer.c b/lib/pbio/sys/etimer.c
index 17ac74285..35f1cda2b 100644
--- a/lib/pbio/sys/etimer.c
+++ b/lib/pbio/sys/etimer.c
@@ -44,7 +44,7 @@
  * Adam Dunkels <adam@sics.se>
  */
 
-#include "contiki-conf.h"
+#include "pbio-conf.h"
 
 #include "sys/etimer.h"
 #include "sys/process.h"
diff --git a/lib/pbio/sys/log.h b/lib/pbio/sys/log.h
index c6bc24737..6bb893bf8 100644
--- a/lib/pbio/sys/log.h
+++ b/lib/pbio/sys/log.h
@@ -34,7 +34,7 @@
 #ifndef LOG_H_
 #define LOG_H_
 
-#include "contiki-conf.h"
+#include "pbio-conf.h"
 
 #if LOG_CONF_ENABLED
 void log_message(const char *part1, const char *part2);
diff --git a/lib/pbio/sys/rtimer.h b/lib/pbio/sys/rtimer.h
index a89ed8299..e1fd006a3 100644
--- a/lib/pbio/sys/rtimer.h
+++ b/lib/pbio/sys/rtimer.h
@@ -53,7 +53,7 @@
 #ifndef RTIMER_H_
 #define RTIMER_H_
 
-#include "contiki-conf.h"
+#include "pbio-conf.h"
 
 #ifndef RTIMER_CLOCK_DIFF
 typedef unsigned short rtimer_clock_t;
diff --git a/lib/pbio/sys/stimer.c b/lib/pbio/sys/stimer.c
index 86545f59e..6f46dfe06 100644
--- a/lib/pbio/sys/stimer.c
+++ b/lib/pbio/sys/stimer.c
@@ -44,7 +44,7 @@
  * @{
  */
 
-#include "contiki-conf.h"
+#include "pbio-conf.h"
 #include "sys/clock.h"
 #include "sys/stimer.h"
 
diff --git a/lib/pbio/sys/timer.c b/lib/pbio/sys/timer.c
index 6fe64119b..a0a7c53ab 100644
--- a/lib/pbio/sys/timer.c
+++ b/lib/pbio/sys/timer.c
@@ -44,7 +44,7 @@
  * @{
  */
 
-#include "contiki-conf.h"
+#include "pbio-conf.h"
 #include "sys/clock.h"
 #include "sys/timer.h"