diff --git a/Libraries/MAXUSB/include/core/arm/usb_hwopt.h b/Libraries/MAXUSB/include/core/arm/usb_hwopt.h
index ff20b41a678..a22a977f4e4 100644
--- a/Libraries/MAXUSB/include/core/arm/usb_hwopt.h
+++ b/Libraries/MAXUSB/include/core/arm/usb_hwopt.h
@@ -31,13 +31,17 @@
  *
  *
  ******************************************************************************/
- 
+
 #ifndef _USBIO_HWOPT_H_
 #define _USBIO_HWOPT_H_
 
 #include "mxc_device.h"
 #include "usb_regs.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* There are no configuration options for this target */
 typedef void maxusb_cfg_options_t;
 
@@ -68,4 +72,8 @@ static inline void MXC_USB_RemoteWakeup(void)
     MXC_USB->dev_cn |= MXC_F_USB_DEV_CN_SIGRWU;
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _USBIO_HWOPT_H_ */
diff --git a/Libraries/MAXUSB/include/core/maxq/usb_hwopt.h b/Libraries/MAXUSB/include/core/maxq/usb_hwopt.h
index 4f2f7d438c5..1c5a1591442 100644
--- a/Libraries/MAXUSB/include/core/maxq/usb_hwopt.h
+++ b/Libraries/MAXUSB/include/core/maxq/usb_hwopt.h
@@ -35,6 +35,10 @@
 #ifndef _USBIO_HWOPT_H_
 #define _USBIO_HWOPT_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* There are no configuration options for this target */
 typedef void maxusb_cfg_options_t;
 
@@ -46,5 +50,8 @@ typedef void maxusb_cfg_options_t;
 #define MAXUSB_EXIT_CRITICAL() __enable_interrupt()
 #endif
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* _USBIO_HWOPT_H_ */
diff --git a/Libraries/MAXUSB/include/core/maxq/usbio_maxq.h b/Libraries/MAXUSB/include/core/maxq/usbio_maxq.h
index dad7f29be4c..36c0d1e9aef 100644
--- a/Libraries/MAXUSB/include/core/maxq/usbio_maxq.h
+++ b/Libraries/MAXUSB/include/core/maxq/usbio_maxq.h
@@ -32,8 +32,16 @@
  *
  ******************************************************************************/
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int usbio_writereg(unsigned int reg, uint16_t data);
 int usbio_readreg(unsigned int reg, uint16_t *data);
 void usbio_blind_writereg(unsigned int reg, uint16_t data);
 int usbio_readfifo(unsigned int reg, uint8_t *data, unsigned int num);
 int usbio_writefifo(unsigned int reg, uint8_t *data, unsigned int num);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/Libraries/MAXUSB/include/core/musbhsfc/usb_hwopt.h b/Libraries/MAXUSB/include/core/musbhsfc/usb_hwopt.h
index e74a47380c6..8c9e669a324 100644
--- a/Libraries/MAXUSB/include/core/musbhsfc/usb_hwopt.h
+++ b/Libraries/MAXUSB/include/core/musbhsfc/usb_hwopt.h
@@ -38,6 +38,10 @@
 #include "mxc_device.h"
 #include "usbhs_regs.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Configuration options for MUSBHSFC */
 typedef struct {
   unsigned int enable_hs; /* 0 = full-speed only, otherwise high-speed if negotiated */
@@ -71,4 +75,8 @@ void MXC_USB_RemoteWakeup(void);
  */
 void MXC_USB_DmaIsr(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _USBIO_HWOPT_H_ */
diff --git a/Libraries/MAXUSB/include/core/usb.h b/Libraries/MAXUSB/include/core/usb.h
index 4dcbb4521ca..b367f51c5e3 100644
--- a/Libraries/MAXUSB/include/core/usb.h
+++ b/Libraries/MAXUSB/include/core/usb.h
@@ -38,6 +38,10 @@
 #include "usb_hwopt.h"
 #include "usb_protocol.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+  
 /**
  * @file usb.h
  * @brief Defines the API used to abstract USB hardware away from upper layers.
@@ -404,4 +408,8 @@ int MXC_USB_ReadEndpoint(MXC_USB_Req_t *req);
  */
 int MXC_USB_TestMode(unsigned int value);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _USB_H_ */
diff --git a/Libraries/MAXUSB/include/core/usb_event.h b/Libraries/MAXUSB/include/core/usb_event.h
index b8ffd20de5f..12a4d9032a3 100644
--- a/Libraries/MAXUSB/include/core/usb_event.h
+++ b/Libraries/MAXUSB/include/core/usb_event.h
@@ -46,6 +46,10 @@
 
 #include "usb.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @file MXC_USB_event.h
  * @brief Defines the API used for USB event handling
@@ -88,4 +92,8 @@ int MXC_USB_EventClear(maxusb_event_t event);
  */
 void MXC_USB_EventHandler(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _USB_EVENT_H_ */
diff --git a/Libraries/MAXUSB/include/core/usb_protocol.h b/Libraries/MAXUSB/include/core/usb_protocol.h
index 1dcef7b2c2d..ffa43d0fbdb 100644
--- a/Libraries/MAXUSB/include/core/usb_protocol.h
+++ b/Libraries/MAXUSB/include/core/usb_protocol.h
@@ -37,6 +37,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+  
 /* SETUP message byte offsets */
 #define SETUP_bmRequestType   0
 #define	SETUP_bRequest        1
@@ -205,5 +209,8 @@ typedef __packed struct {
   uint8_t  bMaxPower;
 } MXC_USB_other_speed_configuration_descriptor_t;
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif
diff --git a/Libraries/MAXUSB/include/dbg_log/dbg_log.h b/Libraries/MAXUSB/include/dbg_log/dbg_log.h
index da91494c1f9..60b81cd0e0f 100644
--- a/Libraries/MAXUSB/include/dbg_log/dbg_log.h
+++ b/Libraries/MAXUSB/include/dbg_log/dbg_log.h
@@ -35,6 +35,10 @@
 #ifndef _LOGGER_H_
 #define _LOGGER_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef enum {
   DBG_EVT_START = 0,
   DBG_EVT_RESET,
@@ -77,4 +81,8 @@ int dbg_log_init(void);
 int dbg_log_add(uint32_t t, dbg_evt_type_t e, uint32_t e_p, char *txt);
 void dbg_log_print(int num);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/Libraries/MAXUSB/include/devclass/cdc_acm.h b/Libraries/MAXUSB/include/devclass/cdc_acm.h
index 1b6e4f9b0ee..0e19d18bb29 100644
--- a/Libraries/MAXUSB/include/devclass/cdc_acm.h
+++ b/Libraries/MAXUSB/include/devclass/cdc_acm.h
@@ -36,6 +36,10 @@
 
 #include "usb_protocol.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+  
 /**
  * @file  cdc_acm.h
  * @brief Communications Device Class ACM (Serial Port) over USB.
@@ -165,4 +169,8 @@ int acm_read(uint8_t *buf, unsigned int len);
  */
 int acm_write(uint8_t *buf, unsigned int len);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _CDC_ACM_H_ */
diff --git a/Libraries/MAXUSB/include/devclass/fifo.h b/Libraries/MAXUSB/include/devclass/fifo.h
index 752717d6944..c45f8b75853 100644
--- a/Libraries/MAXUSB/include/devclass/fifo.h
+++ b/Libraries/MAXUSB/include/devclass/fifo.h
@@ -43,6 +43,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /***** Definitions *****/
 
 /// Structure used for FIFO management
@@ -139,4 +143,8 @@ unsigned int fifo_level(fifo_t * fifo);
 */
 unsigned int fifo_remaining(fifo_t * fifo);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _FIFO_H_ */
diff --git a/Libraries/MAXUSB/include/devclass/hid.h b/Libraries/MAXUSB/include/devclass/hid.h
index 17703957973..09a41cfcae4 100644
--- a/Libraries/MAXUSB/include/devclass/hid.h
+++ b/Libraries/MAXUSB/include/devclass/hid.h
@@ -36,6 +36,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+  
 /**
  * @file  hid.h
  * @brief Human Interface Device Class
@@ -69,4 +73,8 @@ typedef __packed struct {
   uint16_t wDescriptorLength;
 } hid_descriptor_t;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _HID_H_ */
diff --git a/Libraries/MAXUSB/include/devclass/hid_kbd.h b/Libraries/MAXUSB/include/devclass/hid_kbd.h
index 1727f25808b..c3851f01946 100644
--- a/Libraries/MAXUSB/include/devclass/hid_kbd.h
+++ b/Libraries/MAXUSB/include/devclass/hid_kbd.h
@@ -43,6 +43,10 @@
 #include "usb_protocol.h"
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** 
  *  \brief    Initialize the class driver
  *  \details  Initialize the class driver.
@@ -87,4 +91,8 @@ int hidkbd_keypress(uint8_t key);
  */
 int hidkbd_encode_report(uint8_t *rpt, uint8_t *ascii, int num);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _HID_KBD_H_ */
diff --git a/Libraries/MAXUSB/include/devclass/hid_raw.h b/Libraries/MAXUSB/include/devclass/hid_raw.h
index e58ef02ab61..44cfee0f982 100644
--- a/Libraries/MAXUSB/include/devclass/hid_raw.h
+++ b/Libraries/MAXUSB/include/devclass/hid_raw.h
@@ -34,6 +34,10 @@
 #ifndef _HID_RAW_H_
 #define _HID_RAW_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+  
 /**
  * @file  hid_raw.h
  * @brief Raw Human Interface Device Class over USB
@@ -111,4 +115,8 @@ int hidraw_read(uint8_t *data, unsigned int len);
  */
 int hidraw_write(const uint8_t *data, unsigned int len);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _HID_RAW_H_ */
diff --git a/Libraries/MAXUSB/include/devclass/msc.h b/Libraries/MAXUSB/include/devclass/msc.h
index 697755acc3f..d56db99cdcb 100644
--- a/Libraries/MAXUSB/include/devclass/msc.h
+++ b/Libraries/MAXUSB/include/devclass/msc.h
@@ -34,6 +34,10 @@
 #ifndef _MSC_H_
 #define _MSC_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @file  MSC.h
  * @brief Mass Storage Class over USB.
@@ -112,4 +116,8 @@ int msc_configure(const msc_cfg_t *cfg);
  */
 int msc_deconfigure(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _MSC_H_ */
diff --git a/Libraries/MAXUSB/include/enumerate/enumerate.h b/Libraries/MAXUSB/include/enumerate/enumerate.h
index d936ef6db26..c0c9fe41569 100644
--- a/Libraries/MAXUSB/include/enumerate/enumerate.h
+++ b/Libraries/MAXUSB/include/enumerate/enumerate.h
@@ -42,6 +42,10 @@
 
 #include <usb_protocol.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /// User can register callbacks for various control endpoint requests
 typedef enum {
   ENUM_CLASS_REQ,
@@ -132,4 +136,8 @@ uint8_t enum_getconfig(void);
  */
 void enum_clearconfig(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/Libraries/PeriphDrivers/Include/MAX32520/mxc_delay.h b/Libraries/PeriphDrivers/Include/MAX32520/mxc_delay.h
index 4da6f3b8e52..6103b6ae737 100644
--- a/Libraries/PeriphDrivers/Include/MAX32520/mxc_delay.h
+++ b/Libraries/PeriphDrivers/Include/MAX32520/mxc_delay.h
@@ -42,6 +42,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @ingroup devicelibs
  * @defgroup    MXC_delay Delay Utility Functions
@@ -129,4 +133,8 @@ void MXC_DelayHandler(void);
 
 /**@} end of group MXC_delay */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX32520_MXC_DELAY_H_
diff --git a/Libraries/PeriphDrivers/Include/MAX32520/spi.h b/Libraries/PeriphDrivers/Include/MAX32520/spi.h
index dd825a91098..96bd2b6f8b9 100644
--- a/Libraries/PeriphDrivers/Include/MAX32520/spi.h
+++ b/Libraries/PeriphDrivers/Include/MAX32520/spi.h
@@ -46,6 +46,10 @@
 #include "mxc_pins.h"
 #include "mxc_lock.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /***** Definitions *****/
 
 /**
diff --git a/Libraries/PeriphDrivers/Include/MAX32570/mxc_delay.h b/Libraries/PeriphDrivers/Include/MAX32570/mxc_delay.h
index 81aad5ae391..23984fca55d 100644
--- a/Libraries/PeriphDrivers/Include/MAX32570/mxc_delay.h
+++ b/Libraries/PeriphDrivers/Include/MAX32570/mxc_delay.h
@@ -42,6 +42,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @ingroup devicelibs
  * @defgroup    MXC_delay Delay Utility Functions
@@ -129,4 +133,8 @@ void MXC_DelayHandler(void);
 
 /**@} end of group MXC_delay */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX32570_MXC_DELAY_H_
diff --git a/Libraries/PeriphDrivers/Include/MAX32570/spi.h b/Libraries/PeriphDrivers/Include/MAX32570/spi.h
index 9803a6922c1..232282de8e6 100644
--- a/Libraries/PeriphDrivers/Include/MAX32570/spi.h
+++ b/Libraries/PeriphDrivers/Include/MAX32570/spi.h
@@ -46,6 +46,10 @@
 #include "mxc_pins.h"
 #include "mxc_lock.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup spi Serial Peripheral Interface (SPI)
  * @ingroup periphlibs
diff --git a/Libraries/PeriphDrivers/Include/MAX32572/mxc_delay.h b/Libraries/PeriphDrivers/Include/MAX32572/mxc_delay.h
index b0813146dcd..accf9c912c1 100644
--- a/Libraries/PeriphDrivers/Include/MAX32572/mxc_delay.h
+++ b/Libraries/PeriphDrivers/Include/MAX32572/mxc_delay.h
@@ -42,6 +42,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @ingroup devicelibs
  * @defgroup    MXC_delay Delay Utility Functions
@@ -129,4 +133,8 @@ void MXC_DelayHandler(void);
 
 /**@} end of group MXC_delay */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX32572_MXC_DELAY_H_
diff --git a/Libraries/PeriphDrivers/Include/MAX32572/spi.h b/Libraries/PeriphDrivers/Include/MAX32572/spi.h
index 09283a29e7a..697081ec204 100644
--- a/Libraries/PeriphDrivers/Include/MAX32572/spi.h
+++ b/Libraries/PeriphDrivers/Include/MAX32572/spi.h
@@ -47,6 +47,10 @@
 #include "mxc_pins.h"
 #include "mxc_lock.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup spi Serial Peripheral Interface (SPI)
  * @ingroup periphlibs
diff --git a/Libraries/PeriphDrivers/Include/MAX32650/i2c.h b/Libraries/PeriphDrivers/Include/MAX32650/i2c.h
index 3b11826d125..38afd349aaf 100644
--- a/Libraries/PeriphDrivers/Include/MAX32650/i2c.h
+++ b/Libraries/PeriphDrivers/Include/MAX32650/i2c.h
@@ -46,6 +46,10 @@
 #include "i2c_regs.h"
 #include "mxc_sys.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup i2c I2C
  * @ingroup periphlibs
@@ -855,4 +859,8 @@ void MXC_I2C_DMACallback(int ch, int error);
 
 /**@} end of group i2c */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX32650_I2C_H_
diff --git a/Libraries/PeriphDrivers/Include/MAX32650/mem_utils.h b/Libraries/PeriphDrivers/Include/MAX32650/mem_utils.h
index 0e9d64fc379..cf383116bb2 100644
--- a/Libraries/PeriphDrivers/Include/MAX32650/mem_utils.h
+++ b/Libraries/PeriphDrivers/Include/MAX32650/mem_utils.h
@@ -43,6 +43,10 @@
 
 #include "mxc_device.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup    mem_utils Memory Utility Functions 
  * @ingroup     devicelibs 
@@ -103,4 +107,8 @@ int memcmp32(uint32_t *dst, uint32_t *src, unsigned int len);
 
 /**@} end of group mem_utils */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX32650_MEM_UTILS_H_
diff --git a/Libraries/PeriphDrivers/Include/MAX32650/mxc_delay.h b/Libraries/PeriphDrivers/Include/MAX32650/mxc_delay.h
index 7a7d0c80947..a41e5b0ed9c 100644
--- a/Libraries/PeriphDrivers/Include/MAX32650/mxc_delay.h
+++ b/Libraries/PeriphDrivers/Include/MAX32650/mxc_delay.h
@@ -46,6 +46,10 @@
 #include <stdint.h>
 #include "mxc_errors.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @ingroup devicelibs 
  * @defgroup    MXC_delay Delay Utility Functions 
@@ -133,4 +137,8 @@ void MXC_DelayHandler(void);
 
 /**@} end of group MXC_delay */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX32650_MXC_DELAY_H_
diff --git a/Libraries/PeriphDrivers/Include/MAX32650/uart.h b/Libraries/PeriphDrivers/Include/MAX32650/uart.h
index c13c66c3cc0..12b3a93a287 100644
--- a/Libraries/PeriphDrivers/Include/MAX32650/uart.h
+++ b/Libraries/PeriphDrivers/Include/MAX32650/uart.h
@@ -48,6 +48,10 @@
 #include "uart_regs.h"
 #include "mxc_sys.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /***** Definitions *****/
 
 /**
@@ -665,4 +669,8 @@ uint32_t MXC_UART_GetAsyncRXCount(mxc_uart_req_t *req);
 
 /**@} end of group uart */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX32650_UART_H_
diff --git a/Libraries/PeriphDrivers/Include/MAX32655/mxc_delay.h b/Libraries/PeriphDrivers/Include/MAX32655/mxc_delay.h
index 64f6898e995..bdc59b2d765 100644
--- a/Libraries/PeriphDrivers/Include/MAX32655/mxc_delay.h
+++ b/Libraries/PeriphDrivers/Include/MAX32655/mxc_delay.h
@@ -45,6 +45,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @ingroup devicelibs
  * @defgroup    MXC_delay Delay Utility Functions
@@ -132,4 +136,8 @@ void MXC_DelayHandler(void);
 
 /**@} end of group MXC_delay */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX32655_MXC_DELAY_H_
diff --git a/Libraries/PeriphDrivers/Include/MAX32660/msr.h b/Libraries/PeriphDrivers/Include/MAX32660/msr.h
index caa3aebe550..c50dd873933 100644
--- a/Libraries/PeriphDrivers/Include/MAX32660/msr.h
+++ b/Libraries/PeriphDrivers/Include/MAX32660/msr.h
@@ -45,6 +45,10 @@
 #ifndef LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX32660_MSR_H_
 #define LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX32660_MSR_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /***** Definitions *****/
 
 /// Number of tracks on a card
@@ -169,4 +173,8 @@ void msr_set_complete_callback(void (*func)(void));
 */
 unsigned int mcr_get_track_samples(unsigned int track, msr_samples_t *samples);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX32660_MSR_H_
diff --git a/Libraries/PeriphDrivers/Include/MAX32660/mxc_delay.h b/Libraries/PeriphDrivers/Include/MAX32660/mxc_delay.h
index 3a6edc1b14a..4ace2c0cebf 100644
--- a/Libraries/PeriphDrivers/Include/MAX32660/mxc_delay.h
+++ b/Libraries/PeriphDrivers/Include/MAX32660/mxc_delay.h
@@ -42,6 +42,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @ingroup devicelibs
  * @defgroup    MXC_delay Delay Utility Functions
@@ -129,4 +133,8 @@ void MXC_DelayHandler(void);
 
 /**@} end of group MXC_delay */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX32660_MXC_DELAY_H_
diff --git a/Libraries/PeriphDrivers/Include/MAX32660/spi.h b/Libraries/PeriphDrivers/Include/MAX32660/spi.h
index 21a817edf70..be8e8819b75 100644
--- a/Libraries/PeriphDrivers/Include/MAX32660/spi.h
+++ b/Libraries/PeriphDrivers/Include/MAX32660/spi.h
@@ -47,6 +47,10 @@
 #include "mxc_pins.h"
 #include "mxc_lock.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /***** Definitions *****/
 
 /**
diff --git a/Libraries/PeriphDrivers/Include/MAX32662/msr.h b/Libraries/PeriphDrivers/Include/MAX32662/msr.h
index 6526ef31c00..0d83985e723 100644
--- a/Libraries/PeriphDrivers/Include/MAX32662/msr.h
+++ b/Libraries/PeriphDrivers/Include/MAX32662/msr.h
@@ -44,6 +44,10 @@
 #ifndef LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX32662_MSR_H_
 #define LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX32662_MSR_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /***** Definitions *****/
 
 /// Number of tracks on a card
@@ -168,4 +172,8 @@ void msr_set_complete_callback(void (*func)(void));
 */
 unsigned int mcr_get_track_samples(unsigned int track, msr_samples_t *samples);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX32662_MSR_H_
diff --git a/Libraries/PeriphDrivers/Include/MAX32662/mxc_delay.h b/Libraries/PeriphDrivers/Include/MAX32662/mxc_delay.h
index 47b98e383c7..dcaa0f20d57 100644
--- a/Libraries/PeriphDrivers/Include/MAX32662/mxc_delay.h
+++ b/Libraries/PeriphDrivers/Include/MAX32662/mxc_delay.h
@@ -42,6 +42,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @ingroup devicelibs
  * @defgroup    MXC_delay Delay Utility Functions
@@ -129,4 +133,8 @@ void MXC_DelayHandler(void);
 
 /**@} end of group MXC_delay */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX32662_MXC_DELAY_H_
diff --git a/Libraries/PeriphDrivers/Include/MAX32665/core1.h b/Libraries/PeriphDrivers/Include/MAX32665/core1.h
index e5d4e1a4edb..d7b100d0c35 100644
--- a/Libraries/PeriphDrivers/Include/MAX32665/core1.h
+++ b/Libraries/PeriphDrivers/Include/MAX32665/core1.h
@@ -37,6 +37,10 @@
 #ifndef LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX32665_CORE1_H_
 #define LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX32665_CORE1_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @file    core1.h
  * @brief   Startup Code for MAX32665 Family CPU1
@@ -74,4 +78,8 @@ void PreInit_Core1(void);
  */
 void SystemInit_Core1(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX32665_CORE1_H_
diff --git a/Libraries/PeriphDrivers/Include/MAX32665/mxc_delay.h b/Libraries/PeriphDrivers/Include/MAX32665/mxc_delay.h
index abcc05de732..ff7c5da0050 100644
--- a/Libraries/PeriphDrivers/Include/MAX32665/mxc_delay.h
+++ b/Libraries/PeriphDrivers/Include/MAX32665/mxc_delay.h
@@ -45,6 +45,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @ingroup devicelibs 
  * @defgroup    MXC_delay Delay Utility Functions 
@@ -132,4 +136,8 @@ void MXC_DelayHandler(void);
 
 /**@} end of group MXC_delay */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX32665_MXC_DELAY_H_
diff --git a/Libraries/PeriphDrivers/Include/MAX32670/mxc_delay.h b/Libraries/PeriphDrivers/Include/MAX32670/mxc_delay.h
index 9785d9d01a8..b67afecd266 100644
--- a/Libraries/PeriphDrivers/Include/MAX32670/mxc_delay.h
+++ b/Libraries/PeriphDrivers/Include/MAX32670/mxc_delay.h
@@ -42,6 +42,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @ingroup devicelibs
  * @defgroup    MXC_delay Delay Utility Functions
@@ -129,4 +133,8 @@ void MXC_DelayHandler(void);
 
 /**@} end of group MXC_delay */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX32670_MXC_DELAY_H_
diff --git a/Libraries/PeriphDrivers/Include/MAX32672/msr.h b/Libraries/PeriphDrivers/Include/MAX32672/msr.h
index 281eb57fd2f..1fa3363d704 100644
--- a/Libraries/PeriphDrivers/Include/MAX32672/msr.h
+++ b/Libraries/PeriphDrivers/Include/MAX32672/msr.h
@@ -45,6 +45,10 @@
 #ifndef LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX32672_MSR_H_
 #define LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX32672_MSR_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /***** Definitions *****/
 
 /// Number of tracks on a card
@@ -169,4 +173,8 @@ void msr_set_complete_callback(void (*func)(void));
 */
 unsigned int mcr_get_track_samples(unsigned int track, msr_samples_t *samples);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX32672_MSR_H_
diff --git a/Libraries/PeriphDrivers/Include/MAX32672/mxc_delay.h b/Libraries/PeriphDrivers/Include/MAX32672/mxc_delay.h
index 7bd17c58dbb..4c214637ac8 100644
--- a/Libraries/PeriphDrivers/Include/MAX32672/mxc_delay.h
+++ b/Libraries/PeriphDrivers/Include/MAX32672/mxc_delay.h
@@ -42,6 +42,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @ingroup devicelibs
  * @defgroup    MXC_delay Delay Utility Functions
@@ -128,4 +132,8 @@ void MXC_DelayHandler(void);
 
 /**@} end of group MXC_delay */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX32672_MXC_DELAY_H_
diff --git a/Libraries/PeriphDrivers/Include/MAX32675/mxc_delay.h b/Libraries/PeriphDrivers/Include/MAX32675/mxc_delay.h
index f82bd0bd687..8a47fefec32 100644
--- a/Libraries/PeriphDrivers/Include/MAX32675/mxc_delay.h
+++ b/Libraries/PeriphDrivers/Include/MAX32675/mxc_delay.h
@@ -42,6 +42,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @ingroup devicelibs
  * @defgroup    MXC_delay Delay Utility Functions
@@ -129,4 +133,8 @@ void MXC_DelayHandler(void);
 
 /**@} end of group MXC_delay */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX32675_MXC_DELAY_H_
diff --git a/Libraries/PeriphDrivers/Include/MAX32680/mxc_delay.h b/Libraries/PeriphDrivers/Include/MAX32680/mxc_delay.h
index e6191811266..6b65fe3cc9d 100644
--- a/Libraries/PeriphDrivers/Include/MAX32680/mxc_delay.h
+++ b/Libraries/PeriphDrivers/Include/MAX32680/mxc_delay.h
@@ -45,6 +45,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @ingroup devicelibs
  * @defgroup    MXC_delay Delay Utility Functions
@@ -132,4 +136,8 @@ void MXC_DelayHandler(void);
 
 /**@} end of group MXC_delay */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX32680_MXC_DELAY_H_
diff --git a/Libraries/PeriphDrivers/Include/MAX32690/mxc_delay.h b/Libraries/PeriphDrivers/Include/MAX32690/mxc_delay.h
index 9d7bb044bc0..a5bd2f84687 100644
--- a/Libraries/PeriphDrivers/Include/MAX32690/mxc_delay.h
+++ b/Libraries/PeriphDrivers/Include/MAX32690/mxc_delay.h
@@ -45,6 +45,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @ingroup devicelibs
  * @defgroup    MXC_delay Delay Utility Functions
@@ -132,4 +136,8 @@ void MXC_DelayHandler(void);
 
 /**@} end of group MXC_delay */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX32690_MXC_DELAY_H_
diff --git a/Libraries/PeriphDrivers/Include/MAX78000/mxc_delay.h b/Libraries/PeriphDrivers/Include/MAX78000/mxc_delay.h
index 9360ad80943..824dbdab09e 100644
--- a/Libraries/PeriphDrivers/Include/MAX78000/mxc_delay.h
+++ b/Libraries/PeriphDrivers/Include/MAX78000/mxc_delay.h
@@ -45,6 +45,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @ingroup devicelibs
  * @defgroup    MXC_delay Delay Utility Functions
@@ -151,4 +155,8 @@ void MXC_DelayHandler(void);
 
 #endif /* __riscv */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX78000_MXC_DELAY_H_
diff --git a/Libraries/PeriphDrivers/Include/MAX78002/mxc_delay.h b/Libraries/PeriphDrivers/Include/MAX78002/mxc_delay.h
index 1c042b7aeb5..a89e4fe30c6 100644
--- a/Libraries/PeriphDrivers/Include/MAX78002/mxc_delay.h
+++ b/Libraries/PeriphDrivers/Include/MAX78002/mxc_delay.h
@@ -45,6 +45,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @ingroup devicelibs
  * @defgroup    MXC_delay Delay Utility Functions
@@ -152,4 +156,8 @@ void MXC_DelayHandler(void);
 
 #endif /* __riscv */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // LIBRARIES_PERIPHDRIVERS_INCLUDE_MAX78002_MXC_DELAY_H_