diff --git a/include/intel_galileo_rev_d.h b/include/intel_galileo_rev_d.h
index d1ff21d..fa6ad46 100644
--- a/include/intel_galileo_rev_d.h
+++ b/include/intel_galileo_rev_d.h
@@ -24,9 +24,17 @@
 
 #pragma once
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "mraa_adv_func.h"
 
 #define MRAA_INTEL_GALILEO_REV_D_PINCOUNT 25
 
 mraa_board_t*
 mraa_intel_galileo_rev_d(mraa_adv_func* adv);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/include/intel_galileo_rev_g.h b/include/intel_galileo_rev_g.h
index 478b178..472b403 100644
--- a/include/intel_galileo_rev_g.h
+++ b/include/intel_galileo_rev_g.h
@@ -24,9 +24,17 @@
 
 #pragma once
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "mraa_adv_func.h"
 
 #define MRAA_INTEL_GALILEO_GEN_2_PINCOUNT 25
 
 mraa_board_t*
 mraa_intel_galileo_gen2(mraa_adv_func* adv);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/include/mraa_internal.h b/include/mraa_internal.h
index 536c2eb..b8e5441 100644
--- a/include/mraa_internal.h
+++ b/include/mraa_internal.h
@@ -24,6 +24,10 @@
 
 #pragma once
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "common.h"
 #include "mraa_adv_func.h"
 #include "mraa_internal_types.h"
@@ -79,8 +83,6 @@ mraa_mmap_pin_t* mraa_setup_mmap_gpio(int pin);
  */
 mraa_result_t mraa_swap_complex_gpio(int pin, int out);
 
-/** Get the advance structure.
- *
- * @return struct containing internal advance information for hooks
- */
-mraa_adv_func* mraa_get_advance();
+#ifdef __cplusplus
+}
+#endif
diff --git a/include/smbus.h b/include/smbus.h
index 469f0f9..740256e 100644
--- a/include/smbus.h
+++ b/include/smbus.h
@@ -30,6 +30,10 @@
 
 #pragma once
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -91,3 +95,7 @@ extern int i2c_smbus_write_i2c_block_data(int fd, uint8_t command, uint8_t lengt
 
 extern int i2c_smbus_block_process_call(int fd, uint8_t command, uint8_t length,
                                           uint8_t *values);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/include/version.h b/include/version.h
index eeff667..d60f189 100644
--- a/include/version.h
+++ b/include/version.h
@@ -24,5 +24,13 @@
 
 #pragma once
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 const char* gVERSION;
 const char* gVERSION_SHORT;
+
+#ifdef __cplusplus
+}
+#endif