core: header cleanup

boards/avsextrem/drivers/avsextrem-smb380.c

@@ -31,7 +31,6 @@
 #include "cpu.h"
 #include "lpm.h"
 #include "VIC.h"
-#include "kernel.h"
 #include "ssp0-board.h"
 #include "smb380-board.h"
 #include "xtimer.h"

boards/msb-430-common/board_init.c

@@ -25,7 +25,6 @@
 #include "board.h"
 #include "uart_stdio.h"
 #include "periph_conf.h"
-#include "kernel_internal.h"
 #include "msp430.h"
 #include "debug.h"
 

boards/wsn430-common/board_init.c

@@ -10,7 +10,6 @@
 #include "cpu.h"
 #include "irq.h"
 #include "board.h"
-#include "kernel_internal.h"
 #include "msp430.h"
 #include "debug.h"
 #include "uart_stdio.h"

core/include/arch/thread_arch.h

@@ -25,7 +25,6 @@
  extern "C" {
 #endif
 
-#include "kernel_internal.h"
 /**
  * @name Define the mapping between the architecture independent interfaces
  *       and the kernel internal interfaces
@@ -42,6 +41,10 @@
 #endif
 /** @} */
 
+/**
+ * @brief Prototype for a thread entry function
+ */
+typedef void *(*thread_task_func_t)(void *arg);
 
 /**
  * @brief Initialize a thread's stack

core/include/kernel.h

@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2013 Freie Universität Berlin
- *
- * This file is subject to the terms and conditions of the GNU Lesser
- * General Public License v2.1. See the file LICENSE in the top level
- * directory for more details.
- */
-
-/**
- * @addtogroup  core_internal
- * @{
- *
- * @file
- * @brief       Kernel compile time configuration
- *
- *              A reboot() function is also provided
- *              (and used by core_panic() when needed).
- *
- * @author      Kaspar Schleiser <kaspar@schleiser.de>
- */
-
-#ifndef KERNEL_H_
-#define KERNEL_H_
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "attributes.h"
-#include "config.h"
-#include "tcb.h"
-#include "cpu.h"
-#include "sched.h"
-#include "cpu_conf.h"
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-/* ------------------------------------------------------------------------- */
-
-/**
- * @def LPM_PREVENT_SLEEP_UART
- * @brief This flag tells the kernel that the deepest power saving
- *        mode that currently can be used must still allow UART
- *        communication. Bitmask to use with `lpm_prevent_sleep`
- *        in power management.
- */
-#define LPM_PREVENT_SLEEP_UART    BIT2
-
-/**
- * @brief This bitfield is used to configure which modules are
- *        currently active and prevent the kernel to go to the
- *        deepest power modes. It is used with `LPM_PREVENT_SLEEP_HWTIMER`
- *        and/or `LPM_PREVENT_SLEEP_UART`.
- */
-extern volatile int lpm_prevent_sleep;
-
-/**
- * @brief Variable used to store system configuration
- *
- * @details This contains e.g. the node ID, name, default channel and so on
- */
-extern config_t sysconfig;
-
-/* ------------------------------------------------------------------------- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* KERNEL_H_ */
-/** @} */

core/include/kernel_init.h

@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2016 Kaspar Schleiser <kaspar@schleiser.de>
+ *               2013 Freie Universität Berlin
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser
+ * General Public License v2.1. See the file LICENSE in the top level
+ * directory for more details.
+ */
+
+/**
+ * @addtogroup  core_internal
+ * @{
+ *
+ * @file
+ * @brief       prototypes for kernel intitialization
+ *
+ * @author      Oliver Hahm <oliver.hahm@inria.fr>
+ * @author      Kaspar Schleiser <kaspar@schleiser.de>
+ */
+
+#ifndef KERNEL_INIT_H
+#define KERNEL_INIT_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/**
+ * @brief   Initializes scheduler and creates main and idle task
+ */
+void kernel_init(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* KERNEL_INIT_H */
+/** @} */

core/include/kernel_internal.h

@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2013 Freie Universität Berlin
- *
- * This file is subject to the terms and conditions of the GNU Lesser
- * General Public License v2.1. See the file LICENSE in the top level
- * directory for more details.
- */
-
-/**
- * @addtogroup  core_internal
- * @{
- *
- * @file
- * @brief       prototypes for kernel internal functions
- *
- * @author      Oliver Hahm <oliver.hahm@inria.fr>
- */
-
-#ifndef KERNEL_INTERNAL_H_
-#define KERNEL_INTERNAL_H_
-
-#include "attributes.h"
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-/**
- * @brief   Initializes scheduler and creates main and idle task
- */
-void kernel_init(void);
-
-/**
- * @brief   Optionally: initializes platform specifics (devices, pin configuration etc.)
- */
-void board_init(void);
-
-/**
- * @brief Prototype for a thread entry function
- */
-typedef void *(*thread_task_func_t)(void *arg);
-
-/**
- * @brief   Gets called upon thread creation to set CPU registers
- *
- * @param[in] task_func     First function to call within the thread
- * @param[in] arg           Argument to supply to task_func
- * @param[in] stack_start   Start address of the stack
- * @param[in] stack_size    Stack size
- *
- * @return stack pointer
- */
-char *thread_stack_init(thread_task_func_t task_func, void *arg, void *stack_start, int stack_size);
-
-/**
- * @brief  Removes thread from scheduler and set status to #STATUS_STOPPED
- */
-NORETURN void sched_task_exit(void);
-
-/**
- * @brief   Prints human readable, ps-like thread information for debugging purposes
- */
-void thread_print_stack(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* KERNEL_INTERNAL_H_ */
-/** @} */

core/include/lpm.h

@@ -64,6 +64,11 @@ void lpm_end_awake(void);
  */
 enum lpm_mode lpm_get(void);
 
+/**
+ * @name LPM-internal variable
+ */
+extern volatile int lpm_prevent_sleep;
+
 #ifdef __cplusplus
 }
 #endif

core/include/panic.h

@@ -22,7 +22,7 @@
 #ifndef PANIC_H
 #define PANIC_H
 
-#include "kernel.h"
+#include "attributes.h"
 
 #ifdef __cplusplus
  extern "C" {

core/include/sched.h

@@ -81,6 +81,7 @@
 #define SCHEDULER_H
 
 #include <stddef.h>
+#include "attributes.h"
 #include "bitarithm.h"
 #include "tcb.h"
 #include "attributes.h"
@@ -164,6 +165,11 @@ extern volatile kernel_pid_t sched_active_pid;
  */
 extern clist_node_t *sched_runqueues[SCHED_PRIO_LEVELS];
 
+/**
+ * @brief  Removes thread from scheduler and set status to #STATUS_STOPPED
+ */
+NORETURN void sched_task_exit(void);
+
 #ifdef MODULE_SCHEDSTATISTICS
 /**
  *  Scheduler statistics
@@ -186,8 +192,7 @@ extern schedstat sched_pidlist[KERNEL_PID_LAST + 1];
  *  @param[in] callback The callback functions the will be called
  */
 void sched_register_cb(void (*callback)(uint32_t, uint32_t));
-
-#endif
+#endif /* MODULE_SCHEDSTATISTICS */
 
 #ifdef __cplusplus
 }

core/include/thread.h

@@ -22,9 +22,11 @@
 #ifndef THREAD_H
 #define THREAD_H
 
-#include "kernel.h"
+#include "cpu.h"
+#include "cpu_conf.h"
 #include "tcb.h"
 #include "arch/thread_arch.h"
+#include "sched.h"
 
 #ifdef __cplusplus
  extern "C" {
@@ -243,6 +245,18 @@ static inline kernel_pid_t thread_getpid(void)
     return sched_active_pid;
 }
 
+/**
+ * @brief   Gets called upon thread creation to set CPU registers
+ *
+ * @param[in] task_func     First function to call within the thread
+ * @param[in] arg           Argument to supply to task_func
+ * @param[in] stack_start   Start address of the stack
+ * @param[in] stack_size    Stack size
+ *
+ * @return stack pointer
+ */
+char *thread_stack_init(thread_task_func_t task_func, void *arg, void *stack_start, int stack_size);
+
 /**
  * @brief   Prints the message queue of the current thread.
  */
@@ -269,7 +283,12 @@ const char *thread_getname(kernel_pid_t pid);
  * @return          the amount of unused space of the thread's stack
  */
 uintptr_t thread_measure_stack_free(char *stack);
-#endif
+#endif /* DEVELHELP */
+
+/**
+ * @brief   Prints human readable, ps-like thread information for debugging purposes
+ */
+void thread_print_stack(void);
 
 #ifdef __cplusplus
 }

core/kernel_init.c

@@ -21,13 +21,10 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <errno.h>
-#include "tcb.h"
-#include "kernel.h"
-#include "kernel_internal.h"
+#include "kernel_init.h"
 #include "sched.h"
-#include "cpu.h"
-#include "lpm.h"
 #include "thread.h"
+#include "lpm.h"
 #include "irq.h"
 #include "log.h"
 

core/msg.c

@@ -23,7 +23,6 @@
 #include <stddef.h>
 #include <inttypes.h>
 #include <assert.h>
-#include "kernel.h"
 #include "sched.h"
 #include "msg.h"
 #include "priority_queue.h"

core/mutex.c

@@ -25,7 +25,6 @@
 #include "mutex.h"
 #include "tcb.h"
 #include "atomic.h"
-#include "kernel.h"
 #include "sched.h"
 #include "thread.h"
 #include "irq.h"

core/panic.c

@@ -25,6 +25,7 @@
 #include <stdio.h>
 
 #include "assert.h"
+#include "attributes.h"
 #include "cpu.h"
 #include "irq.h"
 #include "lpm.h"

core/sched.c

@@ -22,8 +22,6 @@
 #include <stdint.h>
 
 #include "sched.h"
-#include "kernel.h"
-#include "kernel_internal.h"
 #include "clist.h"
 #include "bitarithm.h"
 #include "irq.h"

core/thread.c

@@ -22,12 +22,10 @@
 #include <stdio.h>
 
 #include "thread.h"
-#include "kernel.h"
 #include "irq.h"
 
 #define ENABLE_DEBUG    (0)
 #include "debug.h"
-#include "kernel_internal.h"
 #include "bitarithm.h"
 #include "sched.h"
 

cpu/arm7_common/arm_cpu.c

@@ -18,9 +18,7 @@
 
 #include <stdio.h>
 #include "arm_cpu.h"
-#include "sched.h"
-#include "kernel.h"
-#include "kernel_internal.h"
+#include "thread.h"
 
 #define STACK_MARKER    (0x77777777)
 #define REGISTER_CNT    (12)

cpu/arm7_common/bootloader.c

@@ -26,7 +26,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "kernel.h"
 #include "thread.h"
 
 void FIQ_Routine(void)   __attribute__((interrupt("FIQ")));

cpu/atmega2560/reboot_arch.c

@@ -22,7 +22,6 @@
 
 #include <avr/wdt.h>
 
-#include "kernel.h"
 #include "cpu.h"
 
 void reboot(void)

cpu/atmega_common/thread_arch.c

@@ -25,7 +25,6 @@
 #include "sched.h"
 #include "irq.h"
 #include "cpu.h"
-#include "kernel_internal.h"
 
 /*
  * local function declarations  (prefixed with __)

cpu/cortexm_common/reboot_arch.c

@@ -22,7 +22,6 @@
 
 #include <stdio.h>
 
-#include "kernel.h"
 #include "cpu.h"
 
 void reboot(void)

cpu/cortexm_common/thread_arch.c

@@ -99,7 +99,6 @@
 #include "thread.h"
 #include "irq.h"
 #include "cpu.h"
-#include "kernel_internal.h"
 
 /**
  * @brief   Noticeable marker marking the beginning of a stack segment

cpu/cortexm_common/vectors_cortexm.c

@@ -23,11 +23,12 @@
 
 #include <stdint.h>
 #include <stdio.h>
+#include <inttypes.h>
 
 #include "cpu.h"
+#include "kernel_init.h"
 #include "board.h"
 #include "panic.h"
-#include "kernel_internal.h"
 #include "vectors_cortexm.h"
 
 /**

cpu/lm4f120/cpu.c

@@ -19,8 +19,6 @@
 
 #include "cpu.h"
 #include "irq.h"
-#include "kernel.h"
-#include "kernel_internal.h"
 #include "sched.h"
 #include "thread.h"
 #include "arch/thread_arch.h"

cpu/lpc1768/reboot_arch.c

@@ -23,7 +23,6 @@
 
 #include <stdio.h>
 
-#include "kernel.h"
 #include "cpu.h"
 
 void reboot(void)

cpu/lpc2387/periph/uart.c

@@ -26,7 +26,6 @@
 
 #include "lpc23xx.h"
 #include "VIC.h"
-#include "kernel.h"
 #include "periph/uart.h"
 
 /* for now, we only support one UART device... */

cpu/msp430-common/cpu.c

@@ -10,8 +10,6 @@
 
 #include "cpu.h"
 #include "irq.h"
-#include "kernel.h"
-#include "kernel_internal.h"
 #include "sched.h"
 #include "thread.h"
 

cpu/msp430-common/startup.c

@@ -19,9 +19,9 @@
  * @}
  */
 
-#include "irq.h"
 #include <stdio.h>
-#include "kernel_internal.h"
+#include "kernel_init.h"
+#include "irq.h"
 
 extern void board_init(void);
 

cpu/native/include/native_internal.h

@@ -174,9 +174,7 @@ int unregister_interrupt(int sig);
 }
 #endif
 
-#include "kernel_internal.h"
 #include "sched.h"
 
-
 /** @} */
 #endif /* _NATIVE_INTERNAL_H */

cpu/native/native_cpu.c

@@ -46,8 +46,6 @@
 
 #include <stdlib.h>
 
-#include "kernel_internal.h"
-#include "kernel.h"
 #include "irq.h"
 #include "sched.h"
 

cpu/native/startup.c

@@ -30,7 +30,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "kernel_internal.h"
+#include "kernel_init.h"
 #include "cpu.h"
 
 #include "board_internal.h"

cpu/native/syscalls.c

@@ -36,7 +36,6 @@
 #include <ifaddrs.h>
 #include <sys/stat.h>
 
-#include "kernel.h"
 #include "cpu.h"
 #include "irq.h"
 #include "xtimer.h"

cpu/nrf51/radio/nrfmin/nrfmin.c

@@ -22,7 +22,6 @@
 #include "mutex.h"
 #include "thread.h"
 #include "sched.h"
-#include "kernel.h"
 #include "periph_conf.h"
 #include "periph/cpuid.h"
 #include "nrfmin.h"

cpu/saml21/lpm_arch.c

@@ -20,9 +20,9 @@
 
 #include <stdio.h>
 
+#include "lpm.h"
 #include "arch/lpm_arch.h"
 #include "cpu.h"
-#include "kernel.h"
 
 #define ENABLE_DEBUG 0
 #include "debug.h"

cpu/x86/include/x86_reboot.h

@@ -28,7 +28,8 @@
 #ifndef CPU__X86__REBOOT__H__
 #define CPU__X86__REBOOT__H__
 
-#include "kernel.h"
+#include <stdbool.h>
+#include "attributes.h"
 
 #ifdef __cplusplus
 extern "C" {

cpu/x86/x86_glue.c

@@ -30,7 +30,6 @@
 
 #include "attributes.h"
 #include "cpu.h"
-#include "kernel_internal.h"
 #include "sched.h"
 #include "x86_uart.h"
 

cpu/x86/x86_rtc.c

@@ -34,7 +34,6 @@
 
 #include <stdio.h>
 
-#include "kernel.h"
 
 #define ENABLE_DEBUG (0)
 #include "debug.h"

cpu/x86/x86_startup.c

@@ -38,11 +38,12 @@
 #include "x86_uart.h"
 
 #include <cpu.h>
-#include <kernel_internal.h>
 #include <tlsf-malloc.h>
 
 #include <stdio.h>
 
+#include "kernel_init.h"
+
 /* Must be <= 0x1000 because otherwise x86_map_physical_pages() might get a page out of this pool.
  * Because static memory has the PT_G flag, flushing the TLB would cause a stale PT
  * after calling add_pages_to_pool() in x86_map_physical_pages().

cpu/x86/x86_threading.c

@@ -34,7 +34,6 @@
 #include "x86_threading.h"
 #include "cpu.h"
 #include "irq.h"
-#include "kernel_internal.h"
 #include "ucontext.h"
 #include "sched.h"
 #include "stdbool.h"

drivers/include/xbee.h

@@ -25,7 +25,6 @@
 
 #include <stdint.h>
 
-#include "kernel.h"
 #include "mutex.h"
 #include "periph/uart.h"
 #include "periph/gpio.h"

examples/gnrc_networking/udp.c

@@ -21,7 +21,6 @@
 #include <stdio.h>
 #include <inttypes.h>
 
-#include "kernel.h"
 #include "net/gnrc.h"
 #include "net/gnrc/ipv6.h"
 #include "net/gnrc/udp.h"

examples/gnrc_tftp/tftp_client.c

@@ -22,7 +22,6 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "kernel.h"
 #include "net/gnrc/tftp.h"
 
 static const char *_tftp_default_host = "::1";

sys/cpp11-compat/include/riot/thread.hpp

@@ -26,7 +26,6 @@
 
 #include "time.h"
 #include "thread.h"
-#include "kernel_internal.h"
 
 #include <tuple>
 #include <atomic>

sys/crypto/modes/ecb.c

@@ -18,6 +18,9 @@
 * @}
 */
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "crypto/modes/ecb.h"
 
 int cipher_encrypt_ecb(cipher_t* cipher, uint8_t* input,

sys/include/crypto/helper.h

@@ -20,7 +20,8 @@
 #ifndef __CRYPTO_MODES_HELPER_H_
 #define __CRYPTO_MODES_HELPER_H_
 
-#include "kernel.h"
+#include <stddef.h>
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {

sys/include/crypto/modes/cbc.h

@@ -20,7 +20,6 @@
 #ifndef __CRYPTO_MODES_CBC_H_
 #define __CRYPTO_MODES_CBC_H_
 
-#include "kernel.h"
 #include "crypto/ciphers.h"
 
 #ifdef __cplusplus

sys/include/crypto/modes/ccm.h

@@ -20,7 +20,6 @@
 #ifndef __CRYPTO_MODES_CCM_H_
 #define __CRYPTO_MODES_CCM_H_
 
-#include "kernel.h"
 #include "crypto/ciphers.h"
 
 #ifdef __cplusplus

sys/include/crypto/modes/ctr.h

@@ -20,7 +20,6 @@
 #ifndef __CRYPTO_MODES_CTR_H_
 #define __CRYPTO_MODES_CTR_H_
 
-#include "kernel.h"
 #include "crypto/ciphers.h"
 
 #ifdef __cplusplus

sys/include/crypto/modes/ecb.h

@@ -20,7 +20,6 @@
 #ifndef __CRYPTO_MODES_ECB_H_
 #define __CRYPTO_MODES_ECB_H_
 
-#include "kernel.h"
 #include "crypto/ciphers.h"
 
 #ifdef __cplusplus

sys/include/net/gnrc/netapi.h

@@ -28,7 +28,6 @@
 #ifndef GNRC_NETAPI_H_
 #define GNRC_NETAPI_H_
 
-#include "kernel.h"
 #include "thread.h"
 #include "net/netopt.h"
 #include "net/gnrc/nettype.h"

sys/include/net/gnrc/netdev.h

@@ -27,7 +27,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "kernel.h"
 #include "net/gnrc/pkt.h"
 #include "net/netopt.h"
 

sys/include/net/gnrc/netif/hdr.h

@@ -24,7 +24,6 @@
 #include <string.h>
 #include <stdint.h>
 
-#include "kernel.h"
 #include "net/gnrc/pkt.h"
 #include "net/gnrc/pktbuf.h"
 

sys/include/net/gnrc/nomac.h

@@ -22,7 +22,6 @@
 #ifndef GNRC_NOMAC_H_
 #define GNRC_NOMAC_H_
 
-#include "kernel.h"
 #include "net/gnrc/netdev.h"
 
 #ifdef __cplusplus

sys/include/net/gnrc/pktdump.h

@@ -22,7 +22,7 @@
 #ifndef GNRC_PKTDUMP_H_
 #define GNRC_PKTDUMP_H_
 
-#include "kernel.h"
+#include "kernel_types.h"
 
 #ifdef __cplusplus
 extern "C" {

sys/net/gnrc/application_layer/zep/gnrc_zep.c

@@ -21,7 +21,6 @@
 
 #include "ringbuffer.h"
 #include "hashes.h"
-#include "kernel.h"
 #include "msg.h"
 #include "net/ieee802154.h"
 #include "net/ipv6/addr.h"

sys/net/gnrc/link_layer/netdev2/gnrc_netdev2.c

@@ -20,7 +20,6 @@
 
 #include <errno.h>
 
-#include "kernel.h"
 #include "msg.h"
 #include "thread.h"
 

sys/net/gnrc/link_layer/nomac/gnrc_nomac.c

@@ -18,7 +18,6 @@
 
 #include <errno.h>
 
-#include "kernel.h"
 #include "msg.h"
 #include "thread.h"
 #include "net/gnrc/nomac.h"

sys/net/gnrc/link_layer/slip/gnrc_slip.c

@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "kernel.h"
 #include "kernel_types.h"
 #include "msg.h"
 #include "net/gnrc.h"

sys/net/gnrc/netapi/gnrc_netapi.c

@@ -18,7 +18,6 @@
  * @}
  */
 
-#include "kernel.h"
 #include "msg.h"
 #include "net/gnrc/netreg.h"
 #include "net/gnrc/pktbuf.h"

sys/net/gnrc/pktdump/gnrc_pktdump.c

@@ -25,7 +25,6 @@
 #include "byteorder.h"
 #include "thread.h"
 #include "msg.h"
-#include "kernel.h"
 #include "net/gnrc/pktdump.h"
 #include "net/gnrc.h"
 #include "net/ipv6/addr.h"

sys/net/gnrc/transport_layer/udp/gnrc_udp.c

@@ -20,7 +20,6 @@
 #include <stdint.h>
 #include <errno.h>
 
-#include "kernel.h"
 #include "byteorder.h"
 #include "msg.h"
 #include "thread.h"

sys/posix/pthread/include/pthread.h

@@ -22,7 +22,6 @@
 
 #include <time.h>
 
-#include "kernel.h"
 #include "mutex.h"
 #include "sched.h"
 

sys/posix/pthread/include/pthread_mutex.h

@@ -19,7 +19,6 @@
 
 #include <time.h>
 
-#include "kernel.h"
 #include "mutex.h"
 
 #ifdef __cplusplus

sys/posix/pthread/pthread.c

@@ -26,7 +26,6 @@
 
 #include "cpu_conf.h"
 #include "irq.h"
-#include "kernel_internal.h"
 #include "msg.h"
 #include "mutex.h"
 #include "priority_queue.h"

tests/pipe/main.c

@@ -29,7 +29,6 @@
 #include <inttypes.h>
 
 #include "thread.h"
-#include "kernel.h"
 #include "pipe.h"
 #include "pipe.h"
 

tests/unittests/tests-checksum/tests-checksum.h

@@ -19,7 +19,6 @@
 #define TESTS_CHECKSUM_H
 
 #include "embUnit.h"
-#include "kernel.h"
 
 #ifdef __cplusplus
 extern "C" {

tests/unittests/tests-core/tests-core-ringbuffer.c

@@ -17,7 +17,6 @@
  */
 
 #include "thread.h"
-#include "kernel.h"
 #include "ringbuffer.h"
 #include "mutex.h"
 

tests/unittests/tests-crypto/tests-crypto.h

@@ -19,8 +19,10 @@
 #ifndef TESTS_CRYPTO_H_
 #define TESTS_CRYPTO_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "embUnit.h"
-#include "kernel.h"
 
 #ifdef __cplusplus
 extern "C" {

tests/unittests/tests-ubjson/test-ubjson-empty-array.c

@@ -17,7 +17,6 @@
  */
 
 #include "tests-ubjson.h"
-#include "kernel.h"
 
 typedef enum {
     BEFORE_ARRAY_1 = __LINE__,

tests/unittests/tests-ubjson/test-ubjson-empty-object.c

@@ -17,7 +17,6 @@
  */
 
 #include "tests-ubjson.h"
-#include "kernel.h"
 
 typedef enum {
     BEFORE_ARRAY_1 = __LINE__,

tests/unittests/tests-ubjson/tests-ubjson.h

@@ -30,6 +30,7 @@
 #define TESTS_UBJSON_H_
 
 #include "embUnit.h"
+#include "kernel_macros.h"
 
 #include "ubjson.h"