diff --git a/camera/camera_driver.h b/camera/camera_driver.h
index bfd6f6bf18..32f763b610 100644
--- a/camera/camera_driver.h
+++ b/camera/camera_driver.h
@@ -20,11 +20,10 @@
 #include <stdint.h>
 
 #include <boolean.h>
+#include <retro_common_api.h>
 #include <libretro.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+RETRO_BEGIN_DECLS
 
 enum rarch_camera_ctl_state
 {
@@ -108,8 +107,6 @@ bool driver_camera_start(void);
 
 bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data);
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
diff --git a/git_version.h b/git_version.h
index 2217898ee7..3e12706304 100644
--- a/git_version.h
+++ b/git_version.h
@@ -17,17 +17,15 @@
 #ifndef RARCH_VERSION_H__
 #define RARCH_VERSION_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
 
 /* Put this in a separate file so we don't have to rebuilt 
  * retroarch.c every single build. */
 extern const char retroarch_git_version[];
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
 
diff --git a/location/location_driver.h b/location/location_driver.h
index 373a462d98..fe14d5f738 100644
--- a/location/location_driver.h
+++ b/location/location_driver.h
@@ -19,11 +19,11 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include <boolean.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <boolean.h>
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
 
 enum rarch_location_ctl_state
 {
@@ -139,8 +139,6 @@ void init_location(void);
 
 bool location_driver_ctl(enum rarch_location_ctl_state state, void *data);
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
diff --git a/record/record_driver.h b/record/record_driver.h
index 0c9af1eb37..4928aefa8d 100644
--- a/record/record_driver.h
+++ b/record/record_driver.h
@@ -18,11 +18,11 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include <boolean.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <boolean.h>
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
 
 enum ffemu_pix_format
 {
@@ -172,8 +172,6 @@ void recording_driver_clear_data_ptr(void);
 
 void recording_driver_set_data_ptr(void *data);
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif