diff --git a/libretro-common/include/net/net_ifinfo.h b/libretro-common/include/net/net_ifinfo.h
index 00158f6833..9412d30eaf 100644
--- a/libretro-common/include/net/net_ifinfo.h
+++ b/libretro-common/include/net/net_ifinfo.h
@@ -28,6 +28,11 @@
 
 #include <boolean.h>
 
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
+
 struct net_ifinfo_entry
 {
    char *name;
@@ -46,4 +51,7 @@ void net_ifinfo_free(net_ifinfo_t *list);
 
 bool net_ifinfo_new(net_ifinfo_t *list);
 
+RETRO_END_DECLS
+
+
 #endif
diff --git a/libretro-common/include/net/net_natt.h b/libretro-common/include/net/net_natt.h
index 4a48ba0795..9c8b3d7d7d 100644
--- a/libretro-common/include/net/net_natt.h
+++ b/libretro-common/include/net/net_natt.h
@@ -26,6 +26,10 @@
 #include <net/net_compat.h>
 #include <net/net_socket.h>
 
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
 struct natt_status {
    /** nfds for select when checking for input */
    int nfds;
@@ -74,4 +78,6 @@ bool natt_open_port_any(struct natt_status *status, uint16_t port,
 /** Check for port forwarding responses */
 bool natt_read(struct natt_status *status);
 
+RETRO_END_DECLS
+
 #endif
diff --git a/libretro-common/include/rhash.h b/libretro-common/include/rhash.h
index 7cca800c94..d7394885bd 100644
--- a/libretro-common/include/rhash.h
+++ b/libretro-common/include/rhash.h
@@ -56,6 +56,10 @@
 
 #include <retro_inline.h>
 
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
 /**
  * sha256_hash:
  * @out               : Output.
@@ -123,4 +127,6 @@ void MD5_Init(MD5_CTX *ctx);
 void MD5_Update(MD5_CTX *ctx, const void *data, unsigned long size);
 void MD5_Final(unsigned char *result, MD5_CTX *ctx);
 
+RETRO_END_DECLS
+
 #endif
diff --git a/libretro-common/include/streams/interface_stream.h b/libretro-common/include/streams/interface_stream.h
index 57fa4a495a..a389f2602a 100644
--- a/libretro-common/include/streams/interface_stream.h
+++ b/libretro-common/include/streams/interface_stream.h
@@ -30,6 +30,8 @@
 #include <retro_common_api.h>
 #include <boolean.h>
 
+RETRO_BEGIN_DECLS
+
 enum intfstream_type
 {
    INTFSTREAM_FILE = 0,
@@ -84,4 +86,6 @@ void intfstream_putc(intfstream_internal_t *intf, int c);
 
 int intfstream_close(intfstream_internal_t *intf);
 
+RETRO_END_DECLS
+
 #endif
diff --git a/libretro-common/include/streams/memory_stream.h b/libretro-common/include/streams/memory_stream.h
index 9a2aa819fd..dca8e7a6ed 100644
--- a/libretro-common/include/streams/memory_stream.h
+++ b/libretro-common/include/streams/memory_stream.h
@@ -26,6 +26,10 @@
 #include <stdint.h>
 #include <stddef.h>
 
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
 typedef struct memstream memstream_t;
 
 memstream_t *memstream_open(unsigned writing);
@@ -52,4 +56,6 @@ void memstream_set_buffer(uint8_t *buffer, size_t size);
 
 size_t memstream_get_last_size(void);
 
+RETRO_END_DECLS
+
 #endif
diff --git a/libretro-common/include/streams/trans_stream.h b/libretro-common/include/streams/trans_stream.h
index 45cd522bd6..4023103e8a 100644
--- a/libretro-common/include/streams/trans_stream.h
+++ b/libretro-common/include/streams/trans_stream.h
@@ -35,6 +35,11 @@
 
 #include <retro_miscellaneous.h>
 
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
+
 enum trans_stream_error
 {
     TRANS_STREAM_ERROR_NONE = 0,
@@ -97,5 +102,7 @@ extern const struct trans_stream_backend zlib_deflate_backend;
 extern const struct trans_stream_backend zlib_inflate_backend;
 extern const struct trans_stream_backend pipe_backend;
 
+RETRO_END_DECLS
+
 #endif
 
diff --git a/libretro-common/include/utils/md5.h b/libretro-common/include/utils/md5.h
index 2da44bf355..6e84851c5d 100644
--- a/libretro-common/include/utils/md5.h
+++ b/libretro-common/include/utils/md5.h
@@ -28,6 +28,11 @@
 #elif !defined(_MD5_H)
 #define _MD5_H
 
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
+
 /* Any 32-bit or wider unsigned integer data type will do */
 typedef unsigned int MD5_u32plus;
 
@@ -42,4 +47,6 @@ extern void MD5_Init(MD5_CTX *ctx);
 extern void MD5_Update(MD5_CTX *ctx, const void *data, unsigned long size);
 extern void MD5_Final(unsigned char *result, MD5_CTX *ctx);
 
+RETRO_END_DECLS
+
 #endif