diff --git a/arch/cpu/arm/common/sys/mtarch.h b/arch/cpu/arm/common/sys/mtarch.h
index fd6a0d0ca..d483e6e3f 100644
--- a/arch/cpu/arm/common/sys/mtarch.h
+++ b/arch/cpu/arm/common/sys/mtarch.h
@@ -51,7 +51,7 @@
 #ifndef MTARCH_H_
 #define MTARCH_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "sys/cc.h"
 
 #include <stdint.h>
diff --git a/arch/cpu/cc2538/cfs-coffee-arch.c b/arch/cpu/cc2538/cfs-coffee-arch.c
index 6d3664f5b..e727a9512 100644
--- a/arch/cpu/cc2538/cfs-coffee-arch.c
+++ b/arch/cpu/cc2538/cfs-coffee-arch.c
@@ -35,7 +35,7 @@
  * \file
  * Module for the cc2538 Coffee port
  */
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "sys/cc.h"
 #include "cfs/cfs-coffee.h"
 #include "dev/cc2538-dev.h"
diff --git a/arch/cpu/cc2538/cfs-coffee-arch.h b/arch/cpu/cc2538/cfs-coffee-arch.h
index a0bf3dd75..807ca8f58 100644
--- a/arch/cpu/cc2538/cfs-coffee-arch.h
+++ b/arch/cpu/cc2538/cfs-coffee-arch.h
@@ -43,7 +43,7 @@
 #ifndef CFS_COFFEE_ARCH_H_
 #define CFS_COFFEE_ARCH_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "cfs/cfs-coffee.h"
 #include "dev/cc2538-dev.h"
 #include "dev/flash.h"
diff --git a/arch/cpu/cc2538/dbg.h b/arch/cpu/cc2538/dbg.h
index 4ac02148a..d5ab51f9d 100644
--- a/arch/cpu/cc2538/dbg.h
+++ b/arch/cpu/cc2538/dbg.h
@@ -50,7 +50,7 @@
 #ifndef DBG_H_
 #define DBG_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 
 #include "usb/usb-serial.h"
 /**
diff --git a/arch/cpu/cc2538/dev/cc2538-dev.h b/arch/cpu/cc2538/dev/cc2538-dev.h
index 7bb81f662..0fdee63f3 100644
--- a/arch/cpu/cc2538/dev/cc2538-dev.h
+++ b/arch/cpu/cc2538/dev/cc2538-dev.h
@@ -43,7 +43,7 @@
 #ifndef CC2538_DEV_H_
 #define CC2538_DEV_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "sys/cc.h"
 /*----------------------------------------------------------------------------*/
 /** \name Bit-fields for the CC2538 devices features
diff --git a/arch/cpu/cc2538/dev/udma.c b/arch/cpu/cc2538/dev/udma.c
index 42fbe9189..1302f0f44 100644
--- a/arch/cpu/cc2538/dev/udma.c
+++ b/arch/cpu/cc2538/dev/udma.c
@@ -35,7 +35,7 @@
  * \file
  * Implementation of the cc2538 micro-DMA driver
  */
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "dev/udma.h"
 #include "dev/nvic.h"
 #include "reg.h"
diff --git a/arch/cpu/cc2538/dev/udma.h b/arch/cpu/cc2538/dev/udma.h
index 79cd58c20..103d58c11 100644
--- a/arch/cpu/cc2538/dev/udma.h
+++ b/arch/cpu/cc2538/dev/udma.h
@@ -44,7 +44,7 @@
 #ifndef UDMA_H_
 #define UDMA_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 
 /*
  * Enable all uDMA channels unless a conf file tells us to do otherwise.
diff --git a/arch/cpu/cc2538/dev/usb-regs.h b/arch/cpu/cc2538/dev/usb-regs.h
index dac823de0..5c82c4d21 100644
--- a/arch/cpu/cc2538/dev/usb-regs.h
+++ b/arch/cpu/cc2538/dev/usb-regs.h
@@ -45,7 +45,7 @@
 #ifndef USB_REGS_H_
 #define USB_REGS_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 /*---------------------------------------------------------------------------*/
 /**
  * \name USB Register Offsets
diff --git a/arch/cpu/cc2538/ieee-addr.c b/arch/cpu/cc2538/ieee-addr.c
index bd9c481a5..c914b511d 100644
--- a/arch/cpu/cc2538/ieee-addr.c
+++ b/arch/cpu/cc2538/ieee-addr.c
@@ -35,7 +35,7 @@
  * \file
  * Driver for the cc2538 IEEE addresses
  */
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "net/linkaddr.h"
 #include "ieee-addr.h"
 
diff --git a/arch/cpu/cc2538/ieee-addr.h b/arch/cpu/cc2538/ieee-addr.h
index faeacdb8f..3f1d4728b 100644
--- a/arch/cpu/cc2538/ieee-addr.h
+++ b/arch/cpu/cc2538/ieee-addr.h
@@ -44,7 +44,7 @@
 #ifndef IEEE_ADDR_H_
 #define IEEE_ADDR_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 
 #include <stdint.h>
 /*---------------------------------------------------------------------------*/
diff --git a/arch/cpu/cc2538/lpm.c b/arch/cpu/cc2538/lpm.c
index a68899110..b825c1ced 100644
--- a/arch/cpu/cc2538/lpm.c
+++ b/arch/cpu/cc2538/lpm.c
@@ -35,7 +35,7 @@
  * \file
  * Implementation of low power modes ofr the cc2538
  */
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "sys/energest.h"
 #include "sys/process.h"
 #include "dev/sys-ctrl.h"
diff --git a/arch/cpu/cc2538/lpm.h b/arch/cpu/cc2538/lpm.h
index d9b9e8758..16f9c3629 100644
--- a/arch/cpu/cc2538/lpm.h
+++ b/arch/cpu/cc2538/lpm.h
@@ -44,7 +44,7 @@
 #ifndef LPM_H_
 #define LPM_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "rtimer.h"
 
 #include <stdbool.h>
diff --git a/arch/cpu/cc2538/slip-arch.c b/arch/cpu/cc2538/slip-arch.c
index 4205a1826..9d8b7701c 100644
--- a/arch/cpu/cc2538/slip-arch.c
+++ b/arch/cpu/cc2538/slip-arch.c
@@ -38,7 +38,7 @@
  * SLIP can be configured to operate over UART or over USB-Serial, depending
  * on the value of SLIP_ARCH_CONF_USB
  */
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "dev/slip.h"
 #include "dev/uart.h"
 #include "usb/usb-serial.h"
diff --git a/arch/cpu/cc2538/soc.c b/arch/cpu/cc2538/soc.c
index 58ebb3692..a9d8868dd 100644
--- a/arch/cpu/cc2538/soc.c
+++ b/arch/cpu/cc2538/soc.c
@@ -35,7 +35,7 @@
  * \file
  * Implementation of the cc2538 SoC driver
  */
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "dev/rom-util.h"
 #include "dev/sys-ctrl.h"
 #include "reg.h"
diff --git a/arch/cpu/cc2538/soc.h b/arch/cpu/cc2538/soc.h
index d8bf939de..9edee8c37 100644
--- a/arch/cpu/cc2538/soc.h
+++ b/arch/cpu/cc2538/soc.h
@@ -43,7 +43,7 @@
 #ifndef SOC_H_
 #define SOC_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 
 #include <stdint.h>
 /*----------------------------------------------------------------------------*/
diff --git a/arch/cpu/cc2538/usb/cdc-acm-descriptors.c b/arch/cpu/cc2538/usb/cdc-acm-descriptors.c
index 111f6fe44..eb2a9d7b3 100644
--- a/arch/cpu/cc2538/usb/cdc-acm-descriptors.c
+++ b/arch/cpu/cc2538/usb/cdc-acm-descriptors.c
@@ -38,7 +38,7 @@
  * with the only change being the values for VID and PID
  */
 #include "descriptors.h"
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "cdc.h"
 #include "usb-arch.h"
 
diff --git a/arch/cpu/cc253x/dev/clock-isr.h b/arch/cpu/cc253x/dev/clock-isr.h
index 10ea71cb0..863844a0b 100644
--- a/arch/cpu/cc253x/dev/clock-isr.h
+++ b/arch/cpu/cc253x/dev/clock-isr.h
@@ -38,7 +38,7 @@
 #ifndef CLOCK_ISR_H_
 #define CLOCK_ISR_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "cc253x.h"
 
 void clock_isr(void) __interrupt(ST_VECTOR);
diff --git a/arch/cpu/cc253x/dev/lpm.h b/arch/cpu/cc253x/dev/lpm.h
index eb1522834..efa8dca2d 100644
--- a/arch/cpu/cc253x/dev/lpm.h
+++ b/arch/cpu/cc253x/dev/lpm.h
@@ -42,7 +42,7 @@
 #ifndef LPM_H_
 #define LPM_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 
 #define LPM_MODE_NONE 0 /* No LPM - Always on */
 #define LPM_MODE_IDLE 1 /* Set MCU Idle as part of the main loop */
diff --git a/arch/cpu/cc253x/dev/uart.h b/arch/cpu/cc253x/dev/uart.h
index 1a20fd530..9dc41bb7a 100644
--- a/arch/cpu/cc253x/dev/uart.h
+++ b/arch/cpu/cc253x/dev/uart.h
@@ -1,7 +1,7 @@
 #ifndef UART_H
 #define UART_H
 
-#include "contiki-conf.h"
+#include "contiki.h"
 
 #include "cc253x.h"
 #include "8051def.h"
diff --git a/arch/cpu/cc253x/dev/uart0.h b/arch/cpu/cc253x/dev/uart0.h
index 3245964bf..c79c8d0f6 100644
--- a/arch/cpu/cc253x/dev/uart0.h
+++ b/arch/cpu/cc253x/dev/uart0.h
@@ -1,7 +1,7 @@
 #ifndef UART_0_H
 #define UART_0_H
 
-#include "contiki-conf.h"
+#include "contiki.h"
 
 #include "cc253x.h"
 #include "8051def.h"
diff --git a/arch/cpu/cc253x/dev/uart1.h b/arch/cpu/cc253x/dev/uart1.h
index 203cfaa02..6e4ac62b8 100644
--- a/arch/cpu/cc253x/dev/uart1.h
+++ b/arch/cpu/cc253x/dev/uart1.h
@@ -1,7 +1,7 @@
 #ifndef UART_1_H
 #define UART_1_H
 
-#include "contiki-conf.h"
+#include "contiki.h"
 
 #include "cc253x.h"
 #include "8051def.h"
diff --git a/arch/cpu/cc253x/dev/watchdog.c b/arch/cpu/cc253x/dev/watchdog.c
index 8f35142fc..640b0210a 100644
--- a/arch/cpu/cc253x/dev/watchdog.c
+++ b/arch/cpu/cc253x/dev/watchdog.c
@@ -41,7 +41,7 @@
 
 #include "cc253x.h"
 #include "sfr-bits.h"
-#include "contiki-conf.h"
+#include "contiki.h"
 
 #define WDT_TIMEOUT_MIN    (WDCTL_INT1 | WDCTL_INT0)
 /*---------------------------------------------------------------------------*/
diff --git a/arch/cpu/cc253x/rtimer-arch.h b/arch/cpu/cc253x/rtimer-arch.h
index 69e27420d..2e21ef893 100644
--- a/arch/cpu/cc253x/rtimer-arch.h
+++ b/arch/cpu/cc253x/rtimer-arch.h
@@ -44,7 +44,7 @@
 #ifndef RTIMER_ARCH_H_
 #define RTIMER_ARCH_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "cc253x.h"
 
 /*
diff --git a/arch/cpu/cc253x/usb/cdc-acm-descriptors.c b/arch/cpu/cc253x/usb/cdc-acm-descriptors.c
index 3c1a78d88..05aeb0be6 100644
--- a/arch/cpu/cc253x/usb/cdc-acm-descriptors.c
+++ b/arch/cpu/cc253x/usb/cdc-acm-descriptors.c
@@ -1,5 +1,5 @@
 #include "descriptors.h"
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "cdc.h"
 #include "usb-arch.h"
 
diff --git a/arch/cpu/cc253x/usb/common/usb-arch.h b/arch/cpu/cc253x/usb/common/usb-arch.h
index a0f6db160..a9aae6e8c 100644
--- a/arch/cpu/cc253x/usb/common/usb-arch.h
+++ b/arch/cpu/cc253x/usb/common/usb-arch.h
@@ -1,7 +1,7 @@
 #ifndef USB_ARCH_H_0Z52ZDP0H6__
 #define USB_ARCH_H_0Z52ZDP0H6__
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "usb-api.h"
 
 
diff --git a/arch/cpu/cc26xx-cc13xx/dbg.h b/arch/cpu/cc26xx-cc13xx/dbg.h
index 9b28477f4..4460b6eb4 100644
--- a/arch/cpu/cc26xx-cc13xx/dbg.h
+++ b/arch/cpu/cc26xx-cc13xx/dbg.h
@@ -43,7 +43,7 @@
 #ifndef DBG_H_
 #define DBG_H_
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 /*---------------------------------------------------------------------------*/
 /**
  * \brief Print a stream of bytes
diff --git a/arch/cpu/cc26xx-cc13xx/dev/batmon-sensor.c b/arch/cpu/cc26xx-cc13xx/dev/batmon-sensor.c
index 795b55dec..423a9fbcc 100644
--- a/arch/cpu/cc26xx-cc13xx/dev/batmon-sensor.c
+++ b/arch/cpu/cc26xx-cc13xx/dev/batmon-sensor.c
@@ -36,7 +36,7 @@
  *  Driver for the CC13xx/CC26xx AON battery monitor
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "lib/sensors.h"
 #include "batmon-sensor.h"
 
diff --git a/arch/cpu/cc26xx-cc13xx/dev/cc26xx-uart.c b/arch/cpu/cc26xx-cc13xx/dev/cc26xx-uart.c
index 140a5d203..771353235 100644
--- a/arch/cpu/cc26xx-cc13xx/dev/cc26xx-uart.c
+++ b/arch/cpu/cc26xx-cc13xx/dev/cc26xx-uart.c
@@ -36,7 +36,7 @@
  * Implementation of the CC13xx/CC26xx UART driver.
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "cc26xx-uart.h"
 #include "hw_types.h"
 #include "hw_memmap.h"
diff --git a/arch/cpu/cc26xx-cc13xx/ieee-addr.c b/arch/cpu/cc26xx-cc13xx/ieee-addr.c
index 6f7e9a296..144240cc4 100644
--- a/arch/cpu/cc26xx-cc13xx/ieee-addr.c
+++ b/arch/cpu/cc26xx-cc13xx/ieee-addr.c
@@ -37,7 +37,7 @@
  * Driver for the CC13xx/CC26xx IEEE addresses
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "net/linkaddr.h"
 #include "ieee-addr.h"
 
diff --git a/arch/cpu/cc26xx-cc13xx/ieee-addr.h b/arch/cpu/cc26xx-cc13xx/ieee-addr.h
index 582854d49..017ed138e 100644
--- a/arch/cpu/cc26xx-cc13xx/ieee-addr.h
+++ b/arch/cpu/cc26xx-cc13xx/ieee-addr.h
@@ -64,7 +64,7 @@
 #ifndef IEEE_ADDR_H_
 #define IEEE_ADDR_H_
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 
 #include <stdint.h>
 /*---------------------------------------------------------------------------*/
diff --git a/arch/cpu/cc26xx-cc13xx/lpm.c b/arch/cpu/cc26xx-cc13xx/lpm.c
index f73c7827b..0b368beb6 100644
--- a/arch/cpu/cc26xx-cc13xx/lpm.c
+++ b/arch/cpu/cc26xx-cc13xx/lpm.c
@@ -41,7 +41,7 @@
  */
 /*---------------------------------------------------------------------------*/
 #include "prcm.h"
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "ti-lib.h"
 #include "lpm.h"
 #include "sys/energest.h"
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/dot-15-4g.h b/arch/cpu/cc26xx-cc13xx/rf-core/dot-15-4g.h
index 37a88fbff..7282ac9ba 100644
--- a/arch/cpu/cc26xx-cc13xx/rf-core/dot-15-4g.h
+++ b/arch/cpu/cc26xx-cc13xx/rf-core/dot-15-4g.h
@@ -44,7 +44,7 @@
 #ifndef DOT_15_4G_H_
 #define DOT_15_4G_H_
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 
 #include "driverlib/rf_mailbox.h"
 /*---------------------------------------------------------------------------*/
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/prop-mode-tx-power.c b/arch/cpu/cc26xx-cc13xx/rf-core/prop-mode-tx-power.c
index 2f14c30e9..0cfc5d3ba 100644
--- a/arch/cpu/cc26xx-cc13xx/rf-core/prop-mode-tx-power.c
+++ b/arch/cpu/cc26xx-cc13xx/rf-core/prop-mode-tx-power.c
@@ -36,7 +36,7 @@
  * Default TX power settings. The board can override
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "dev/radio.h"
 #include "rf-core/prop-mode.h"
 /*---------------------------------------------------------------------------*/
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/prop-mode.h b/arch/cpu/cc26xx-cc13xx/rf-core/prop-mode.h
index 55048777a..5beb7d7c4 100644
--- a/arch/cpu/cc26xx-cc13xx/rf-core/prop-mode.h
+++ b/arch/cpu/cc26xx-cc13xx/rf-core/prop-mode.h
@@ -43,7 +43,7 @@
 #ifndef PROP_MODE_H_
 #define PROP_MODE_H_
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "rf-core/dot-15-4g.h"
 
 #include <stdint.h>
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/rf-ble.c b/arch/cpu/cc26xx-cc13xx/rf-core/rf-ble.c
index bfa58c2d3..3faf75d25 100644
--- a/arch/cpu/cc26xx-cc13xx/rf-core/rf-ble.c
+++ b/arch/cpu/cc26xx-cc13xx/rf-core/rf-ble.c
@@ -36,7 +36,7 @@
  * Implementation of the CC13xx/CC26xx RF BLE driver
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "sys/process.h"
 #include "sys/clock.h"
 #include "sys/cc.h"
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/rf-ble.h b/arch/cpu/cc26xx-cc13xx/rf-core/rf-ble.h
index f26bd383e..6d91dc13d 100644
--- a/arch/cpu/cc26xx-cc13xx/rf-core/rf-ble.h
+++ b/arch/cpu/cc26xx-cc13xx/rf-core/rf-ble.h
@@ -43,7 +43,7 @@
 #ifndef RF_BLE_H_
 #define RF_BLE_H_
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "rf-core/rf-core.h"
 
 #include <stdint.h>
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/rf-core.c b/arch/cpu/cc26xx-cc13xx/rf-core/rf-core.c
index 5f56ca280..834a0578b 100644
--- a/arch/cpu/cc26xx-cc13xx/rf-core/rf-core.c
+++ b/arch/cpu/cc26xx-cc13xx/rf-core/rf-core.c
@@ -36,7 +36,7 @@
  * Implementation of the CC13xx/CC26xx RF core driver
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "dev/watchdog.h"
 #include "sys/process.h"
 #include "sys/energest.h"
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/rf-core.h b/arch/cpu/cc26xx-cc13xx/rf-core/rf-core.h
index 762aa5650..3264cfc01 100644
--- a/arch/cpu/cc26xx-cc13xx/rf-core/rf-core.h
+++ b/arch/cpu/cc26xx-cc13xx/rf-core/rf-core.h
@@ -51,7 +51,7 @@
 #ifndef RF_CORE_H_
 #define RF_CORE_H_
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "driverlib/rf_common_cmd.h"
 
 #include <stdint.h>
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/rf-switch.h b/arch/cpu/cc26xx-cc13xx/rf-core/rf-switch.h
index e50b9ff1f..8a701ba74 100644
--- a/arch/cpu/cc26xx-cc13xx/rf-core/rf-switch.h
+++ b/arch/cpu/cc26xx-cc13xx/rf-core/rf-switch.h
@@ -44,7 +44,7 @@
 #ifndef RF_SWITCH_H_
 #define RF_SWITCH_H_
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 
 #include <stdint.h>
 /*---------------------------------------------------------------------------*/
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/smartrf-settings.c b/arch/cpu/cc26xx-cc13xx/rf-core/smartrf-settings.c
index e42b6b66f..fde936147 100644
--- a/arch/cpu/cc26xx-cc13xx/rf-core/smartrf-settings.c
+++ b/arch/cpu/cc26xx-cc13xx/rf-core/smartrf-settings.c
@@ -28,7 +28,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 
 #include "rf-core/dot-15-4g.h"
 #include "driverlib/rf_mailbox.h"
diff --git a/arch/cpu/cc26xx-cc13xx/slip-arch.c b/arch/cpu/cc26xx-cc13xx/slip-arch.c
index c1be6849f..c509b2547 100644
--- a/arch/cpu/cc26xx-cc13xx/slip-arch.c
+++ b/arch/cpu/cc26xx-cc13xx/slip-arch.c
@@ -37,7 +37,7 @@
  * Arch-specific SLIP functions for the CC13xx/CC26xx
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "dev/cc26xx-uart.h"
 #include "dev/slip.h"
 /*---------------------------------------------------------------------------*/
diff --git a/arch/cpu/msp430/dev/lpm.h b/arch/cpu/msp430/dev/lpm.h
index ccdc08eea..f5e5cd74f 100644
--- a/arch/cpu/msp430/dev/lpm.h
+++ b/arch/cpu/msp430/dev/lpm.h
@@ -32,7 +32,7 @@
 #ifndef LPM_H_
 #define LPM_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 
 #ifdef LPM_CONF_ON
 #define LPM_ON LPM_CONF_ON
diff --git a/arch/cpu/msp430/f1xxx/spi.c b/arch/cpu/msp430/f1xxx/spi.c
index 0cf7c7715..c9e98508f 100644
--- a/arch/cpu/msp430/f1xxx/spi.c
+++ b/arch/cpu/msp430/f1xxx/spi.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "contiki-conf.h"
+#include "contiki.h"
 
 /*
  * On the Tmote sky access to I2C/SPI/UART0 must always be
diff --git a/arch/cpu/msp430/slip_uart0.c b/arch/cpu/msp430/slip_uart0.c
index 848498b50..01952b862 100644
--- a/arch/cpu/msp430/slip_uart0.c
+++ b/arch/cpu/msp430/slip_uart0.c
@@ -32,7 +32,7 @@
  * Machine dependent MSP430 SLIP routines for UART0.
  */
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "dev/slip.h"
 #include "dev/uart0.h"
 /*---------------------------------------------------------------------------*/
diff --git a/arch/cpu/native/net/linuxradio-drv.c b/arch/cpu/native/net/linuxradio-drv.c
index a6a4e50ca..117b2e431 100644
--- a/arch/cpu/native/net/linuxradio-drv.c
+++ b/arch/cpu/native/net/linuxradio-drv.c
@@ -34,7 +34,7 @@
  */
 
 #include "contiki.h"
-#include "contiki-conf.h"
+#include "contiki.h"
 
 #if defined(linux) && NETSTACK_CONF_WITH_IPV6
 
diff --git a/arch/cpu/native/rtimer-arch.h b/arch/cpu/native/rtimer-arch.h
index 8af0c9903..fa0cdeb83 100644
--- a/arch/cpu/native/rtimer-arch.h
+++ b/arch/cpu/native/rtimer-arch.h
@@ -40,7 +40,7 @@
 #ifndef RTIMER_ARCH_H_
 #define RTIMER_ARCH_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 
 #define RTIMER_ARCH_SECOND CLOCK_CONF_SECOND
 
diff --git a/arch/cpu/nrf52832/dev/uart0.h b/arch/cpu/nrf52832/dev/uart0.h
index c6b3938ea..226d14a60 100644
--- a/arch/cpu/nrf52832/dev/uart0.h
+++ b/arch/cpu/nrf52832/dev/uart0.h
@@ -43,7 +43,7 @@
 #define UART_0_H
 
 #include <stdint.h>
-#include "contiki-conf.h"
+#include "contiki.h"
 
 void uart0_init();
 void uart0_writeb(uint8_t byte);
diff --git a/arch/cpu/nrf52832/dev/watchdog.c b/arch/cpu/nrf52832/dev/watchdog.c
index 50e26d72b..5d358dcb6 100644
--- a/arch/cpu/nrf52832/dev/watchdog.c
+++ b/arch/cpu/nrf52832/dev/watchdog.c
@@ -41,7 +41,7 @@
  */
 #include <nrf_drv_wdt.h>
 #include "app_error.h"
-#include "contiki-conf.h"
+#include "contiki.h"
 
 static nrf_drv_wdt_channel_id wdt_channel_id;
 static uint8_t wdt_initialized = 0;
diff --git a/arch/dev/disk/mmc/mmc.h b/arch/dev/disk/mmc/mmc.h
index e639b2f96..aef6bd165 100644
--- a/arch/dev/disk/mmc/mmc.h
+++ b/arch/dev/disk/mmc/mmc.h
@@ -43,7 +43,7 @@
 #ifndef MMC_H_
 #define MMC_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "../disk.h"
 
 #ifndef MMC_CONF_DEV_COUNT
diff --git a/arch/platform/cooja/rtimer-arch.h b/arch/platform/cooja/rtimer-arch.h
index ffd23c824..072333bc1 100644
--- a/arch/platform/cooja/rtimer-arch.h
+++ b/arch/platform/cooja/rtimer-arch.h
@@ -33,7 +33,7 @@
 #ifndef RTIMER_ARCH_H_
 #define RTIMER_ARCH_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "sys/clock.h"
 
 #define RTIMER_ARCH_SECOND UINT64_C(1000000)
diff --git a/arch/platform/cooja/sys/clock.c b/arch/platform/cooja/sys/clock.c
index 381315d41..069515c1a 100644
--- a/arch/platform/cooja/sys/clock.c
+++ b/arch/platform/cooja/sys/clock.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "sys/clock.h"
 #include "lib/simEnvChange.h"
 
diff --git a/arch/platform/jn516x/dev/node-id.c b/arch/platform/jn516x/dev/node-id.c
index d0e95d521..c29aa8282 100644
--- a/arch/platform/jn516x/dev/node-id.c
+++ b/arch/platform/jn516x/dev/node-id.c
@@ -40,7 +40,7 @@
 
 #include "contiki.h"
 #include "sys/node-id.h"
-#include "contiki-conf.h"
+#include "contiki.h"
 
 /*---------------------------------------------------------------------------*/
 extern unsigned char node_mac[8];
diff --git a/arch/platform/jn516x/dev/slip_uart0.c b/arch/platform/jn516x/dev/slip_uart0.c
index a02791de2..ac88acbe4 100644
--- a/arch/platform/jn516x/dev/slip_uart0.c
+++ b/arch/platform/jn516x/dev/slip_uart0.c
@@ -32,7 +32,7 @@
  * Machine dependent jn516x SLIP routines for UART0.
  */
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "dev/slip.h"
 #include "dev/uart0.h"
 /*---------------------------------------------------------------------------*/
diff --git a/arch/platform/jn516x/dev/uart-driver.c b/arch/platform/jn516x/dev/uart-driver.c
index 8719004a7..31a4b286c 100644
--- a/arch/platform/jn516x/dev/uart-driver.c
+++ b/arch/platform/jn516x/dev/uart-driver.c
@@ -41,7 +41,7 @@
 #define DBG_vPrintf(...)
 #endif
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "uart-driver.h"
 #include "sys/rtimer.h"
 #include "watchdog.h"
diff --git a/arch/platform/jn516x/dev/uart-driver.h b/arch/platform/jn516x/dev/uart-driver.h
index 6ac0c2614..af4ff7840 100644
--- a/arch/platform/jn516x/dev/uart-driver.h
+++ b/arch/platform/jn516x/dev/uart-driver.h
@@ -37,7 +37,7 @@
 #define UARTDRIVER_H
 
 #include <jendefs.h>
-#include "contiki-conf.h"
+#include "contiki.h"
 
 #define UART_EXTRAS 1
 
diff --git a/arch/platform/jn516x/dev/uart0.c b/arch/platform/jn516x/dev/uart0.c
index 58432abcc..fcc686a47 100644
--- a/arch/platform/jn516x/dev/uart0.c
+++ b/arch/platform/jn516x/dev/uart0.c
@@ -41,7 +41,7 @@
 #include <jendefs.h>
 #include <AppHardwareApi.h>
 #include <PeripheralRegs.h>
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "dev/uart0.h"
 #include "uart-driver.h"
 
diff --git a/arch/platform/jn516x/dev/uart0.h b/arch/platform/jn516x/dev/uart0.h
index 6f93f7147..9b39c9d40 100644
--- a/arch/platform/jn516x/dev/uart0.h
+++ b/arch/platform/jn516x/dev/uart0.h
@@ -42,7 +42,7 @@
 #define __UART0_H__
 
 #include <PeripheralRegs.h>
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "uart-driver.h"
 
 #define UART_DEFAULT_RX_BUFFER_SIZE 2047
diff --git a/arch/platform/jn516x/dev/uart1.c b/arch/platform/jn516x/dev/uart1.c
index 7f4c1fa8f..4cd828f77 100644
--- a/arch/platform/jn516x/dev/uart1.c
+++ b/arch/platform/jn516x/dev/uart1.c
@@ -41,7 +41,7 @@
 #include <jendefs.h>
 #include <AppHardwareApi.h>
 #include <PeripheralRegs.h>
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "dev/uart1.h"
 #include "uart-driver.h"
 
diff --git a/arch/platform/jn516x/dev/uart1.h b/arch/platform/jn516x/dev/uart1.h
index 2fdc207ca..523537999 100644
--- a/arch/platform/jn516x/dev/uart1.h
+++ b/arch/platform/jn516x/dev/uart1.h
@@ -42,7 +42,7 @@
 #define __UART1_H__
 
 #include <PeripheralRegs.h>
-#include "contiki-conf.h"
+#include "contiki.h"
 
 /* Default buffer size
    Valid range for TX_BUFFER_SIZE and RX_BUFFER_SIZE: 16-2047 */
diff --git a/arch/platform/jn516x/lib/sprintf.c b/arch/platform/jn516x/lib/sprintf.c
index ed93f9885..dd2408090 100644
--- a/arch/platform/jn516x/lib/sprintf.c
+++ b/arch/platform/jn516x/lib/sprintf.c
@@ -41,7 +41,7 @@
  * modified by Beshr Al Nahas <beshr@sics.se> and Simon Duquennoy <simonduq@sics.se>
  */
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include <stdarg.h>
 #include <ctype.h>
 #include <stdlib.h>
diff --git a/arch/platform/native/cfs-coffee-arch.h b/arch/platform/native/cfs-coffee-arch.h
index 763e1ebae..db468ea7c 100644
--- a/arch/platform/native/cfs-coffee-arch.h
+++ b/arch/platform/native/cfs-coffee-arch.h
@@ -40,7 +40,7 @@
 #ifndef CFS_COFFEE_ARCH_H
 #define CFS_COFFEE_ARCH_H
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "dev/xmem.h"
 
 #define COFFEE_SECTOR_SIZE		65536UL
diff --git a/arch/platform/native/dev/xmem.c b/arch/platform/native/dev/xmem.c
index b95616049..bc0deceb7 100644
--- a/arch/platform/native/dev/xmem.c
+++ b/arch/platform/native/dev/xmem.c
@@ -32,7 +32,7 @@
  *
  */
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "dev/xmem.h"
 
 #include <stdio.h>
diff --git a/arch/platform/nrf52dk/contiki-main.c b/arch/platform/nrf52dk/contiki-main.c
index 9181d7faf..481f3655d 100644
--- a/arch/platform/nrf52dk/contiki-main.c
+++ b/arch/platform/nrf52dk/contiki-main.c
@@ -36,6 +36,8 @@
 #include <stdint.h>
 
 #include "nordic_common.h"
+#include "contiki.h"
+
 #include "nrf_drv_config.h"
 #include "nrf_drv_gpiote.h"
 #ifdef SOFTDEVICE_PRESENT
@@ -44,7 +46,6 @@
 #include "ble/ble-mac.h"
 #endif
 
-#include "contiki.h"
 #include "contiki-net.h"
 #include "leds.h"
 #include "lib/sensors.h"
diff --git a/arch/platform/nrf52dk/dbg-io/dbg.h b/arch/platform/nrf52dk/dbg-io/dbg.h
index 7c623336b..5d9568270 100644
--- a/arch/platform/nrf52dk/dbg-io/dbg.h
+++ b/arch/platform/nrf52dk/dbg-io/dbg.h
@@ -43,7 +43,7 @@
 #ifndef DBG_H_
 #define DBG_H_
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 /*---------------------------------------------------------------------------*/
 /**
  * \brief Print a stream of bytes
diff --git a/arch/platform/openmote-cc2538/board.c b/arch/platform/openmote-cc2538/board.c
index c27812a9a..664c0b8ee 100644
--- a/arch/platform/openmote-cc2538/board.c
+++ b/arch/platform/openmote-cc2538/board.c
@@ -39,7 +39,7 @@
  *  Board-initialisation for the OpenMote-CC2538 platform
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "dev/antenna.h"
 #include <stdint.h>
 #include <string.h>
diff --git a/arch/platform/openmote-cc2538/dev/antenna.c b/arch/platform/openmote-cc2538/dev/antenna.c
index 3672258f9..4018ddeb3 100644
--- a/arch/platform/openmote-cc2538/dev/antenna.c
+++ b/arch/platform/openmote-cc2538/dev/antenna.c
@@ -44,7 +44,7 @@
  * Driver implementation for the OpenMote-CC2538 antenna switch
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "dev/gpio.h"
 #include "dev/antenna.h"
 /*---------------------------------------------------------------------------*/
diff --git a/arch/platform/openmote-cc2538/dev/tps62730.c b/arch/platform/openmote-cc2538/dev/tps62730.c
index f90c0e097..5311e3960 100644
--- a/arch/platform/openmote-cc2538/dev/tps62730.c
+++ b/arch/platform/openmote-cc2538/dev/tps62730.c
@@ -46,7 +46,7 @@
  * Pere Tuset <peretuset@openmote.com>
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "dev/gpio.h"
 #include "dev/tps62730.h"
 /*---------------------------------------------------------------------------*/
diff --git a/arch/platform/sky/cfs-coffee-arch.h b/arch/platform/sky/cfs-coffee-arch.h
index 5eb183a42..842068707 100644
--- a/arch/platform/sky/cfs-coffee-arch.h
+++ b/arch/platform/sky/cfs-coffee-arch.h
@@ -40,7 +40,7 @@
 #ifndef CFS_COFFEE_ARCH_H
 #define CFS_COFFEE_ARCH_H
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "dev/xmem.h"
 
 /* Coffee configuration parameters. */
diff --git a/arch/platform/sky/node-id.c b/arch/platform/sky/node-id.c
index dcdabfa84..ce6f68f85 100644
--- a/arch/platform/sky/node-id.c
+++ b/arch/platform/sky/node-id.c
@@ -38,7 +38,7 @@
  */
 
 #include "sys/node-id.h"
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "dev/xmem.h"
 
 unsigned short node_id = 0;
diff --git a/arch/platform/srf06-cc26xx/launchpad/board.c b/arch/platform/srf06-cc26xx/launchpad/board.c
index 11a213cf1..74b12bd3d 100644
--- a/arch/platform/srf06-cc26xx/launchpad/board.c
+++ b/arch/platform/srf06-cc26xx/launchpad/board.c
@@ -36,7 +36,7 @@
  *  LaunchPad-specific board initialisation driver
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "lib/sensors.h"
 #include "lpm.h"
 #include "ti-lib.h"
diff --git a/arch/platform/srf06-cc26xx/launchpad/cc1350/rf-switch.c b/arch/platform/srf06-cc26xx/launchpad/cc1350/rf-switch.c
index 3e0ccff0e..42e648a73 100644
--- a/arch/platform/srf06-cc26xx/launchpad/cc1350/rf-switch.c
+++ b/arch/platform/srf06-cc26xx/launchpad/cc1350/rf-switch.c
@@ -36,7 +36,7 @@
  * CC1350 LP RF switch driver
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "lpm.h"
 #include "rf-core/rf-switch.h"
 #include "ti-lib.h"
diff --git a/arch/platform/srf06-cc26xx/launchpad/cc1350/tx-power-driver.c b/arch/platform/srf06-cc26xx/launchpad/cc1350/tx-power-driver.c
index d39556a51..6ff9d6be3 100644
--- a/arch/platform/srf06-cc26xx/launchpad/cc1350/tx-power-driver.c
+++ b/arch/platform/srf06-cc26xx/launchpad/cc1350/tx-power-driver.c
@@ -36,7 +36,7 @@
  * TX power settings for the CC1350 LP
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "dev/radio.h"
 #include "rf-core/prop-mode.h"
 /*---------------------------------------------------------------------------*/
diff --git a/arch/platform/srf06-cc26xx/sensortag/bmp-280-sensor.c b/arch/platform/srf06-cc26xx/sensortag/bmp-280-sensor.c
index a6e525cb1..e27a54610 100644
--- a/arch/platform/srf06-cc26xx/sensortag/bmp-280-sensor.c
+++ b/arch/platform/srf06-cc26xx/sensortag/bmp-280-sensor.c
@@ -36,7 +36,7 @@
  *  Driver for the Sensortag BMP280 Altimeter / Pressure Sensor
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "lib/sensors.h"
 #include "bmp-280-sensor.h"
 #include "sys/ctimer.h"
diff --git a/arch/platform/srf06-cc26xx/sensortag/board-i2c.c b/arch/platform/srf06-cc26xx/sensortag/board-i2c.c
index 238d091c1..cc30e0fb0 100644
--- a/arch/platform/srf06-cc26xx/sensortag/board-i2c.c
+++ b/arch/platform/srf06-cc26xx/sensortag/board-i2c.c
@@ -37,7 +37,7 @@
  * Board-specific I2C driver for the Sensortags
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "ti-lib.h"
 #include "board-i2c.h"
 #include "lpm.h"
diff --git a/arch/platform/srf06-cc26xx/sensortag/board.c b/arch/platform/srf06-cc26xx/sensortag/board.c
index f1f4a29e1..e2069f39f 100644
--- a/arch/platform/srf06-cc26xx/sensortag/board.c
+++ b/arch/platform/srf06-cc26xx/sensortag/board.c
@@ -36,7 +36,7 @@
  *  Sensortag-specific board initialisation driver
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "lib/sensors.h"
 #include "buzzer.h"
 #include "lpm.h"
diff --git a/arch/platform/srf06-cc26xx/sensortag/buzzer.c b/arch/platform/srf06-cc26xx/sensortag/buzzer.c
index 47ce799d4..45ab751d5 100644
--- a/arch/platform/srf06-cc26xx/sensortag/buzzer.c
+++ b/arch/platform/srf06-cc26xx/sensortag/buzzer.c
@@ -36,7 +36,7 @@
  *  Driver for the Sensortag Buzzer
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "buzzer.h"
 #include "ti-lib.h"
 #include "lpm.h"
diff --git a/arch/platform/srf06-cc26xx/sensortag/hdc-1000-sensor.c b/arch/platform/srf06-cc26xx/sensortag/hdc-1000-sensor.c
index ec300bf22..acc5f19be 100644
--- a/arch/platform/srf06-cc26xx/sensortag/hdc-1000-sensor.c
+++ b/arch/platform/srf06-cc26xx/sensortag/hdc-1000-sensor.c
@@ -36,7 +36,7 @@
  *  Driver for the Sensortag HDC sensor
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "sys/ctimer.h"
 #include "lib/sensors.h"
 #include "hdc-1000-sensor.h"
diff --git a/arch/platform/srf06-cc26xx/sensortag/mpu-9250-sensor.c b/arch/platform/srf06-cc26xx/sensortag/mpu-9250-sensor.c
index 886cccb6e..a2b3651e5 100644
--- a/arch/platform/srf06-cc26xx/sensortag/mpu-9250-sensor.c
+++ b/arch/platform/srf06-cc26xx/sensortag/mpu-9250-sensor.c
@@ -36,7 +36,7 @@
  *  Driver for the Sensortag Invensense MPU9250 motion processing unit
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "lib/sensors.h"
 #include "mpu-9250-sensor.h"
 #include "sys/rtimer.h"
diff --git a/arch/platform/srf06-cc26xx/sensortag/opt-3001-sensor.c b/arch/platform/srf06-cc26xx/sensortag/opt-3001-sensor.c
index a9b7ba01f..39568b227 100644
--- a/arch/platform/srf06-cc26xx/sensortag/opt-3001-sensor.c
+++ b/arch/platform/srf06-cc26xx/sensortag/opt-3001-sensor.c
@@ -36,7 +36,7 @@
  *  Driver for the Sensortag Opt3001 light sensor
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "lib/sensors.h"
 #include "opt-3001-sensor.h"
 #include "sys/ctimer.h"
diff --git a/arch/platform/srf06-cc26xx/sensortag/tmp-007-sensor.c b/arch/platform/srf06-cc26xx/sensortag/tmp-007-sensor.c
index fdbd975b1..c40dd2eff 100644
--- a/arch/platform/srf06-cc26xx/sensortag/tmp-007-sensor.c
+++ b/arch/platform/srf06-cc26xx/sensortag/tmp-007-sensor.c
@@ -36,7 +36,7 @@
  *  Driver for the Sensortag TI TMP007 infrared thermophile sensor
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "lib/sensors.h"
 #include "tmp-007-sensor.h"
 #include "sys/ctimer.h"
diff --git a/arch/platform/srf06-cc26xx/srf06/board.c b/arch/platform/srf06-cc26xx/srf06/board.c
index 2d59d4ea4..119f77994 100644
--- a/arch/platform/srf06-cc26xx/srf06/board.c
+++ b/arch/platform/srf06-cc26xx/srf06/board.c
@@ -36,7 +36,7 @@
  *  Board-initialisation for the Srf06EB with a CC13xx/CC26xx EM.
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "ti-lib.h"
 #include "lpm.h"
 #include "prcm.h"
diff --git a/arch/platform/zoul/firefly-reva/board.c b/arch/platform/zoul/firefly-reva/board.c
index f00c82000..1824e43ba 100644
--- a/arch/platform/zoul/firefly-reva/board.c
+++ b/arch/platform/zoul/firefly-reva/board.c
@@ -37,7 +37,7 @@
  *
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include <stdint.h>
 #include <string.h>
 /*---------------------------------------------------------------------------*/
diff --git a/arch/platform/zoul/firefly/board.c b/arch/platform/zoul/firefly/board.c
index f00c82000..1824e43ba 100644
--- a/arch/platform/zoul/firefly/board.c
+++ b/arch/platform/zoul/firefly/board.c
@@ -37,7 +37,7 @@
  *
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include <stdint.h>
 #include <string.h>
 /*---------------------------------------------------------------------------*/
diff --git a/arch/platform/zoul/fs/fat/ffconf.h b/arch/platform/zoul/fs/fat/ffconf.h
index 38f529709..526091835 100644
--- a/arch/platform/zoul/fs/fat/ffconf.h
+++ b/arch/platform/zoul/fs/fat/ffconf.h
@@ -47,7 +47,7 @@
 #ifndef FFCONF_H_
 #define FFCONF_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 
 #define _FFCONF 68020 /**< Revision ID */
 
diff --git a/arch/platform/zoul/orion/board.c b/arch/platform/zoul/orion/board.c
index a68b23bfc..2c137c562 100644
--- a/arch/platform/zoul/orion/board.c
+++ b/arch/platform/zoul/orion/board.c
@@ -38,7 +38,7 @@
  *
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include <stdint.h>
 #include <string.h>
 /*---------------------------------------------------------------------------*/
diff --git a/arch/platform/zoul/remote-reva/board.c b/arch/platform/zoul/remote-reva/board.c
index ddf85ed86..c412eaea0 100644
--- a/arch/platform/zoul/remote-reva/board.c
+++ b/arch/platform/zoul/remote-reva/board.c
@@ -37,7 +37,7 @@
  *
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "antenna-sw.h"
 #include <stdint.h>
 #include <string.h>
diff --git a/arch/platform/zoul/remote-revb/board.c b/arch/platform/zoul/remote-revb/board.c
index f3e39617c..b733bdb9b 100644
--- a/arch/platform/zoul/remote-revb/board.c
+++ b/arch/platform/zoul/remote-revb/board.c
@@ -37,7 +37,7 @@
  *
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "antenna-sw.h"
 #include <stdint.h>
 #include <string.h>
diff --git a/examples/platform-specific/cc2538-common/mqtt-demo/mqtt-demo.c b/examples/platform-specific/cc2538-common/mqtt-demo/mqtt-demo.c
index b3c721c2a..93294ee56 100644
--- a/examples/platform-specific/cc2538-common/mqtt-demo/mqtt-demo.c
+++ b/examples/platform-specific/cc2538-common/mqtt-demo/mqtt-demo.c
@@ -41,7 +41,7 @@
  * An MQTT example for the cc2538-based platforms
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #if UIP_CONF_IPV6_RPL_LITE == 0
 #include "rpl-private.h"
 #endif /* UIP_CONF_IPV6_RPL_LITE == 0 */
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/mqtt-client.c b/examples/platform-specific/cc26xx/cc26xx-web-demo/mqtt-client.c
index 563069d54..2f0b04b05 100644
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/mqtt-client.c
+++ b/examples/platform-specific/cc26xx/cc26xx-web-demo/mqtt-client.c
@@ -35,7 +35,7 @@
  *   MQTT/IBM cloud service client for the CC26XX web demo.
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #if UIP_CONF_IPV6_RPL_LITE == 0
 #include "rpl-private.h"
 #endif /* UIP_CONF_IPV6_RPL_LITE == 0 */
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/net-uart.c b/examples/platform-specific/cc26xx/cc26xx-web-demo/net-uart.c
index c3ddf0977..07a7590c2 100644
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/net-uart.c
+++ b/examples/platform-specific/cc26xx/cc26xx-web-demo/net-uart.c
@@ -56,7 +56,7 @@
  *        nc -6u \<node IPv6 address\> REMOTE_PORT
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "sys/process.h"
 #include "dev/serial-line.h"
 #include "dev/cc26xx-uart.h"
diff --git a/examples/platform-specific/jn516x/rpl/tools/rpl-tools.c b/examples/platform-specific/jn516x/rpl/tools/rpl-tools.c
index 4dfb0d4cc..465fe2ae6 100644
--- a/examples/platform-specific/jn516x/rpl/tools/rpl-tools.c
+++ b/examples/platform-specific/jn516x/rpl/tools/rpl-tools.c
@@ -33,7 +33,7 @@
  * \author Simon Duquennoy <simonduq@sics.se>
  */
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "contiki-net.h"
 #include "net/ip/uip.h"
 #include "rpl.h"
diff --git a/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/node.c b/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/node.c
index 4ef32c200..d8c23b752 100644
--- a/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/node.c
+++ b/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/node.c
@@ -32,7 +32,7 @@
 *
 */
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "net/netstack.h"
 #include "net/mac/tsch/tsch-schedule.h"
 #include "net/mac/tsch/tsch.h"
diff --git a/examples/platform-specific/jn516x/tsch/tools/rpl-tools.c b/examples/platform-specific/jn516x/tsch/tools/rpl-tools.c
index 3a0021982..d961c8d7f 100644
--- a/examples/platform-specific/jn516x/tsch/tools/rpl-tools.c
+++ b/examples/platform-specific/jn516x/tsch/tools/rpl-tools.c
@@ -33,7 +33,7 @@
  * \author Simon Duquennoy <simonduq@sics.se>
  */
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "contiki-net.h"
 #include "net/ip/uip.h"
 #include "rpl.h"
diff --git a/examples/platform-specific/nrf52dk/mqtt-demo/mqtt-demo.c b/examples/platform-specific/nrf52dk/mqtt-demo/mqtt-demo.c
index 6a3482073..5b74a2613 100644
--- a/examples/platform-specific/nrf52dk/mqtt-demo/mqtt-demo.c
+++ b/examples/platform-specific/nrf52dk/mqtt-demo/mqtt-demo.c
@@ -42,7 +42,7 @@
  * An MQTT example for the nrf52dk platform
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "mqtt.h"
 #include "net/ip/uip.h"
 #include "net/ipv6/uip-icmp6.h"
diff --git a/examples/sensniff/jn516x/jn516x-io.h b/examples/sensniff/jn516x/jn516x-io.h
index d38ae91eb..89ee9dfda 100644
--- a/examples/sensniff/jn516x/jn516x-io.h
+++ b/examples/sensniff/jn516x/jn516x-io.h
@@ -32,7 +32,7 @@
 #ifndef JN516X_IO_H_
 #define JN516X_IO_H_
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "dev/uart0.h"
 #include "dev/uart1.h"
 /*---------------------------------------------------------------------------*/
diff --git a/examples/sensniff/pool/cc13xx-cc26xx-io.h b/examples/sensniff/pool/cc13xx-cc26xx-io.h
index 556fd669a..e9935a8ae 100644
--- a/examples/sensniff/pool/cc13xx-cc26xx-io.h
+++ b/examples/sensniff/pool/cc13xx-cc26xx-io.h
@@ -32,7 +32,7 @@
 #ifndef CC13XX_CC26XX_IO_H_
 #define CC13XX_CC26XX_IO_H_
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "dev/cc26xx-uart.h"
 /*---------------------------------------------------------------------------*/
 #define sensniff_io_byte_out(b)  cc26xx_uart_write_byte(b)
diff --git a/examples/sensniff/pool/cc2530-cc2531-io.h b/examples/sensniff/pool/cc2530-cc2531-io.h
index 08ecc289d..cfed98f1d 100644
--- a/examples/sensniff/pool/cc2530-cc2531-io.h
+++ b/examples/sensniff/pool/cc2530-cc2531-io.h
@@ -32,7 +32,7 @@
 #ifndef CC2530_CC2531_IO_H_
 #define CC2530_CC2531_IO_H_
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "dev/io-arch.h"
 /*---------------------------------------------------------------------------*/
 #define sensniff_io_byte_out(b)  io_arch_writeb(b)
diff --git a/examples/sensniff/pool/cc2538-io.h b/examples/sensniff/pool/cc2538-io.h
index ee82ce0a4..1238a23e2 100644
--- a/examples/sensniff/pool/cc2538-io.h
+++ b/examples/sensniff/pool/cc2538-io.h
@@ -29,7 +29,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "dev/uart.h"
 #include "usb/usb-serial.h"
 /*---------------------------------------------------------------------------*/
diff --git a/examples/sensniff/pool/msp430-io.h b/examples/sensniff/pool/msp430-io.h
index a4fefc641..0a8f15c9f 100644
--- a/examples/sensniff/pool/msp430-io.h
+++ b/examples/sensniff/pool/msp430-io.h
@@ -32,7 +32,7 @@
 #ifndef MSP430_IO_H_
 #define MSP430_IO_H_
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "dev/uart0.h"
 #include "dev/uart1.h"
 /*---------------------------------------------------------------------------*/
diff --git a/examples/sensniff/sensniff.h b/examples/sensniff/sensniff.h
index cbddcb8ca..68831ff70 100644
--- a/examples/sensniff/sensniff.h
+++ b/examples/sensniff/sensniff.h
@@ -32,7 +32,7 @@
 #ifndef SENSNIFF_H_
 #define SENSNIFF_H_
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 
 #include <stdint.h>
 /*---------------------------------------------------------------------------*/
diff --git a/os/dev/leds.h b/os/dev/leds.h
index 839852c41..d99fb8196 100644
--- a/os/dev/leds.h
+++ b/os/dev/leds.h
@@ -48,7 +48,7 @@
 #define LEDS_H_
 
 /* Allow platform to override LED numbering */
-#include "contiki-conf.h"
+#include "contiki.h"
 
 void leds_init(void);
 
diff --git a/os/lib/ifft.c b/os/lib/ifft.c
index 96d9cee22..3c0faee37 100644
--- a/os/lib/ifft.c
+++ b/os/lib/ifft.c
@@ -35,6 +35,8 @@
  * Updated : $Date: 2008/07/03 23:40:12 $
  *           $Revision: 1.3 $
  */
+
+#include "contiki.h"
 #include "lib/ifft.h"
 
 /*---------------------------------------------------------------------------*/
@@ -42,7 +44,6 @@
 /* NOTE: symmetry can be used to reduce this to 1/2 or 1/4 the size */
 #define SIN_TAB_LEN 120
 #define RESOLUTION 7
-#define ABS(x) (x < 0 ? -x : x)
 
 static const int8_t SIN_TAB[] = {
  0,6,13,20,26,33,39,45,52,58,63,69,75,80,
diff --git a/os/lib/ifft.h b/os/lib/ifft.h
index f26d84033..f59878e01 100644
--- a/os/lib/ifft.h
+++ b/os/lib/ifft.h
@@ -39,7 +39,7 @@
 
 #ifndef IFFT_H
 #define IFFT_H
-#include "contiki-conf.h"
+#include "contiki.h"
 
 /* ifft(xre[], n) - integer (fixpoint) version of Fast Fourier Transform
    An integer version of FFT that takes in-samples in an int16_t array
diff --git a/os/lib/json/jsonparse.h b/os/lib/json/jsonparse.h
index 419186249..abf75ee23 100644
--- a/os/lib/json/jsonparse.h
+++ b/os/lib/json/jsonparse.h
@@ -32,7 +32,7 @@
 #ifndef JSONPARSE_H_
 #define JSONPARSE_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "json.h"
 
 #ifdef JSONPARSE_CONF_MAX_DEPTH
diff --git a/os/lib/json/jsontree.h b/os/lib/json/jsontree.h
index a6c349d80..09aefc11c 100644
--- a/os/lib/json/jsontree.h
+++ b/os/lib/json/jsontree.h
@@ -40,7 +40,7 @@
 #ifndef JSONTREE_H_
 #define JSONTREE_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "json.h"
 
 #ifdef JSONTREE_CONF_MAX_DEPTH
diff --git a/os/lib/ringbuf.h b/os/lib/ringbuf.h
index f49acc2eb..8ef12c457 100644
--- a/os/lib/ringbuf.h
+++ b/os/lib/ringbuf.h
@@ -54,7 +54,7 @@
 #ifndef RINGBUF_H_
 #define RINGBUF_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 
 /**
  * \brief      Structure that holds the state of a ring buffer.
diff --git a/os/lib/ringbufindex.h b/os/lib/ringbufindex.h
index 6fa07b966..44bf5f82e 100644
--- a/os/lib/ringbufindex.h
+++ b/os/lib/ringbufindex.h
@@ -40,7 +40,7 @@
 #ifndef __RINGBUFINDEX_H__
 #define __RINGBUFINDEX_H__
 
-#include "contiki-conf.h"
+#include "contiki.h"
 
 struct ringbufindex {
   uint8_t mask;
diff --git a/os/lib/trickle-timer.c b/os/lib/trickle-timer.c
index fd2d7c537..9180e1bf3 100644
--- a/os/lib/trickle-timer.c
+++ b/os/lib/trickle-timer.c
@@ -41,7 +41,7 @@
  * @{
  */
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "lib/trickle-timer.h"
 #include "sys/ctimer.h"
 #include "sys/cc.h"
diff --git a/os/lib/trickle-timer.h b/os/lib/trickle-timer.h
index bf56cea53..20b694e1e 100644
--- a/os/lib/trickle-timer.h
+++ b/os/lib/trickle-timer.h
@@ -71,7 +71,7 @@
 #ifndef TRICKLE_TIMER_H_
 #define TRICKLE_TIMER_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "sys/ctimer.h"
 /*---------------------------------------------------------------------------*/
 /* Trickle Timer Library Constants */
diff --git a/os/net/ip/uip-udp-packet.c b/os/net/ip/uip-udp-packet.c
index aa86435f9..d169c3909 100644
--- a/os/net/ip/uip-udp-packet.c
+++ b/os/net/ip/uip-udp-packet.c
@@ -37,7 +37,7 @@
  *         Adam Dunkels <adam@sics.se>
  */
 
-#include "contiki-conf.h"
+#include "contiki.h"
 
 extern uint16_t uip_slen;
 
diff --git a/os/net/ip/uipopt.h b/os/net/ip/uipopt.h
index 21e81fdde..5a401b123 100644
--- a/os/net/ip/uipopt.h
+++ b/os/net/ip/uipopt.h
@@ -71,7 +71,7 @@
 #define UIP_BIG_ENDIAN     1234
 #endif /* UIP_BIG_ENDIAN */
 
-#include "contiki-conf.h"
+#include "contiki.h"
 
 /*------------------------------------------------------------------------------*/
 
diff --git a/os/net/ip64/ip64-addrmap.h b/os/net/ip64/ip64-addrmap.h
index c4a31efcc..5f15bff47 100644
--- a/os/net/ip64/ip64-addrmap.h
+++ b/os/net/ip64/ip64-addrmap.h
@@ -32,7 +32,7 @@
 #ifndef IP64_ADDRMAP_H
 #define IP64_ADDRMAP_H
 
-
+#include "contiki.h"
 #include "sys/timer.h"
 #include "net/ip/uip.h"
 
diff --git a/os/net/ip64/ip64-eth.h b/os/net/ip64/ip64-eth.h
index aa9448a86..a96d304ef 100644
--- a/os/net/ip64/ip64-eth.h
+++ b/os/net/ip64/ip64-eth.h
@@ -32,7 +32,7 @@
 #ifndef IP64_ETH_H
 #define IP64_ETH_H
 
-#include "contiki-conf.h"
+#include "contiki.h"
 
 /**
  * The Ethernet address.
diff --git a/os/net/ipv6/multicast/esmrf.h b/os/net/ipv6/multicast/esmrf.h
index 4a12a38cf..a44a87396 100644
--- a/os/net/ipv6/multicast/esmrf.h
+++ b/os/net/ipv6/multicast/esmrf.h
@@ -40,7 +40,7 @@
 #ifndef ESMRF_H_
 #define ESMRF_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 
 #include <stdint.h>
 /*---------------------------------------------------------------------------*/
diff --git a/os/net/ipv6/multicast/roll-tm.h b/os/net/ipv6/multicast/roll-tm.h
index fce300f95..59b9d1e92 100644
--- a/os/net/ipv6/multicast/roll-tm.h
+++ b/os/net/ipv6/multicast/roll-tm.h
@@ -62,7 +62,7 @@
 #ifndef ROLL_TM_H_
 #define ROLL_TM_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "net/ipv6/multicast/uip-mcast6-stats.h"
 
 #include <stdint.h>
diff --git a/os/net/ipv6/multicast/smrf.h b/os/net/ipv6/multicast/smrf.h
index 51dcf216e..2b2e44a5e 100644
--- a/os/net/ipv6/multicast/smrf.h
+++ b/os/net/ipv6/multicast/smrf.h
@@ -50,7 +50,7 @@
 #ifndef SMRF_H_
 #define SMRF_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 
 #include <stdint.h>
 /*---------------------------------------------------------------------------*/
diff --git a/os/net/ipv6/multicast/uip-mcast6-stats.h b/os/net/ipv6/multicast/uip-mcast6-stats.h
index 263758b66..afb03ffda 100644
--- a/os/net/ipv6/multicast/uip-mcast6-stats.h
+++ b/os/net/ipv6/multicast/uip-mcast6-stats.h
@@ -41,7 +41,7 @@
 #ifndef UIP_MCAST6_STATS_H_
 #define UIP_MCAST6_STATS_H_
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 
 #include <stdint.h>
 /*---------------------------------------------------------------------------*/
diff --git a/os/net/ipv6/multicast/uip-mcast6.h b/os/net/ipv6/multicast/uip-mcast6.h
index 7a20ace82..390948caa 100644
--- a/os/net/ipv6/multicast/uip-mcast6.h
+++ b/os/net/ipv6/multicast/uip-mcast6.h
@@ -59,7 +59,7 @@
 #ifndef UIP_MCAST6_H_
 #define UIP_MCAST6_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "net/ipv6/multicast/uip-mcast6-engines.h"
 #include "net/ipv6/multicast/uip-mcast6-route.h"
 #include "net/ipv6/multicast/smrf.h"
diff --git a/os/net/linkaddr.h b/os/net/linkaddr.h
index a9092cdb0..10c3ca762 100644
--- a/os/net/linkaddr.h
+++ b/os/net/linkaddr.h
@@ -53,7 +53,7 @@
 #ifndef LINKADDR_H_
 #define LINKADDR_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 
 #ifdef LINKADDR_CONF_SIZE
 #define LINKADDR_SIZE LINKADDR_CONF_SIZE
diff --git a/os/net/mac/csma/csma-output.h b/os/net/mac/csma/csma-output.h
index d1dac7918..c67ba1903 100644
--- a/os/net/mac/csma/csma-output.h
+++ b/os/net/mac/csma/csma-output.h
@@ -42,7 +42,7 @@
 #ifndef CSMA_OUTPUT_H_
 #define CSMA_OUTPUT_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "net/mac/mac.h"
 
 void csma_output_packet(mac_callback_t sent, void *ptr);
diff --git a/os/net/mac/csma/csma.h b/os/net/mac/csma/csma.h
index 5264b9d24..9e0773f28 100644
--- a/os/net/mac/csma/csma.h
+++ b/os/net/mac/csma/csma.h
@@ -41,7 +41,7 @@
 #ifndef CSMA_H_
 #define CSMA_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "net/mac/mac.h"
 #include "dev/radio.h"
 
diff --git a/os/net/mac/framer/frame802154.h b/os/net/mac/framer/frame802154.h
index 50deca0ae..e869f0c79 100644
--- a/os/net/mac/framer/frame802154.h
+++ b/os/net/mac/framer/frame802154.h
@@ -65,7 +65,7 @@
 #ifndef FRAME_802154_H
 #define FRAME_802154_H
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "net/linkaddr.h"
 
 #ifdef IEEE802154_CONF_PANID
diff --git a/os/net/mac/mac.h b/os/net/mac/mac.h
index be0b5d470..ce68d46c7 100644
--- a/os/net/mac/mac.h
+++ b/os/net/mac/mac.h
@@ -40,7 +40,7 @@
 #ifndef MAC_H_
 #define MAC_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "dev/radio.h"
 
 
diff --git a/os/net/netstack.h b/os/net/netstack.h
index 5f109f9d5..b7e64a84d 100644
--- a/os/net/netstack.h
+++ b/os/net/netstack.h
@@ -41,7 +41,7 @@
 #ifndef NETSTACK_H
 #define NETSTACK_H
 
-#include "contiki-conf.h"
+#include "contiki.h"
 
 #ifndef NETSTACK_NETWORK
 #ifdef NETSTACK_CONF_NETWORK
diff --git a/os/net/packetbuf.h b/os/net/packetbuf.h
index d25dcd936..1c7ce82a6 100644
--- a/os/net/packetbuf.h
+++ b/os/net/packetbuf.h
@@ -52,7 +52,7 @@
 #ifndef PACKETBUF_H_
 #define PACKETBUF_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "net/linkaddr.h"
 #include "net/mac/llsec802154.h"
 #include "net/mac/tsch/tsch-conf.h"
diff --git a/os/net/rpl-lite/rpl-conf.h b/os/net/rpl-lite/rpl-conf.h
index 7a7cdb557..6bf29219b 100644
--- a/os/net/rpl-lite/rpl-conf.h
+++ b/os/net/rpl-lite/rpl-conf.h
@@ -39,7 +39,7 @@
 #ifndef RPL_CONF_H
 #define RPL_CONF_H
 
-#include "contiki-conf.h"
+#include "contiki.h"
 
 /******************************************************************************/
 /*********************** Enabling/disabling features **************************/
diff --git a/os/net/rpl-lite/rpl-timers.c b/os/net/rpl-lite/rpl-timers.c
index b8794e26d..c0f09e47b 100644
--- a/os/net/rpl-lite/rpl-timers.c
+++ b/os/net/rpl-lite/rpl-timers.c
@@ -42,7 +42,7 @@
  * @{
  */
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "net/rpl-lite/rpl.h"
 #include "net/link-stats.h"
 #include "lib/random.h"
diff --git a/os/net/rpl/rpl-conf.h b/os/net/rpl/rpl-conf.h
index b35865ec3..f540a849e 100644
--- a/os/net/rpl/rpl-conf.h
+++ b/os/net/rpl/rpl-conf.h
@@ -38,7 +38,7 @@
 #ifndef RPL_CONF_H
 #define RPL_CONF_H
 
-#include "contiki-conf.h"
+#include "contiki.h"
 
 /* DAG Mode of Operation */
 #define RPL_MOP_NO_DOWNWARD_ROUTES      0
diff --git a/os/net/rpl/rpl-timers.c b/os/net/rpl/rpl-timers.c
index 7f071b155..ef5baebfe 100644
--- a/os/net/rpl/rpl-timers.c
+++ b/os/net/rpl/rpl-timers.c
@@ -41,7 +41,7 @@
  * @{
  */
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "net/rpl/rpl-private.h"
 #include "net/rpl/rpl-ns.h"
 #include "net/link-stats.h"
diff --git a/os/services/ipso-objects/ipso-objects.h b/os/services/ipso-objects/ipso-objects.h
index 13cfecae6..6b8f5c2a6 100644
--- a/os/services/ipso-objects/ipso-objects.h
+++ b/os/services/ipso-objects/ipso-objects.h
@@ -52,7 +52,7 @@
 #ifndef IPSO_OBJECTS_H_
 #define IPSO_OBJECTS_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 
 void ipso_temperature_init(void);
 void ipso_button_init(void);
diff --git a/os/services/lwm2m/lwm2m-device.h b/os/services/lwm2m/lwm2m-device.h
index 5e80c786a..4587822d5 100644
--- a/os/services/lwm2m/lwm2m-device.h
+++ b/os/services/lwm2m/lwm2m-device.h
@@ -44,7 +44,7 @@
 #ifndef LWM2M_DEVICE_H_
 #define LWM2M_DEVICE_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 
 #ifndef LWM2M_DEVICE_MODEL_NUMBER
 #ifdef BOARD_STRING
diff --git a/os/storage/antelope/db-options.h b/os/storage/antelope/db-options.h
index 702c7bbd4..f82c72edc 100644
--- a/os/storage/antelope/db-options.h
+++ b/os/storage/antelope/db-options.h
@@ -37,7 +37,7 @@
 #ifndef DB_OPTIONS_H
 #define DB_OPTIONS_H
 
-#include "contiki-conf.h"
+#include "contiki.h"
 
 /*----------------------------------------------------------------------------*/
 
diff --git a/os/storage/cfs/cfs-coffee.c b/os/storage/cfs/cfs-coffee.c
index 474b4741d..75cbf730e 100644
--- a/os/storage/cfs/cfs-coffee.c
+++ b/os/storage/cfs/cfs-coffee.c
@@ -54,7 +54,7 @@
 #define PRINTF(...)
 #endif
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "cfs/cfs.h"
 #include "cfs-coffee-arch.h"
 #include "cfs/cfs-coffee.h"
diff --git a/os/sys/autostart.c b/os/sys/autostart.c
index a0d8a77b4..f2dc8f1f5 100644
--- a/os/sys/autostart.c
+++ b/os/sys/autostart.c
@@ -52,7 +52,7 @@ void
 autostart_start(struct process * const processes[])
 {
   int i;
-  
+
   for(i = 0; processes[i] != NULL; ++i) {
     process_start(processes[i], NULL);
     PRINTF("autostart_start: starting process '%s'\n", processes[i]->name);
@@ -63,7 +63,7 @@ void
 autostart_exit(struct process * const processes[])
 {
   int i;
-  
+
   for(i = 0; processes[i] != NULL; ++i) {
     process_exit(processes[i]);
     PRINTF("autostart_exit: stopping process '%s'\n", processes[i]->name);
diff --git a/os/sys/autostart.h b/os/sys/autostart.h
index a88dbd6b6..a2cd10eb7 100644
--- a/os/sys/autostart.h
+++ b/os/sys/autostart.h
@@ -40,6 +40,7 @@
 #ifndef AUTOSTART_H_
 #define AUTOSTART_H_
 
+#include "contiki.h"
 #include "sys/process.h"
 
 #if ! CC_NO_VA_ARGS
diff --git a/os/sys/cc.h b/os/sys/cc.h
index 55567a954..6670eca46 100644
--- a/os/sys/cc.h
+++ b/os/sys/cc.h
@@ -45,7 +45,7 @@
 #ifndef CC_H_
 #define CC_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "sys/cc-gcc.h"
 
 /**
diff --git a/os/sys/clock.h b/os/sys/clock.h
index 4cbfdb223..9aa2b79c8 100644
--- a/os/sys/clock.h
+++ b/os/sys/clock.h
@@ -69,7 +69,7 @@
 #ifndef CLOCK_H_
 #define CLOCK_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 
 /**
  * A second, measured in system clock time.
diff --git a/os/sys/compower.c b/os/sys/compower.c
index c15c55ae9..206fab81d 100644
--- a/os/sys/compower.c
+++ b/os/sys/compower.c
@@ -42,7 +42,7 @@
  * @{
  */
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "sys/energest.h"
 #include "sys/compower.h"
 #include "net/packetbuf.h"
diff --git a/os/sys/ctimer.h b/os/sys/ctimer.h
index dabf43d8a..0bdbb07b0 100644
--- a/os/sys/ctimer.h
+++ b/os/sys/ctimer.h
@@ -54,6 +54,7 @@
 #ifndef CTIMER_H_
 #define CTIMER_H_
 
+#include "contiki.h"
 #include "sys/etimer.h"
 
 struct ctimer {
diff --git a/os/sys/energest.c b/os/sys/energest.c
index 5b0f6cb86..925c9500c 100644
--- a/os/sys/energest.c
+++ b/os/sys/energest.c
@@ -38,7 +38,7 @@
  */
 
 #include "sys/energest.h"
-#include "contiki-conf.h"
+#include "contiki.h"
 
 #if ENERGEST_CONF_ON
 
diff --git a/os/sys/etimer.c b/os/sys/etimer.c
index 17ac74285..19657813d 100644
--- a/os/sys/etimer.c
+++ b/os/sys/etimer.c
@@ -44,7 +44,7 @@
  * Adam Dunkels <adam@sics.se>
  */
 
-#include "contiki-conf.h"
+#include "contiki.h"
 
 #include "sys/etimer.h"
 #include "sys/process.h"
diff --git a/os/sys/etimer.h b/os/sys/etimer.h
index ebbcfc7fd..438196709 100644
--- a/os/sys/etimer.h
+++ b/os/sys/etimer.h
@@ -62,8 +62,7 @@
 #ifndef ETIMER_H_
 #define ETIMER_H_
 
-#include "sys/timer.h"
-#include "sys/process.h"
+#include "contiki.h"
 
 /**
  * A timer.
diff --git a/os/sys/process.c b/os/sys/process.c
index f98057cd3..58b54d4c0 100644
--- a/os/sys/process.c
+++ b/os/sys/process.c
@@ -45,6 +45,7 @@
 
 #include <stdio.h>
 
+#include "contiki.h"
 #include "sys/process.h"
 #include "sys/arg.h"
 
@@ -53,7 +54,7 @@
  */
 struct process *process_list = NULL;
 struct process *process_current = NULL;
- 
+
 static process_event_t lastevent;
 
 /*
@@ -181,7 +182,7 @@ call_process(struct process *p, process_event_t ev, process_data_t data)
     printf("process: process '%s' called again with event %d\n", PROCESS_NAME_STRING(p), ev);
   }
 #endif /* DEBUG */
-  
+
   if((p->state & PROCESS_STATE_RUNNING) &&
      p->thread != NULL) {
     PRINTF("process: calling process '%s' with event %d\n", PROCESS_NAME_STRING(p), ev);
@@ -249,7 +250,7 @@ do_event(void)
   process_data_t data;
   struct process *receiver;
   struct process *p;
-  
+
   /*
    * If there are any events in the queue, take the first one and walk
    * through the list of processes to see if the event should be
@@ -259,10 +260,10 @@ do_event(void)
    */
 
   if(nevents > 0) {
-    
+
     /* There are events that we should deliver. */
     ev = events[fevent].ev;
-    
+
     data = events[fevent].data;
     receiver = events[fevent].p;
 
@@ -331,7 +332,7 @@ process_post(struct process *p, process_event_t ev, process_data_t data)
 	   PROCESS_NAME_STRING(PROCESS_CURRENT()), ev,
 	   p == PROCESS_BROADCAST? "<broadcast>": PROCESS_NAME_STRING(p), nevents);
   }
-  
+
   if(nevents == PROCESS_CONF_NUMEVENTS) {
 #if DEBUG
     if(p == PROCESS_BROADCAST) {
@@ -342,7 +343,7 @@ process_post(struct process *p, process_event_t ev, process_data_t data)
 #endif /* DEBUG */
     return PROCESS_ERR_FULL;
   }
-  
+
   snum = (process_num_events_t)(fevent + nevents) % PROCESS_CONF_NUMEVENTS;
   events[snum].ev = ev;
   events[snum].data = data;
@@ -354,7 +355,7 @@ process_post(struct process *p, process_event_t ev, process_data_t data)
     process_maxevents = nevents;
   }
 #endif /* PROCESS_CONF_STATS */
-  
+
   return PROCESS_ERR_OK;
 }
 /*---------------------------------------------------------------------------*/
diff --git a/os/sys/rtimer.h b/os/sys/rtimer.h
index a89ed8299..e9cb16091 100644
--- a/os/sys/rtimer.h
+++ b/os/sys/rtimer.h
@@ -53,7 +53,7 @@
 #ifndef RTIMER_H_
 #define RTIMER_H_
 
-#include "contiki-conf.h"
+#include "contiki.h"
 
 #ifndef RTIMER_CLOCK_DIFF
 typedef unsigned short rtimer_clock_t;
diff --git a/os/sys/stimer.c b/os/sys/stimer.c
index 86545f59e..1301dc41e 100644
--- a/os/sys/stimer.c
+++ b/os/sys/stimer.c
@@ -44,7 +44,7 @@
  * @{
  */
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "sys/clock.h"
 #include "sys/stimer.h"
 
diff --git a/os/sys/timer.c b/os/sys/timer.c
index 6fe64119b..1eeae64de 100644
--- a/os/sys/timer.c
+++ b/os/sys/timer.c
@@ -44,7 +44,7 @@
  * @{
  */
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "sys/clock.h"
 #include "sys/timer.h"