diff --git a/audio/audio_driver.h b/audio/audio_driver.h
index 0e8fa372bc..f3748e40ed 100644
--- a/audio/audio_driver.h
+++ b/audio/audio_driver.h
@@ -22,13 +22,12 @@
 #include <sys/types.h>
 
 #include <boolean.h>
+#include <retro_common_api.h>
 
 #include "audio_dsp_filter.h"
 #include "audio_resampler_driver.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+RETRO_BEGIN_DECLS
 
 #define AUDIO_CHUNK_SIZE_BLOCKING      512
 
@@ -218,8 +217,6 @@ extern audio_driver_t audio_ctr_dsp;
 extern audio_driver_t audio_rwebaudio;
 extern audio_driver_t audio_null;
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
diff --git a/audio/audio_dsp_filter.h b/audio/audio_dsp_filter.h
index d9bdc124d9..8fd1578f87 100644
--- a/audio/audio_dsp_filter.h
+++ b/audio/audio_dsp_filter.h
@@ -17,9 +17,9 @@
 #ifndef __AUDIO_DSP_FILTER_H__
 #define __AUDIO_DSP_FILTER_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
 
 typedef struct rarch_dsp_filter rarch_dsp_filter_t;
 
@@ -41,9 +41,7 @@ struct rarch_dsp_data
 void rarch_dsp_filter_process(rarch_dsp_filter_t *dsp,
       struct rarch_dsp_data *data);
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
 
diff --git a/audio/audio_filters/dspfilter.h b/audio/audio_filters/dspfilter.h
index 94b2cd7f7a..b6f86b2020 100644
--- a/audio/audio_filters/dspfilter.h
+++ b/audio/audio_filters/dspfilter.h
@@ -18,9 +18,9 @@
 #ifndef DSPFILTER_API_H__
 #define DSPFILTER_API_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
 
 #define DSPFILTER_SIMD_SSE      (1 << 0)
 #define DSPFILTER_SIMD_SSE2     (1 << 1)
@@ -177,8 +177,6 @@ struct dspfilter_implementation
    const char *short_ident; 
 };
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
diff --git a/audio/audio_resampler_driver.c b/audio/audio_resampler_driver.c
index 6e1f5cebb0..4c6a4fff82 100644
--- a/audio/audio_resampler_driver.c
+++ b/audio/audio_resampler_driver.c
@@ -127,19 +127,6 @@ static const rarch_resampler_t *find_resampler_driver(const char *ident)
    return resampler_drivers[0];
 }
 
-#ifndef RARCH_INTERNAL
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-retro_get_cpu_features_t perf_get_cpu_features_cb;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
 static resampler_simd_mask_t resampler_get_cpu_features(void)
 {
    return cpu_features_get();
diff --git a/audio/audio_resampler_driver.h b/audio/audio_resampler_driver.h
index ca89c42fec..ebd9ac0fff 100644
--- a/audio/audio_resampler_driver.h
+++ b/audio/audio_resampler_driver.h
@@ -18,18 +18,17 @@
 #ifndef __AUDIO_RESAMPLER_DRIVER_H
 #define __AUDIO_RESAMPLER_DRIVER_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdint.h>
 #include <stddef.h>
 #include <math.h>
 
-#include <retro_miscellaneous.h>
 #include <boolean.h>
+#include <retro_common_api.h>
+#include <retro_miscellaneous.h>
 #include <libretro.h>
 
+RETRO_BEGIN_DECLS
+
 #define RESAMPLER_SIMD_SSE      (1 << 0)
 #define RESAMPLER_SIMD_SSE2     (1 << 1)
 #define RESAMPLER_SIMD_VMX      (1 << 2)
@@ -201,10 +200,6 @@ bool rarch_resampler_realloc(void **re, const rarch_resampler_t **backend,
    (backend)->process(handle, data); \
 } while(0)
 
-
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
-
diff --git a/frontend/frontend.h b/frontend/frontend.h
index f1ca65c4fb..8a3e458ea4 100644
--- a/frontend/frontend.h
+++ b/frontend/frontend.h
@@ -20,12 +20,13 @@
 
 #include <stdint.h>
 #include <stddef.h>
+
 #include <boolean.h>
+#include <retro_common_api.h>
+
 #include "frontend_driver.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+RETRO_BEGIN_DECLS
 
 /**
  * main_exit:
@@ -50,8 +51,6 @@ void main_exit(void *args);
  **/
 int rarch_main(int argc, char *argv[], void *data);
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
diff --git a/frontend/frontend_driver.h b/frontend/frontend_driver.h
index 9fc7c9ca5a..c35da1e2cc 100644
--- a/frontend/frontend_driver.h
+++ b/frontend/frontend_driver.h
@@ -20,14 +20,13 @@
 #include <stddef.h>
 
 #include <boolean.h>
+#include <retro_common_api.h>
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+RETRO_BEGIN_DECLS
 
 enum frontend_powerstate
 {
@@ -153,8 +152,6 @@ bool frontend_driver_get_core_extension(char *s, size_t len);
 
 bool frontend_driver_get_salamander_basename(char *s, size_t len);
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
diff --git a/gfx/font_driver.h b/gfx/font_driver.h
index 72d2218eee..00727fd4ca 100644
--- a/gfx/font_driver.h
+++ b/gfx/font_driver.h
@@ -20,10 +20,9 @@
 #include <stdint.h>
 
 #include <boolean.h>
+#include <retro_common_api.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+RETRO_BEGIN_DECLS
 
 enum font_driver_render_api
 {
@@ -159,8 +158,6 @@ extern font_renderer_driver_t freetype_font_renderer;
 extern font_renderer_driver_t coretext_font_renderer;
 extern font_renderer_driver_t bitmap_font_renderer;
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
diff --git a/input/input_defines.h b/input/input_defines.h
index 3cae5c978b..1a6aad3577 100644
--- a/input/input_defines.h
+++ b/input/input_defines.h
@@ -19,9 +19,9 @@
 
 #include <stdint.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
 
 enum analog_dpad_mode
 {
@@ -75,9 +75,6 @@ enum analog_dpad_mode
 #define GET_HAT_DIR(x)     (x & HAT_MASK)
 #define GET_HAT(x)         (x & (~HAT_MASK))
 
-
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
diff --git a/input/input_remote.h b/input/input_remote.h
index da9ab4875b..605cde065b 100644
--- a/input/input_remote.h
+++ b/input/input_remote.h
@@ -22,11 +22,11 @@
 #endif
 
 #include <stdint.h>
-#include <boolean.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <boolean.h>
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
 
 typedef struct input_remote input_remote_t;
 
@@ -45,9 +45,6 @@ void input_remote_state(
       unsigned idx,
       unsigned id);
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
-
diff --git a/performance_counters.h b/performance_counters.h
index 061df4675a..9735622f0c 100644
--- a/performance_counters.h
+++ b/performance_counters.h
@@ -19,11 +19,10 @@
 
 #include <stdint.h>
 
+#include <retro_common_api.h>
 #include <libretro.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+RETRO_BEGIN_DECLS
 
 #ifndef MAX_COUNTERS
 #define MAX_COUNTERS 64
@@ -63,9 +62,7 @@ void performance_counter_start(struct retro_perf_counter *perf);
  **/
 void performance_counter_stop(struct retro_perf_counter *perf);
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif