diff --git a/include/freerdp/cache/bitmap.h b/include/freerdp/cache/bitmap.h
index 4cdbc3319..6a68b8068 100644
--- a/include/freerdp/cache/bitmap.h
+++ b/include/freerdp/cache/bitmap.h
@@ -59,6 +59,10 @@ struct rdp_bitmap_cache
 	rdpSettings* settings;
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 FREERDP_API rdpBitmap* bitmap_cache_get(rdpBitmapCache* bitmap_cache, UINT32 id, UINT32 index);
 FREERDP_API void bitmap_cache_put(rdpBitmapCache* bitmap_cache, UINT32 id, UINT32 index, rdpBitmap* bitmap);
 
@@ -67,4 +71,8 @@ FREERDP_API void bitmap_cache_register_callbacks(rdpUpdate* update);
 FREERDP_API rdpBitmapCache* bitmap_cache_new(rdpSettings* settings);
 FREERDP_API void bitmap_cache_free(rdpBitmapCache* bitmap_cache);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_BITMAP_V2_CACHE_H */
diff --git a/include/freerdp/cache/brush.h b/include/freerdp/cache/brush.h
index 68ab5b888..93d1fd679 100644
--- a/include/freerdp/cache/brush.h
+++ b/include/freerdp/cache/brush.h
@@ -56,6 +56,10 @@ struct rdp_brush_cache
 	rdpSettings* settings;
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 FREERDP_API void* brush_cache_get(rdpBrushCache* brush, UINT32 index, UINT32* bpp);
 FREERDP_API void brush_cache_put(rdpBrushCache* brush, UINT32 index, void* entry, UINT32 bpp);
 
@@ -64,4 +68,8 @@ FREERDP_API void brush_cache_register_callbacks(rdpUpdate* update);
 FREERDP_API rdpBrushCache* brush_cache_new(rdpSettings* settings);
 FREERDP_API void brush_cache_free(rdpBrushCache* brush);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_BRUSH_CACHE_H */
diff --git a/include/freerdp/cache/cache.h b/include/freerdp/cache/cache.h
index ead8cd7a9..7b0dbe4a8 100644
--- a/include/freerdp/cache/cache.h
+++ b/include/freerdp/cache/cache.h
@@ -48,7 +48,15 @@ struct rdp_cache
 	rdpSettings* settings;
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 FREERDP_API rdpCache* cache_new(rdpSettings* settings);
 FREERDP_API void cache_free(rdpCache* cache);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_CACHE_H */
diff --git a/include/freerdp/cache/glyph.h b/include/freerdp/cache/glyph.h
index a295695e2..4e193987a 100644
--- a/include/freerdp/cache/glyph.h
+++ b/include/freerdp/cache/glyph.h
@@ -59,6 +59,10 @@ struct rdp_glyph_cache
 	rdpSettings* settings;
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 FREERDP_API rdpGlyph* glyph_cache_get(rdpGlyphCache* glyph_cache, UINT32 id, UINT32 index);
 FREERDP_API void glyph_cache_put(rdpGlyphCache* glyph_cache, UINT32 id, UINT32 index, rdpGlyph* entry);
 
@@ -70,4 +74,8 @@ FREERDP_API void glyph_cache_register_callbacks(rdpUpdate* update);
 FREERDP_API rdpGlyphCache* glyph_cache_new(rdpSettings* settings);
 FREERDP_API void glyph_cache_free(rdpGlyphCache* glyph);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_GLYPH_CACHE_H */
diff --git a/include/freerdp/cache/nine_grid.h b/include/freerdp/cache/nine_grid.h
index 0b0c18d01..77e0f4636 100644
--- a/include/freerdp/cache/nine_grid.h
+++ b/include/freerdp/cache/nine_grid.h
@@ -52,6 +52,10 @@ struct rdp_nine_grid_cache
 	rdpSettings* settings;
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 FREERDP_API void* nine_grid_cache_get(rdpNineGridCache* nine_grid, UINT32 index);
 FREERDP_API void nine_grid_cache_put(rdpNineGridCache* nine_grid, UINT32 index, void* entry);
 
@@ -60,4 +64,8 @@ FREERDP_API void nine_grid_cache_register_callbacks(rdpUpdate* update);
 FREERDP_API rdpNineGridCache* nine_grid_cache_new(rdpSettings* settings);
 FREERDP_API void nine_grid_cache_free(rdpNineGridCache* nine_grid);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_NINE_GRID_CACHE_H */
diff --git a/include/freerdp/cache/offscreen.h b/include/freerdp/cache/offscreen.h
index c69042646..4da367b75 100644
--- a/include/freerdp/cache/offscreen.h
+++ b/include/freerdp/cache/offscreen.h
@@ -43,6 +43,10 @@ struct rdp_offscreen_cache
 	rdpSettings* settings;
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 FREERDP_API rdpBitmap* offscreen_cache_get(rdpOffscreenCache* offscreen_cache, UINT32 index);
 FREERDP_API void offscreen_cache_put(rdpOffscreenCache* offscreen_cache, UINT32 index, rdpBitmap* bitmap);
 FREERDP_API void offscreen_cache_delete(rdpOffscreenCache* offscreen, UINT32 index);
@@ -52,4 +56,8 @@ FREERDP_API void offscreen_cache_register_callbacks(rdpUpdate* update);
 FREERDP_API rdpOffscreenCache* offscreen_cache_new(rdpSettings* settings);
 FREERDP_API void offscreen_cache_free(rdpOffscreenCache* offscreen);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_OFFSCREEN_CACHE_H */
diff --git a/include/freerdp/cache/palette.h b/include/freerdp/cache/palette.h
index 88f10eaf8..6e7d890ec 100644
--- a/include/freerdp/cache/palette.h
+++ b/include/freerdp/cache/palette.h
@@ -46,6 +46,10 @@ struct rdp_palette_cache
 	rdpSettings* settings;
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 FREERDP_API void* palette_cache_get(rdpPaletteCache* palette, UINT32 index);
 FREERDP_API void palette_cache_put(rdpPaletteCache* palette, UINT32 index, void* entry);
 
@@ -54,4 +58,8 @@ FREERDP_API void palette_cache_register_callbacks(rdpUpdate* update);
 FREERDP_API rdpPaletteCache* palette_cache_new(rdpSettings* settings);
 FREERDP_API void palette_cache_free(rdpPaletteCache* palette_cache);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_PALETTE_CACHE_H */
diff --git a/include/freerdp/cache/pointer.h b/include/freerdp/cache/pointer.h
index f3a09fcb7..ccfeae03b 100644
--- a/include/freerdp/cache/pointer.h
+++ b/include/freerdp/cache/pointer.h
@@ -42,6 +42,10 @@ struct rdp_pointer_cache
 	rdpSettings* settings;
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 FREERDP_API rdpPointer* pointer_cache_get(rdpPointerCache* pointer_cache, UINT32 index);
 FREERDP_API void pointer_cache_put(rdpPointerCache* pointer_cache, UINT32 index, rdpPointer* pointer);
 
@@ -50,4 +54,8 @@ FREERDP_API void pointer_cache_register_callbacks(rdpUpdate* update);
 FREERDP_API rdpPointerCache* pointer_cache_new(rdpSettings* settings);
 FREERDP_API void pointer_cache_free(rdpPointerCache* pointer_cache);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_POINTER_CACHE_H */