diff --git a/libretro-common/include/encodings/crc32.h b/libretro-common/include/encodings/crc32.h
index 1d670e7b80..d1973e40a6 100644
--- a/libretro-common/include/encodings/crc32.h
+++ b/libretro-common/include/encodings/crc32.h
@@ -26,6 +26,13 @@
 #include <stdint.h>
 #include <stddef.h>
 
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
+
 uint32_t encoding_crc32(uint32_t crc, const uint8_t *buf, size_t len);
 
+RETRO_END_DECLS
+
 #endif
diff --git a/libretro-common/include/encodings/utf.h b/libretro-common/include/encodings/utf.h
index 0c65039429..cb96a53066 100644
--- a/libretro-common/include/encodings/utf.h
+++ b/libretro-common/include/encodings/utf.h
@@ -28,6 +28,10 @@
 
 #include <boolean.h>
 
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
 size_t utf8_conv_utf32(uint32_t *out, size_t out_chars,
       const char *in, size_t in_size);
 
@@ -44,4 +48,6 @@ uint32_t utf8_walk(const char **string);
 
 bool utf16_to_char_string(const uint16_t *in, char *s, size_t len);
 
+RETRO_END_DECLS
+
 #endif
diff --git a/libretro-common/include/file/archive_file.h b/libretro-common/include/file/archive_file.h
index e15448e6cd..8abe22116d 100644
--- a/libretro-common/include/file/archive_file.h
+++ b/libretro-common/include/file/archive_file.h
@@ -35,6 +35,10 @@
 
 #include <retro_miscellaneous.h>
 
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
 enum file_archive_transfer_type
 {
    ARCHIVE_TRANSFER_NONE = 0,
@@ -203,5 +207,7 @@ uint32_t file_archive_get_file_crc32(const char *path);
 extern const struct file_archive_file_backend zlib_backend;
 extern const struct file_archive_file_backend sevenzip_backend;
 
+RETRO_END_DECLS
+
 #endif
 
diff --git a/libretro-common/include/file/config_file_userdata.h b/libretro-common/include/file/config_file_userdata.h
index cb1208da3d..0c433ed361 100644
--- a/libretro-common/include/file/config_file_userdata.h
+++ b/libretro-common/include/file/config_file_userdata.h
@@ -27,6 +27,10 @@
 
 #include <file/config_file.h>
 
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
 struct config_file_userdata
 {
    config_file_t *conf;
@@ -52,4 +56,6 @@ int config_userdata_get_string(void *userdata, const char *key_str,
 
 void config_userdata_free(void *ptr);
 
+RETRO_END_DECLS
+
 #endif
diff --git a/libretro-common/include/file/nbio.h b/libretro-common/include/file/nbio.h
index 59039190a6..011eef55e6 100644
--- a/libretro-common/include/file/nbio.h
+++ b/libretro-common/include/file/nbio.h
@@ -26,6 +26,10 @@
 #include <stddef.h>
 #include <boolean.h>
 
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
 #ifndef NBIO_READ
 #define NBIO_READ   0
 #endif
@@ -93,4 +97,6 @@ void nbio_cancel(struct nbio_t* handle);
  */
 void nbio_free(struct nbio_t* handle);
 
+RETRO_END_DECLS
+
 #endif
diff --git a/libretro-common/include/formats/jsonsax.h b/libretro-common/include/formats/jsonsax.h
index 4170b24ab5..d8b18e6b8d 100644
--- a/libretro-common/include/formats/jsonsax.h
+++ b/libretro-common/include/formats/jsonsax.h
@@ -25,6 +25,11 @@
 
 #include <stddef.h>
 
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
+
 enum
 {
   JSONSAX_OK = 0,
@@ -61,4 +66,6 @@ jsonsax_handlers_t;
 
 int jsonsax_parse( const char* json, const jsonsax_handlers_t* handlers, void* userdata );
 
+RETRO_END_DECLS
+
 #endif /* __LIBRETRO_SDK_FORMAT_JSONSAX_H__ */
diff --git a/libretro-common/include/gfx/gl_capabilities.h b/libretro-common/include/gfx/gl_capabilities.h
index ded3b64522..4e7c97a0a7 100644
--- a/libretro-common/include/gfx/gl_capabilities.h
+++ b/libretro-common/include/gfx/gl_capabilities.h
@@ -26,6 +26,8 @@
 #include <boolean.h>
 #include <retro_common_api.h>
 
+RETRO_BEGIN_DECLS
+
 enum gl_capability_enum
 {
    GL_CAPS_NONE = 0,
@@ -61,4 +63,6 @@ bool gl_check_capability(enum gl_capability_enum enum_idx);
 
 bool gl_query_extension(const char *ext);
 
+RETRO_END_DECLS
+
 #endif
diff --git a/libretro-common/include/gfx/math/matrix_3x3.h b/libretro-common/include/gfx/math/matrix_3x3.h
index 597dd2c6c2..c6eb3806cc 100644
--- a/libretro-common/include/gfx/math/matrix_3x3.h
+++ b/libretro-common/include/gfx/math/matrix_3x3.h
@@ -25,6 +25,10 @@
 
 #include <boolean.h>
 
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
 typedef struct math_matrix_3x3
 {
    float data[9];
@@ -64,4 +68,6 @@ bool matrix_3x3_quad_to_quad(const float dx0, const float dy0,
                              const float sx3, const float sy3,
                              math_matrix_3x3 *mat);
 
+RETRO_END_DECLS
+
 #endif
diff --git a/libretro-common/include/gfx/math/vector_2.h b/libretro-common/include/gfx/math/vector_2.h
index e5af8d68d8..3b208d3af1 100644
--- a/libretro-common/include/gfx/math/vector_2.h
+++ b/libretro-common/include/gfx/math/vector_2.h
@@ -25,6 +25,10 @@
 
 #include <stdint.h>
 
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
 typedef float vec2_t[2];
 
 float vec2_dot(const float *a, const float *b);
@@ -37,5 +41,7 @@ void vec2_subtract(float *dst, const float *src);
 
 void vec2_copy(float *dst, const float *src);
 
+RETRO_END_DECLS
+
 #endif
 
diff --git a/libretro-common/include/gfx/math/vector_4.h b/libretro-common/include/gfx/math/vector_4.h
index 3eae577168..d7c9223556 100644
--- a/libretro-common/include/gfx/math/vector_4.h
+++ b/libretro-common/include/gfx/math/vector_4.h
@@ -25,6 +25,10 @@
 
 #include <stdint.h>
 
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
 typedef float vec4_t[4];
 
 void vec4_add(float *dst, const float *src);
@@ -35,5 +39,7 @@ void vec4_scale(float *dst, const float scale);
 
 void vec4_copy(float *dst, const float *src);
 
+RETRO_END_DECLS
+
 #endif
 
diff --git a/libretro-common/include/gfx/scaler/pixconv.h b/libretro-common/include/gfx/scaler/pixconv.h
index f9f74d9324..6dfab47a9a 100644
--- a/libretro-common/include/gfx/scaler/pixconv.h
+++ b/libretro-common/include/gfx/scaler/pixconv.h
@@ -25,6 +25,11 @@
 
 #include <clamping.h>
 
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
+
 void conv_0rgb1555_argb8888(void *output, const void *input,
       int width, int height,
       int out_stride, int in_stride);
@@ -89,5 +94,7 @@ void conv_copy(void *output, const void *input,
       int width, int height,
       int out_stride, int in_stride);
 
+RETRO_END_DECLS
+
 #endif
 
diff --git a/libretro-common/include/gfx/scaler/scaler_int.h b/libretro-common/include/gfx/scaler/scaler_int.h
index a5ed7dd084..87ef68eda2 100644
--- a/libretro-common/include/gfx/scaler/scaler_int.h
+++ b/libretro-common/include/gfx/scaler/scaler_int.h
@@ -25,6 +25,10 @@
 
 #include <gfx/scaler/scaler.h>
 
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
 void scaler_argb8888_vert(const struct scaler_ctx *ctx,
       void *output, int stride);
 
@@ -37,5 +41,7 @@ void scaler_argb8888_point_special(const struct scaler_ctx *ctx,
       int in_width, int in_height,
       int out_stride, int in_stride);
 
+RETRO_END_DECLS
+
 #endif