Include contiki.h instead of contiki-conf.h so as to ensure consistent inclusion of contiki-default-conf.h

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>

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"

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"

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"
 /**

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

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"

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.

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

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"
 

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>
 /*---------------------------------------------------------------------------*/

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"

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>

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"

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"

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>
 /*----------------------------------------------------------------------------*/

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"
 

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);

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 */

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"

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"

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"

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)
 /*---------------------------------------------------------------------------*/

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"
 
 /*

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"
 

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"
 
 

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

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"
 

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"

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"
 

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>
 /*---------------------------------------------------------------------------*/

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"

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"
 /*---------------------------------------------------------------------------*/

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"
 /*---------------------------------------------------------------------------*/

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>

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"

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>

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"

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>

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>
 /*---------------------------------------------------------------------------*/

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"

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"
 /*---------------------------------------------------------------------------*/

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

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

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"
 /*---------------------------------------------------------------------------*/

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
 

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
 

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);

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;

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

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)

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"
 

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];

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"
 /*---------------------------------------------------------------------------*/

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"

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
 

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"
 

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

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"
 

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 */

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>

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

arch/platform/native/dev/xmem.c

@@ -32,7 +32,7 @@
  *
  */
 
-#include "contiki-conf.h"
+#include "contiki.h"
 #include "dev/xmem.h"
 
 #include <stdio.h>

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"

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

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>

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"
 /*---------------------------------------------------------------------------*/

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"
 /*---------------------------------------------------------------------------*/

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. */

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;

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"

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"

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"
 /*---------------------------------------------------------------------------*/

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"

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"

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"

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"

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"

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"

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"

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"

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"

arch/platform/zoul/firefly-reva/board.c

@@ -37,7 +37,7 @@
  *
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include <stdint.h>
 #include <string.h>
 /*---------------------------------------------------------------------------*/

arch/platform/zoul/firefly/board.c

@@ -37,7 +37,7 @@
  *
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include <stdint.h>
 #include <string.h>
 /*---------------------------------------------------------------------------*/

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 */
 

arch/platform/zoul/orion/board.c

@@ -38,7 +38,7 @@
  *
  */
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 #include <stdint.h>
 #include <string.h>
 /*---------------------------------------------------------------------------*/

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>

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>

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 */

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 */

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"

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"

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"

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"

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"

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"
 /*---------------------------------------------------------------------------*/

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)

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)

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"
 /*---------------------------------------------------------------------------*/

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"
 /*---------------------------------------------------------------------------*/

examples/sensniff/sensniff.h

@@ -32,7 +32,7 @@
 #ifndef SENSNIFF_H_
 #define SENSNIFF_H_
 /*---------------------------------------------------------------------------*/
-#include "contiki-conf.h"
+#include "contiki.h"
 
 #include <stdint.h>
 /*---------------------------------------------------------------------------*/