diff --git a/managers/cheat_manager.h b/managers/cheat_manager.h
index af1a167c7b..61ec66c5f9 100644
--- a/managers/cheat_manager.h
+++ b/managers/cheat_manager.h
@@ -18,10 +18,9 @@
 #define __CHEAT_MANAGER_H
 
 #include <boolean.h>
+#include <retro_common_api.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+RETRO_BEGIN_DECLS
 
 typedef struct cheat_manager cheat_manager_t;
 
@@ -74,8 +73,6 @@ void cheat_manager_state_free(void);
 
 bool cheat_manager_alloc_if_empty(void);
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
diff --git a/managers/core_option_manager.h b/managers/core_option_manager.h
index 152e8d19c7..4e78c585fd 100644
--- a/managers/core_option_manager.h
+++ b/managers/core_option_manager.h
@@ -20,10 +20,9 @@
 #include <stddef.h>
 
 #include <boolean.h>
+#include <retro_common_api.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+RETRO_BEGIN_DECLS
 
 typedef struct core_option_manager core_option_manager_t;
 
@@ -151,9 +150,6 @@ void core_option_manager_prev(core_option_manager_t *opt, size_t idx);
  **/
 void core_option_manager_set_default(core_option_manager_t *opt, size_t idx);
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
-
diff --git a/menu/menu_animation.h b/menu/menu_animation.h
index 5f031e1871..792bf4d60a 100644
--- a/menu/menu_animation.h
+++ b/menu/menu_animation.h
@@ -19,11 +19,11 @@
 
 #include <stdint.h>
 #include <stdlib.h>
-#include <boolean.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <boolean.h>
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
 
 typedef float (*easing_cb) (float, float, float, float);
 typedef void  (*tween_cb)  (void);
@@ -129,8 +129,6 @@ typedef struct menu_animation_ctx_ticker
 
 bool menu_animation_ctl(enum menu_animation_ctl_state state, void *data);
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
diff --git a/menu/menu_content.h b/menu/menu_content.h
index 796f4f6c10..12561f04c4 100644
--- a/menu/menu_content.h
+++ b/menu/menu_content.h
@@ -20,10 +20,9 @@
 #include <stdlib.h>
 
 #include <boolean.h>
+#include <retro_common_api.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+RETRO_BEGIN_DECLS
 
 enum menu_content_ctl_state
 {
@@ -63,8 +62,6 @@ typedef struct menu_content_ctx_defer_info
 
 bool menu_content_ctl(enum menu_content_ctl_state state, void *data);
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
diff --git a/menu/menu_display.h b/menu/menu_display.h
index 071bae4364..7f88a78dad 100644
--- a/menu/menu_display.h
+++ b/menu/menu_display.h
@@ -18,16 +18,15 @@
 
 #include <stdint.h>
 #include <stdlib.h>
-#include <boolean.h>
 
+#include <boolean.h>
+#include <retro_common_api.h>
 #include <gfx/math/matrix_4x4.h>
 
 #include "../gfx/video_context_driver.h"
 #include "../gfx/video_coord_array.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+RETRO_BEGIN_DECLS
 
 enum menu_display_prim_type
 {
@@ -210,8 +209,6 @@ extern menu_display_ctx_driver_t menu_display_ctx_vulkan;
 extern menu_display_ctx_driver_t menu_display_ctx_d3d;
 extern menu_display_ctx_driver_t menu_display_ctx_null;
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
diff --git a/menu/menu_displaylist.h b/menu/menu_displaylist.h
index d063f9e603..4fac743eae 100644
--- a/menu/menu_displaylist.h
+++ b/menu/menu_displaylist.h
@@ -19,16 +19,15 @@
 #include <stdint.h>
 
 #include <boolean.h>
+#include <retro_common_api.h>
 #include <lists/file_list.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifndef COLLECTION_SIZE
 #define COLLECTION_SIZE 99999
 #endif
 
+RETRO_BEGIN_DECLS
+
 enum menu_displaylist_parse_type
 {
    PARSE_NONE           = (1 << 0),
@@ -159,8 +158,6 @@ typedef struct menu_displaylist_ctx_entry
 
 bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data);
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index ee5249156b..400e9c513b 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -24,6 +24,7 @@
 #include <ctype.h>
 
 #include <boolean.h>
+#include <retro_common_api.h>
 
 #include "menu_entries.h"
 
@@ -31,9 +32,7 @@
 
 #include "../driver.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+RETRO_BEGIN_DECLS
 
 #ifndef MAX_COUNTERS
 #define MAX_COUNTERS 64
@@ -480,9 +479,6 @@ extern menu_ctx_driver_t menu_ctx_xmb;
 extern menu_ctx_driver_t menu_ctx_zarch;
 extern menu_ctx_driver_t menu_ctx_null;
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
-
diff --git a/menu/menu_entries.h b/menu/menu_entries.h
index fd5179a431..e651cc2054 100644
--- a/menu/menu_entries.h
+++ b/menu/menu_entries.h
@@ -20,14 +20,13 @@
 #include <stddef.h>
 
 #include <boolean.h>
+#include <retro_common_api.h>
 
 #include "menu_setting.h"
 #include "menu_entry.h"
 #include "menu_displaylist.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+RETRO_BEGIN_DECLS
 
 enum menu_list_type
 {
@@ -179,8 +178,6 @@ void menu_entries_prepend(file_list_t *list, const char *path, const char *label
 
 bool menu_entries_ctl(enum menu_entries_ctl_state state, void *data);
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
diff --git a/menu/menu_entry.h b/menu/menu_entry.h
index a05973fea2..e4f64f4e2a 100644
--- a/menu/menu_entry.h
+++ b/menu/menu_entry.h
@@ -17,14 +17,14 @@
 #define MENU_ENTRY_H__
 
 #include <stdint.h>
+
 #include <boolean.h>
+#include <retro_common_api.h>
 #include <retro_miscellaneous.h>
 
 #include "menu_input.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+RETRO_BEGIN_DECLS
 
 enum menu_entry_type
 {
@@ -112,8 +112,6 @@ int menu_entry_select(uint32_t i);
 int menu_entry_action(menu_entry_t *entry,
                       unsigned i, enum menu_action action);
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
diff --git a/menu/menu_hash.h b/menu/menu_hash.h
index 32d11e8491..cb6df47cfc 100644
--- a/menu/menu_hash.h
+++ b/menu/menu_hash.h
@@ -16,9 +16,9 @@
 #ifndef MENU_HASH_H__
 #define MENU_HASH_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
 
 #define MENU_LABEL_START_NET_RETROPAD                                          0xf2ae670dU
 #define MENU_LABEL_VALUE_START_NET_RETROPAD                                    0xad11a6a0U
@@ -1202,8 +1202,6 @@ int menu_hash_get_help(uint32_t hash, char *s, size_t len);
 
 uint32_t menu_hash_calculate(const char *s);
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
diff --git a/menu/menu_input.h b/menu/menu_input.h
index a859e6ffca..0d665dcb37 100644
--- a/menu/menu_input.h
+++ b/menu/menu_input.h
@@ -17,12 +17,12 @@
 #ifndef _MENU_INPUT_H
 #define _MENU_INPUT_H
 
+#include <retro_common_api.h>
+
 #include "../input/input_driver.h"
 #include "../input/input_keyboard.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+RETRO_BEGIN_DECLS
 
 enum menu_action
 {
@@ -141,8 +141,6 @@ int16_t menu_input_mouse_state(enum menu_input_mouse_state state);
 
 bool menu_input_ctl(enum menu_input_ctl_state state, void *data);
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
diff --git a/menu/menu_navigation.h b/menu/menu_navigation.h
index 238119d2d2..f81ced5e38 100644
--- a/menu/menu_navigation.h
+++ b/menu/menu_navigation.h
@@ -20,10 +20,9 @@
 #include <stddef.h>
 
 #include <boolean.h>
+#include <retro_common_api.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+RETRO_BEGIN_DECLS
 
 enum menu_navigation_ctl_state
 {
@@ -46,8 +45,6 @@ enum menu_navigation_ctl_state
 
 bool menu_navigation_ctl(enum menu_navigation_ctl_state state, void *data);
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
diff --git a/menu/menu_setting.h b/menu/menu_setting.h
index 0526721497..bc91dfb00b 100644
--- a/menu/menu_setting.h
+++ b/menu/menu_setting.h
@@ -19,14 +19,14 @@
 
 #include <stdint.h>
 #include <stdlib.h>
+
 #include <boolean.h>
+#include <retro_common_api.h>
 
 #include "../command.h"
 #include "../input/input_driver.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+RETRO_BEGIN_DECLS
 
 enum setting_type
 {
@@ -384,8 +384,6 @@ void settings_data_list_current_add_free_flags(
 
 bool menu_setting_ctl(enum menu_setting_ctl_state state, void *data);
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
diff --git a/menu/menu_shader.h b/menu/menu_shader.h
index 49b4702062..f571296c3d 100644
--- a/menu/menu_shader.h
+++ b/menu/menu_shader.h
@@ -17,11 +17,11 @@
 #ifndef _MENU_SHADER_MANAGER_H
 #define _MENU_SHADER_MANAGER_H
 
+#include <retro_common_api.h>
+
 #include "../gfx/video_shader_driver.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+RETRO_BEGIN_DECLS
 
 /**
  * menu_shader_manager_init:
@@ -70,8 +70,6 @@ unsigned menu_shader_manager_get_type(
  **/
 void menu_shader_manager_apply_changes(void);
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif