diff --git a/audio/drivers/rsound.h b/audio/drivers/rsound.h
index c35513c654..645eaa8316 100644
--- a/audio/drivers/rsound.h
+++ b/audio/drivers/rsound.h
@@ -16,14 +16,6 @@
 #ifndef __RSOUND_H
 #define __RSOUND_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if 0
-#define STANDALONE
-#endif
-
 #include <sys/types.h>
 #include <unistd.h>
 #include <rthreads/rthreads.h>
@@ -32,8 +24,11 @@ extern "C" {
 #include <stdint.h>
 #include <stddef.h>
 
+#include <retro_common_api.h>
 #include <queues/fifo_queue.h>
 
+RETRO_BEGIN_DECLS
+
 #ifdef _WIN32
 #define RSD_DEFAULT_HOST "127.0.0.1" /* Stupid Windows. */
 #else
@@ -323,8 +318,6 @@ int rsd_pause (rsound_t *rd, int enable);
 /* Frees an rsound_t struct. Make sure that the stream is properly closed down with rsd_stop() before calling rsd_free(). */
 int rsd_free (rsound_t *rd);
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
diff --git a/input/drivers_keyboard/keyboard_event_apple.h b/input/drivers_keyboard/keyboard_event_apple.h
index 063fd3566f..d0d3b35219 100644
--- a/input/drivers_keyboard/keyboard_event_apple.h
+++ b/input/drivers_keyboard/keyboard_event_apple.h
@@ -33,6 +33,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef KEYCODE_KEYCODE_H
 #define KEYCODE_KEYCODE_H
 
+#include <stdint.h>
+
+#include <retro_common_api.h>
+#include "../input_config.h"
+
 #ifndef MAX_KEYS
 #define MAX_KEYS     256
 #endif
@@ -160,13 +165,7 @@ enum
    KEY_RightGUI = 231
 };
 
-#include <stdint.h>
-
-#include "../input_config.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+RETRO_BEGIN_DECLS
 
 void apple_input_keyboard_event(bool down,
       unsigned code, uint32_t character, uint32_t mod, unsigned device);
@@ -180,9 +179,6 @@ int32_t apple_keyboard_find_any_key(void);
 
 void apple_keyboard_free(void);
 
-#ifdef __cplusplus
-}
-#endif
-
+RETRO_END_DECLS
 
 #endif