cpu: added `extern "C"` to headers

cpu/arm7_common/include/VIC.h

@@ -9,7 +9,7 @@
 #define __ARM_COMMON_H
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /**

cpu/arm7_common/include/arm7_common.h

@@ -27,7 +27,7 @@
 #include "bitarithm.h"
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /**

cpu/arm7_common/include/hwtimer_cpu.h

@@ -20,7 +20,7 @@
 #define HWTIMER_CPU_H_
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 #define HWTIMER_MAXTIMERS 4

cpu/arm7_common/include/iap.h

@@ -12,7 +12,7 @@
 #include <stdint.h>
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* IAP-Commands  */

cpu/atmega2560/include/cpu-conf.h

@@ -20,6 +20,9 @@
 #define __CPU_CONF_H
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /**
  * @name Kernel configuration
@@ -48,5 +51,9 @@
 #endif
 /** @} */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __CPU_CONF_H */
 /** @} */

cpu/atmega2560/include/hwtimer_cpu.h

@@ -19,6 +19,10 @@
 #ifndef __HWTIMER_CPU_H
 #define __HWTIMER_CPU_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @name Hardware timer configuration
  * @{
@@ -28,5 +32,9 @@
 #define HWTIMER_MAXTICKS    (0xFFFF)    /**< 16-bit timer */
 /** @} */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __HWTIMER_CPU_H */
 /** @} */

cpu/atmega_common/avr-libc-extra/time.h

@@ -101,13 +101,13 @@
 #ifndef TIME_H
 #define TIME_H
 
-#ifdef __cplusplus
-extern          "C" {
-#endif
-
 #include <inttypes.h>
 #include <stdlib.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
     /** \ingroup avr_time */
     /* @{ */
 

cpu/atmega_common/include/cpu.h

@@ -33,6 +33,11 @@
  * TODO: remove once core was adjusted
  */
 #include "irq.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define eINT            enableIRQ
 #define dINT            disableIRQ
 
@@ -41,6 +46,9 @@
  */
 void cpu_init(void);
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* __ATMEGA_COMMON_H */
 /** @} */

cpu/atmega_common/include/sys/time.h

@@ -9,7 +9,15 @@
 
 #include <sys/types.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct timeval {
     time_t         tv_sec;
     suseconds_t    tv_usec;
 };
+
+#ifdef __cplusplus
+}
+#endif

cpu/atmega_common/include/sys/types.h

@@ -12,7 +12,15 @@
 #ifndef AVR_TYPES_H
 #define AVR_TYPES_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef int16_t suseconds_t;
 typedef signed int ssize_t;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* ifndef AVR_TYPES_H */

cpu/cc430/include/cc430-adc.h

@@ -36,9 +36,17 @@
 #ifndef CC430_ADC_H
 #define CC430_ADC_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern uint16_t adc12_single_conversion(uint16_t ref, uint16_t sht, uint16_t channel);
 
 extern uint16_t adc12_result;
 extern uint8_t  adc12_data_ready;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

cpu/cc430/include/cc430-rtc.h

@@ -11,6 +11,10 @@
 #include "rtc.h"
 #include "time.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @ingroup     cc430
  */
@@ -52,5 +56,8 @@ void rtc_set_alarm(struct tm *localti, rtc_alarm_mask_t mask);
  */
 void rtc_remove_alarm(void);
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif

cpu/cortex-m0_common/include/core_cm0.h

@@ -123,10 +123,18 @@
   #endif
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #include <stdint.h>                      /* standard types definitions                      */
 #include <core_cmInstr.h>                /* Core Instruction Access                         */
 #include <core_cmFunc.h>                 /* Core Function Access                            */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #endif /* __CORE_CM0_H_GENERIC */
 
 #ifndef __CMSIS_GENERIC

cpu/cortex-m0_common/include/core_cm0plus.h

@@ -107,10 +107,18 @@
   #endif
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #include <stdint.h>                      /* standard types definitions                      */
 #include <core_cmInstr.h>                /* Core Instruction Access                         */
 #include <core_cmFunc.h>                 /* Core Function Access                            */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #endif /* __CORE_CM0PLUS_H_GENERIC */
 
 #ifndef __CMSIS_GENERIC

cpu/cortex-m0_common/include/core_cmFunc.h

@@ -23,6 +23,9 @@
 #ifndef __CORE_CMFUNC_H
 #define __CORE_CMFUNC_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /* ###########################  Core Function Access  ########################### */
 /** \ingroup  CMSIS_Core_FunctionInterface   
@@ -604,5 +607,8 @@ __attribute__( ( always_inline ) ) static __INLINE void __set_FPSCR(uint32_t fps
 
 /*@} end of CMSIS_Core_RegAccFunctions */
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* __CORE_CMFUNC_H */

cpu/cortex-m0_common/include/core_cmInstr.h

@@ -23,6 +23,9 @@
 #ifndef __CORE_CMINSTR_H
 #define __CORE_CMINSTR_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /* ##########################  Core Instruction Access  ######################### */
 /** \defgroup CMSIS_Core_InstructionInterface CMSIS Core Instruction Interface
@@ -581,4 +584,8 @@ __attribute__( ( always_inline ) ) static __INLINE uint8_t __CLZ(uint32_t value)
 
 /*@}*/ /* end of group CMSIS_Core_InstructionInterface */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __CORE_CMINSTR_H */

cpu/cortex-m0_common/include/cpu.h

@@ -33,6 +33,11 @@
  * TODO: remove once core was adjusted
  */
 #include "irq.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define eINT            enableIRQ
 #define dINT            disableIRQ
 
@@ -41,5 +46,9 @@
  */
 void cpu_init(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __CPU_H */
 /** @} */

cpu/cortex-m3_common/include/core_cm3.h

@@ -117,10 +117,18 @@
     /* add preprocessor checks */
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #include <stdint.h>                      /*!< standard types definitions                      */
 #include "core_cmInstr.h"                /*!< Core Instruction Access                         */
 #include "core_cmFunc.h"                 /*!< Core Function Access                            */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #endif /* __CORE_CM3_H_GENERIC */
 
 #ifndef __CMSIS_GENERIC

cpu/cortex-m3_common/include/core_cmFunc.h

@@ -23,6 +23,9 @@
 #ifndef __CORE_CMFUNC_H
 #define __CORE_CMFUNC_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /* ###########################  Core Function Access  ########################### */
 /** \ingroup  CMSIS_Core_FunctionInterface
@@ -604,5 +607,8 @@ __attribute__( ( always_inline ) ) static __INLINE void __set_FPSCR(uint32_t fps
 
 /*@} end of CMSIS_Core_RegAccFunctions */
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* __CORE_CMFUNC_H */

cpu/cortex-m3_common/include/core_cmInstr.h

@@ -23,6 +23,9 @@
 #ifndef __CORE_CMINSTR_H
 #define __CORE_CMINSTR_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /* ##########################  Core Instruction Access  ######################### */
 /** \defgroup CMSIS_Core_InstructionInterface CMSIS Core Instruction Interface
@@ -581,4 +584,8 @@ __attribute__( ( always_inline ) ) static __INLINE uint8_t __CLZ(uint32_t value)
 
 /*@}*/ /* end of group CMSIS_Core_InstructionInterface */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __CORE_CMINSTR_H */

cpu/cortex-m3_common/include/cpu.h

@@ -30,6 +30,11 @@
  * TODO: remove once core was adjusted
  */
 #include "irq.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define eINT            enableIRQ
 #define dINT            disableIRQ
 
@@ -38,6 +43,9 @@
  */
 void cpu_init(void);
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* __CORTEXM_COMMON_H */
 /** @} */

cpu/cortex-m4_common/include/core_cm4.h

@@ -165,11 +165,19 @@
   #endif
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #include <stdint.h>                      /* standard types definitions                      */
 #include <core_cmInstr.h>                /* Core Instruction Access                         */
 #include <core_cmFunc.h>                 /* Core Function Access                            */
 #include <core_cm4_simd.h>               /* Compiler specific SIMD Intrinsics               */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #endif /* __CORE_CM4_H_GENERIC */
 
 #ifndef __CMSIS_GENERIC

cpu/cortex-m4_common/include/core_cmFunc.h

@@ -23,6 +23,9 @@
 #ifndef __CORE_CMFUNC_H
 #define __CORE_CMFUNC_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /* ###########################  Core Function Access  ########################### */
 /** \ingroup  CMSIS_Core_FunctionInterface   
@@ -604,5 +607,8 @@ __attribute__( ( always_inline ) ) static __INLINE void __set_FPSCR(uint32_t fps
 
 /*@} end of CMSIS_Core_RegAccFunctions */
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* __CORE_CMFUNC_H */

cpu/cortex-m4_common/include/core_cmInstr.h

@@ -23,6 +23,9 @@
 #ifndef __CORE_CMINSTR_H
 #define __CORE_CMINSTR_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /* ##########################  Core Instruction Access  ######################### */
 /** \defgroup CMSIS_Core_InstructionInterface CMSIS Core Instruction Interface
@@ -581,4 +584,8 @@ __attribute__( ( always_inline ) ) static __INLINE uint8_t __CLZ(uint32_t value)
 
 /*@}*/ /* end of group CMSIS_Core_InstructionInterface */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __CORE_CMINSTR_H */

cpu/cortex-m4_common/include/cpu.h

@@ -32,6 +32,11 @@
  * TODO: remove once core was adjusted
  */
 #include "irq.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define eINT            enableIRQ
 #define dINT            disableIRQ
 
@@ -40,5 +45,9 @@
  */
 void cpu_init(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __CORTEXM_COMMON_H */
 /** @} */

cpu/lpc1768/include/LPC17xx.h

@@ -98,9 +98,15 @@ typedef enum IRQn
 #define __NVIC_PRIO_BITS          5         /*!< Number of Bits used for Priority Levels          */
 #define __Vendor_SysTickConfig    0         /*!< Set to 1 if different SysTick Config is used     */
 
+#ifdef __cplusplus
+}
+#endif
 
 #include "core_cm3.h"                       /* Cortex-M3 processor and core peripherals           */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /******************************************************************************/
 /*                Device Specific Peripheral registers structures             */

cpu/lpc2387/include/cpu-conf.h

@@ -10,6 +10,10 @@
 #ifndef CPUCONF_H_
 #define CPUCONF_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @ingroup     conf
  * @ingroup     lpc2387
@@ -66,6 +70,9 @@
 #define UART0_BUFSIZE                   (128)
 #endif
 
+#ifdef __cplusplus
+}
+#endif
 
 /** @} */
 #endif /* CPUCONF_H_ */

cpu/lpc2387/include/cpu.h

@@ -20,10 +20,18 @@
 #include "lpc2387.h"
 #include "arm_cpu.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern uintptr_t __stack_start;     ///< end of user stack memory space
 
 void lpc2387_pclk_scale(uint32_t source, uint32_t target, uint32_t *pclksel, uint32_t *prescale);
 bool install_irq(int IntNumber, void (*HandlerAddr)(void), int Priority);
 
+#ifdef __cplusplus
+}
+#endif
+
 /** @} */
 #endif /* __CPU_H */

cpu/lpc2387/include/i2c.h

@@ -34,6 +34,10 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define I2C_BUFSIZE             0x23
 #define MAX_TIMEOUT             0x00FFFFFF
 
@@ -326,4 +330,8 @@ void i2c_enable_pull_up_resistor(uint8_t i2c_interface);
  */
 void i2c_disable_pull_up_resistor(uint8_t i2c_interface);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* end __I2C_H */

cpu/lpc2387/include/lpc2387-adc.h

@@ -29,6 +29,10 @@
 #include <stdint.h>
 #include "adc_legacy.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define ADC_NUM                  (6)
 #define ADC_OFFSET            (0x10)
 #define ADC_INDEX                (4)
@@ -42,5 +46,9 @@
 void adc_init_1(void);
 void adc_init_2(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 /** @} */
 #endif /* LPC2387ADC_H_ */

cpu/lpc2387/include/lpc2387-rtc.h

@@ -35,6 +35,10 @@
 #include "rtc.h"
 #include "lpc2387.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* ------------------------------------------------------------------------- */
 /**
  * @name LPC2387 RTC Compile-Time Configuration
@@ -104,5 +108,9 @@ void rtc_set_alarm(struct tm *localt, enum rtc_alarm_mask mask);
  */
 enum rtc_alarm_mask _rtc_get_alarm(struct tm *localt);
 
+#ifdef __cplusplus
+}
+#endif
+
 /** @} */
 #endif /* end __RTC_H */

cpu/lpc2387/include/lpc2387.h

@@ -14,6 +14,10 @@
 #include "lpc23xx.h"
 #include "bitarithm.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define F_CCO                   288000000
 #define CL_CPU_DIV              4                                   ///< CPU clock divider
 #define F_CPU                   (F_CCO / CL_CPU_DIV)                ///< CPU target speed in Hz
@@ -208,4 +212,8 @@
 /** @} */
 /** @} */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // __LPC2387_H

cpu/lpc2387/include/lpc23xx.h

@@ -15,6 +15,10 @@
 #ifndef __LPC23xx_H
 #define __LPC23xx_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Vectored Interrupt Controller (VIC) */
 #define VIC_BASE_ADDR   0xFFFFF000
 #define VICIRQStatus   (*(volatile unsigned long *)(VIC_BASE_ADDR + 0x000))
@@ -1126,5 +1130,8 @@ with the spec. update in USB Device Section. */
 #define MAC_POWERDOWN       (*(volatile unsigned long *)(MAC_BASE_ADDR + 0xFF4)) /* Power-down reg */
 #define MAC_MODULEID        (*(volatile unsigned long *)(MAC_BASE_ADDR + 0xFFC)) /* Module ID reg (RO) */
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif  // __LPC23xx_H

cpu/mc1322x/asm/include/asm.h

@@ -12,6 +12,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define ASM_BASE_ADDRESS 0x80008000
 
 struct ASM_struct {
@@ -100,4 +104,8 @@ void asm_ctr_cbc_mac_init(asm_keys_t *keys);
 void asm_ctr_cbc_mac_update(asm_data_t *data, asm_ctr_t *ctr);
 void asm_ctr_cbc_mac_finish(asm_data_t *data);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* ASM_H */

cpu/mc1322x/include/cpu-conf.h

@@ -10,6 +10,10 @@
 #ifndef CPUCONF_H_
 #define CPUCONF_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @ingroup     conf
  * @ingroup     mc1322x
@@ -63,5 +67,9 @@
 #define UART0_BUFSIZE                   (64)
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 /** @} */
 #endif /* CPUCONF_H_ */

cpu/mc1322x/include/cpu.h

@@ -26,8 +26,16 @@
 #include "arm_cpu.h"
 #include "mc1322x.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern uintptr_t __stack_start;     ///< end of user stack memory space
 bool install_irq(int int_number, void *handler_addr, int priority);
 
+#ifdef __cplusplus
+}
+#endif
+
 /** @} */
 #endif /* CPU_H */

cpu/mc1322x/include/gpio.h

@@ -13,6 +13,10 @@
 // TODO: why do we need to include this for macro expansion?
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Structure-based GPIO access
    Example usage:
 
@@ -155,4 +159,8 @@ enum { _REP(0,0) };
 
 static volatile struct GPIO_struct * const GPIO = (void *) (0x80000000);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

cpu/mc1322x/include/mc1322x.h

@@ -12,6 +12,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*-----------------------------------------------------------------*/
 /* System Management */
 #define SW_RST_VAL       (0x87651234)
@@ -303,8 +307,6 @@ static volatile struct TMR_struct * const TMR3 = (void *) (TMR3_BASE);
 /* Interrupts */
 #define INTBASE        (0x80020000)
 
-#include <stdint.h>
-
 /* Structure-based ITC access */
 #define __INTERRUPT_union(x)              \
                 union {                   \
@@ -442,4 +444,8 @@ extern void adc_isr(void) __attribute__((weak));
 
 extern void spi_isr(void) __attribute__((weak));
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* MC1322X_H */

cpu/mc1322x/maca/include/maca.h

@@ -15,6 +15,10 @@
 
 #include "maca_packet.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*********************************************************/
 /* function definitions                                  */
 /*********************************************************/
@@ -530,5 +534,8 @@ static volatile struct MACA_struct * const MACA = (void *) (MACA_BASE_ADDRESS +
 #define MACA_TMRDIS_SFTOFF_ABORT 1
 
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif // MACA_H_

cpu/mc1322x/maca/include/maca_packet.h

@@ -12,6 +12,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* does not include 2 byte FCS checksum */
 #ifndef MACA_MAX_PAYLOAD_SIZE
 #define MACA_MAX_PAYLOAD_SIZE 125
@@ -40,4 +44,8 @@ struct packet {
 };
 typedef struct packet maca_packet_t;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

cpu/msp430-common/include/cpu-conf.h

@@ -9,6 +9,10 @@
 #ifndef CPUCONF_H_
 #define CPUCONF_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @name Kernel configuration
  * @{
@@ -36,4 +40,8 @@
 #endif
 /** @} */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* CPUCONF_H_ */

cpu/msp430-common/include/cpu.h

@@ -31,6 +31,10 @@
 #include "msp430_types.h"
 #include "cpu-conf.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define WORDSIZE 16
 
 extern volatile int __inISR;
@@ -135,5 +139,9 @@ int inISR(void);
 
 void msp430_cpu_init(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 /** @} */
 #endif // _CPU_H

cpu/msp430-common/include/hwtimer_cpu.h

@@ -13,6 +13,10 @@
 
 #include "cpu.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef __MSP430_HAS_TA2__
 #define HWTIMER_MAXTIMERS 2
 #endif
@@ -32,4 +36,8 @@
 #define HWTIMER_SPEED  (F_RC_OSCILLATOR)
 #define HWTIMER_MAXTICKS (0xFFFFFFFF)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // __HWTIMER_CPU_H

cpu/msp430-common/include/msp430_types.h

@@ -15,6 +15,10 @@
 /** defining signed type for size_t */
 #include "kernel_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef EINVAL
 /**
  * @brief defines EINVAL if MSP430 toolchain is too old to provide it itself
@@ -47,4 +51,8 @@ struct timeval {
 /* TODO: remove once msp430 libc supports clockid_t */
 typedef int clockid_t;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* MSP430_TYPES_H */

cpu/msp430-common/include/sys/time.h

@@ -11,4 +11,12 @@
 
 #include "msp430_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* TIME_H */

cpu/msp430-common/include/time.h

@@ -9,6 +9,10 @@
 #ifndef MSPGCC_TIME_H
 #define MSPGCC_TIME_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct tm {
     int tm_sec;                   /* Seconds after the minute [0, 60] */
     int tm_min;                   /* Minutes after the hour [0, 59] */
@@ -21,4 +25,8 @@ struct tm {
     int tm_isdst;                 /* Daylight saving time is in effect */
 };
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

cpu/native/include/clang_compat.h

@@ -10,6 +10,10 @@
 
 #ifndef __CLANG_COMPAT_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #undef HTONS
 #undef HTONL
 #undef HTONLL
@@ -17,4 +21,8 @@
 #undef NTOHL
 #undef NTOHLL
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

cpu/native/include/cpu-conf.h

@@ -16,6 +16,10 @@
 #ifndef CPUCONF_H_
 #define CPUCONF_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* TODO: tighten stack sizes */
 #ifdef __MACH__ /* OSX */
 #define KERNEL_CONF_STACKSIZE_DEFAULT       (163840)
@@ -64,4 +68,8 @@
 #define CPUID_ID_LEN                    (4)
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* CPUCONF_H_ */

cpu/native/include/cpu.h

@@ -20,9 +20,17 @@
 #ifndef _CPU_H
 #define _CPU_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* TODO: remove once these have been removed from RIOT: */
 void dINT(void);
 void eINT(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 /** @} */
 #endif //_CPU_H

cpu/native/include/hwtimer_cpu.h

@@ -17,8 +17,16 @@
 #ifndef HWTIMER_CPU_H_
 #define HWTIMER_CPU_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define HWTIMER_MAXTIMERS 4
 #define HWTIMER_SPEED 1000000
 #define HWTIMER_MAXTICKS (0xFFFFFFFF)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* HWTIMER_CPU_H_ */

cpu/native/include/native_internal.h

@@ -47,6 +47,9 @@
 
 #include "kernel_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /**
  * Prototype for native's internal callbacks
@@ -146,6 +149,10 @@ int unregister_interrupt(int sig);
 
 //#include <sys/param.h>
 
+#ifdef __cplusplus
+}
+#endif
+
 #include "kernel_internal.h"
 #include "sched.h"
 

cpu/native/include/nativenet.h

@@ -42,6 +42,11 @@
 
 #ifndef NATIVE_MAX_DATA_LENGTH
 #include "tap.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef MODULE_SIXLOWPAN
 #define NATIVE_MAX_DATA_LENGTH (127)
 #else
@@ -155,5 +160,10 @@ uint16_t nativenet_get_pan(void);
  * Enable transceiver rx mode
  */
 void nativenet_switch_to_rx(void);
+
+#ifdef __cplusplus
+}
+#endif
+
 /** @} */
 #endif /* NATIVENET_H */

cpu/native/include/nativenet_internal.h

@@ -19,6 +19,10 @@
 
 #include "tap.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define NNEV_PWRDWN     0x01
 #define NNEV_PWRUP      0x02
 #define NNEV_MONITOR    0x03
@@ -97,4 +101,9 @@ extern _nativenet_netdev_more_t _nativenet_default_dev_more;
 
 void _nativenet_handle_packet(radio_packet_t *packet);
 int8_t send_buf(radio_packet_t *packet);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* NATIVENET_INTERNAL_H */

cpu/native/include/tap.h

@@ -21,6 +21,10 @@
 #include "board.h"
 #include "radio/types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * create and/or open tap device "name"
  *
@@ -55,4 +59,8 @@ union eth_frame {
     unsigned char buffer[ETHER_MAX_LEN];
 } __attribute__((packed));
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _TAP_H */

cpu/nrf51822/include/cpu-conf.h

@@ -22,6 +22,10 @@
 #include "nrf51.h"
 #include "nrf51_bitfields.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @name Kernel configuration
  * @{
@@ -51,5 +55,9 @@
  */
 #define CPUID_ID_LEN                    (8)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __CPU_CONF_H */
 /** @} */

cpu/nrf51822/include/hwtimer_cpu.h

@@ -19,6 +19,10 @@
 #ifndef __HWTIMER_CPU_H
 #define __HWTIMER_CPU_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @name Hardware timer configuration
  * @{
@@ -29,6 +33,9 @@
 #define HWTIMER_MAXTICKS    (0xFFFFFF)      /**< 24-bit timer -> see PAN note */
 /** @} */
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* __HWTIMER_CPU_H */
 /** @} */

cpu/nrf51822/include/nrf51.h

@@ -116,8 +116,15 @@ typedef enum {
 #define __Vendor_SysTickConfig         0            /*!< Set to 1 if different SysTick Config is used                          */
 /** @} */ /* End of group Configuration_of_CMSIS */
 
+#ifdef __cplusplus
+}
+#endif
+
 #include <core_cm0.h>                               /*!< Cortex-M0 processor and core peripherals                              */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /* ================================================================================ */
 /* ================       Device Specific Peripheral Section       ================ */

cpu/nrf51822/include/nrf51_bitfields.h

@@ -34,6 +34,10 @@
 
 #include <core_cm0.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Peripheral: AAR */
 /* Description: Accelerated Address Resolver. */
 
@@ -6889,6 +6893,9 @@
 #define WDT_POWER_POWER_Disabled (0UL) /*!< Module power disabled. */
 #define WDT_POWER_POWER_Enabled (1UL) /*!< Module power enabled. */
 
+#ifdef __cplusplus
+}
+#endif
 
 /*lint --flb "Leave library region" */
 #endif

cpu/sam3x8e/include/component/component_adc.h

@@ -30,6 +30,10 @@
 #ifndef _SAM3XA_ADC_COMPONENT_
 #define _SAM3XA_ADC_COMPONENT_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR Analog-to-digital Converter */
 /* ============================================================================= */
@@ -501,5 +505,8 @@ typedef struct {
 
 /*@}*/
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* _SAM3XA_ADC_COMPONENT_ */

cpu/sam3x8e/include/component/component_can.h

@@ -30,6 +30,10 @@
 #ifndef _SAM3XA_CAN_COMPONENT_