From e6fa0911a3d09f06e7039260b7687b5087fcd2cb Mon Sep 17 00:00:00 2001
From: Armin Novak <armin.novak@thincast.com>
Date: Mon, 1 Dec 2014 13:12:51 +0100
Subject: [PATCH] Fixed missing extern C

---
 include/freerdp/codec/audio.h        | 8 ++++++++
 include/freerdp/codec/interleaved.h  | 8 ++++++++
 include/freerdp/codec/jpeg.h         | 8 ++++++++
 include/freerdp/codec/planar.h       | 8 ++++++++
 include/freerdp/codecs.h             | 8 ++++++++
 include/freerdp/crypto/ber.h         | 8 ++++++++
 include/freerdp/crypto/certificate.h | 8 ++++++++
 include/freerdp/crypto/crypto.h      | 8 ++++++++
 include/freerdp/crypto/der.h         | 8 ++++++++
 include/freerdp/crypto/er.h          | 8 ++++++++
 include/freerdp/crypto/per.h         | 8 ++++++++
 include/freerdp/crypto/tls.h         | 8 ++++++++
 include/freerdp/gdi/16bpp.h          | 8 ++++++++
 include/freerdp/gdi/32bpp.h          | 8 ++++++++
 include/freerdp/gdi/8bpp.h           | 8 ++++++++
 include/freerdp/gdi/bitmap.h         | 8 ++++++++
 include/freerdp/gdi/brush.h          | 8 ++++++++
 include/freerdp/gdi/clipping.h       | 8 ++++++++
 include/freerdp/gdi/dc.h             | 8 ++++++++
 include/freerdp/gdi/drawing.h        | 8 ++++++++
 include/freerdp/gdi/line.h           | 8 ++++++++
 include/freerdp/gdi/palette.h        | 8 ++++++++
 include/freerdp/gdi/pen.h            | 8 ++++++++
 include/freerdp/gdi/region.h         | 8 ++++++++
 include/freerdp/gdi/shape.h          | 8 ++++++++
 include/freerdp/locale/locale.h      | 8 ++++++++
 include/freerdp/locale/timezone.h    | 8 ++++++++
 include/freerdp/metrics.h            | 8 ++++++++
 include/freerdp/server/cliprdr.h     | 8 ++++++++
 include/freerdp/server/drdynvc.h     | 8 ++++++++
 include/freerdp/server/encomsp.h     | 8 ++++++++
 include/freerdp/server/rdpdr.h       | 8 ++++++++
 include/freerdp/server/remdesk.h     | 8 ++++++++
 33 files changed, 264 insertions(+)

diff --git a/include/freerdp/codec/audio.h b/include/freerdp/codec/audio.h
index 384ce1f7c..d797f84f3 100644
--- a/include/freerdp/codec/audio.h
+++ b/include/freerdp/codec/audio.h
@@ -186,6 +186,10 @@ typedef struct AUDIO_FORMAT AUDIO_FORMAT;
  * Audio Format Functions
  */
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API UINT32 rdpsnd_compute_audio_time_length(AUDIO_FORMAT* format, int size);
 
 FREERDP_API char* rdpsnd_get_audio_tag_string(UINT16 wFormatTag);
@@ -195,4 +199,8 @@ FREERDP_API void rdpsnd_print_audio_formats(AUDIO_FORMAT* formats, UINT16 count)
 
 FREERDP_API void rdpsnd_free_audio_formats(AUDIO_FORMAT* formats, UINT16 count);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_CODEC_AUDIO_H */
diff --git a/include/freerdp/codec/interleaved.h b/include/freerdp/codec/interleaved.h
index d96cfbde9..205bc4456 100644
--- a/include/freerdp/codec/interleaved.h
+++ b/include/freerdp/codec/interleaved.h
@@ -38,6 +38,10 @@ struct _BITMAP_INTERLEAVED_CONTEXT
 	wStream* bts;
 };
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API int interleaved_decompress(BITMAP_INTERLEAVED_CONTEXT* interleaved, BYTE* pSrcData, UINT32 SrcSize, int bpp,
 		BYTE** ppDstData, DWORD DstFormat, int nDstStep, int nXDst, int nYDst, int nWidth, int nHeight, BYTE* palette);
 
@@ -49,5 +53,9 @@ FREERDP_API int bitmap_interleaved_context_reset(BITMAP_INTERLEAVED_CONTEXT* int
 FREERDP_API BITMAP_INTERLEAVED_CONTEXT* bitmap_interleaved_context_new(BOOL Compressor);
 FREERDP_API void bitmap_interleaved_context_free(BITMAP_INTERLEAVED_CONTEXT* interleaved);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_CODEC_INTERLEAVED_H */
 
diff --git a/include/freerdp/codec/jpeg.h b/include/freerdp/codec/jpeg.h
index 637cdc62d..197f0b410 100644
--- a/include/freerdp/codec/jpeg.h
+++ b/include/freerdp/codec/jpeg.h
@@ -23,6 +23,14 @@
 #include <freerdp/api.h>
 #include <freerdp/types.h>
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API BOOL jpeg_decompress(BYTE* input, BYTE* output, int width, int height, int size, int bpp);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_CODEC_JPEG_H */
diff --git a/include/freerdp/codec/planar.h b/include/freerdp/codec/planar.h
index 4f2861a07..64b741d1b 100644
--- a/include/freerdp/codec/planar.h
+++ b/include/freerdp/codec/planar.h
@@ -97,6 +97,10 @@ struct _BITMAP_PLANAR_CONTEXT
 	BYTE* TempBuffer;
 };
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API int freerdp_split_color_planes(BYTE* data, UINT32 format, int width, int height, int scanline, BYTE* planes[4]);
 FREERDP_API BYTE* freerdp_bitmap_planar_compress_plane_rle(BYTE* plane, int width, int height, BYTE* outPlane, int* dstSize);
 FREERDP_API BYTE* freerdp_bitmap_planar_delta_encode_plane(BYTE* inPlane, int width, int height, BYTE* outPlane);
@@ -113,5 +117,9 @@ FREERDP_API void freerdp_bitmap_planar_context_free(BITMAP_PLANAR_CONTEXT* conte
 FREERDP_API int planar_decompress(BITMAP_PLANAR_CONTEXT* planar, BYTE* pSrcData, UINT32 SrcSize,
 		BYTE** ppDstData, DWORD DstFormat, int nDstStep, int nXDst, int nYDst, int nWidth, int nHeight, BOOL vFlip);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_CODEC_PLANAR_H */
 
diff --git a/include/freerdp/codecs.h b/include/freerdp/codecs.h
index 2f1e4d4ab..0e8b2f41d 100644
--- a/include/freerdp/codecs.h
+++ b/include/freerdp/codecs.h
@@ -55,11 +55,19 @@ struct rdp_codecs
 	BITMAP_INTERLEAVED_CONTEXT* interleaved;
 };
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API int freerdp_client_codecs_prepare(rdpCodecs* codecs, UINT32 flags);
 FREERDP_API int freerdp_client_codecs_reset(rdpCodecs* codecs, UINT32 flags);
 
 FREERDP_API rdpCodecs* codecs_new(rdpContext* context);
 FREERDP_API void codecs_free(rdpCodecs* codecs);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_CODECS_H */
 
diff --git a/include/freerdp/crypto/ber.h b/include/freerdp/crypto/ber.h
index 59e1cceea..546b19c39 100644
--- a/include/freerdp/crypto/ber.h
+++ b/include/freerdp/crypto/ber.h
@@ -52,6 +52,10 @@
 
 #define BER_PC(_pc)	(_pc ? BER_CONSTRUCT : BER_PRIMITIVE)
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API BOOL ber_read_length(wStream* s, int* length);
 FREERDP_API int ber_write_length(wStream* s, int length);
 FREERDP_API int _ber_sizeof_length(int length);
@@ -81,4 +85,8 @@ FREERDP_API int ber_write_integer(wStream* s, UINT32 value);
 FREERDP_API BOOL ber_read_integer_length(wStream* s, int* length);
 FREERDP_API int ber_sizeof_integer(UINT32 value);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_CRYPTO_BER_H */
diff --git a/include/freerdp/crypto/certificate.h b/include/freerdp/crypto/certificate.h
index d634c90f4..537829615 100644
--- a/include/freerdp/crypto/certificate.h
+++ b/include/freerdp/crypto/certificate.h
@@ -47,6 +47,10 @@ struct rdp_certificate_store
 	rdpCertificateData* certificate_data;
 };
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API rdpCertificateData* certificate_data_new(char* hostname, char* fingerprint);
 FREERDP_API void certificate_data_free(rdpCertificateData* certificate_data);
 FREERDP_API rdpCertificateStore* certificate_store_new(rdpSettings* settings);
@@ -55,4 +59,8 @@ FREERDP_API void certificate_store_free(rdpCertificateStore* certificate_store);
 FREERDP_API int certificate_data_match(rdpCertificateStore* certificate_store, rdpCertificateData* certificate_data);
 FREERDP_API void certificate_data_print(rdpCertificateStore* certificate_store, rdpCertificateData* certificate_data);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_CRYPTO_CERTIFICATE_H */
diff --git a/include/freerdp/crypto/crypto.h b/include/freerdp/crypto/crypto.h
index e642debff..f69963032 100644
--- a/include/freerdp/crypto/crypto.h
+++ b/include/freerdp/crypto/crypto.h
@@ -74,6 +74,10 @@ struct crypto_cert_struct
 	X509 * px509;
 };
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 #define	CRYPTO_SHA1_DIGEST_LENGTH	SHA_DIGEST_LENGTH
 typedef struct crypto_sha1_struct* CryptoSha1;
 
@@ -146,4 +150,8 @@ FREERDP_API void crypto_nonce(BYTE* nonce, int size);
 FREERDP_API char* crypto_base64_encode(const BYTE* data, int length);
 FREERDP_API void crypto_base64_decode(const char* enc_data, int length, BYTE** dec_data, int* res_length);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_CRYPTO_H */
diff --git a/include/freerdp/crypto/der.h b/include/freerdp/crypto/der.h
index 20ace5f1b..3e75a4d39 100644
--- a/include/freerdp/crypto/der.h
+++ b/include/freerdp/crypto/der.h
@@ -22,6 +22,10 @@
 
 #include <freerdp/crypto/er.h>
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API int _der_skip_length(int length);
 FREERDP_API int der_write_length(wStream* s, int length);
 FREERDP_API int der_get_content_length(int length);
@@ -32,4 +36,8 @@ FREERDP_API int der_skip_contextual_tag(int length);
 FREERDP_API int der_write_contextual_tag(wStream* s, BYTE tag, int length, BOOL pc);
 FREERDP_API void der_write_octet_string(wStream* s, BYTE* oct_str, int length);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_CRYPTO_DER_H */
diff --git a/include/freerdp/crypto/er.h b/include/freerdp/crypto/er.h
index 91110e184..5fab63de3 100644
--- a/include/freerdp/crypto/er.h
+++ b/include/freerdp/crypto/er.h
@@ -56,6 +56,10 @@
 
 #define ER_PC(_pc)	(_pc ? ER_CONSTRUCT : ER_PRIMITIVE)
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API void er_read_length(wStream* s, int* length);
 FREERDP_API int er_write_length(wStream* s, int length, BOOL flag);
 FREERDP_API int _er_skip_length(int length);
@@ -87,4 +91,8 @@ FREERDP_API int er_write_integer(wStream* s, INT32 value);
 FREERDP_API BOOL er_read_integer_length(wStream* s, int* length);
 FREERDP_API int er_skip_integer(INT32 value);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_CRYPTO_ER_H */
diff --git a/include/freerdp/crypto/per.h b/include/freerdp/crypto/per.h
index 60487a81a..e53cabb4f 100644
--- a/include/freerdp/crypto/per.h
+++ b/include/freerdp/crypto/per.h
@@ -24,6 +24,10 @@
 
 #include <winpr/stream.h>
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API BOOL per_read_length(wStream* s, UINT16* length);
 FREERDP_API void per_write_length(wStream* s, int length);
 FREERDP_API BOOL per_read_choice(wStream* s, BYTE* choice);
@@ -47,4 +51,8 @@ FREERDP_API void per_write_octet_string(wStream* s, BYTE* oct_str, int length, i
 FREERDP_API BOOL per_read_numeric_string(wStream* s, int min);
 FREERDP_API void per_write_numeric_string(wStream* s, BYTE* num_str, int length, int min);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_CRYPTO_PER_H */
diff --git a/include/freerdp/crypto/tls.h b/include/freerdp/crypto/tls.h
index fcc06d2e5..0d03279d7 100644
--- a/include/freerdp/crypto/tls.h
+++ b/include/freerdp/crypto/tls.h
@@ -83,6 +83,10 @@ struct rdp_tls
 	BOOL isGatewayTransport;
 };
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API int tls_connect(rdpTls* tls, BIO *underlying);
 FREERDP_API BOOL tls_accept(rdpTls* tls, BIO *underlying, const char* cert_file, const char* privatekey_file);
 FREERDP_API BOOL tls_disconnect(rdpTls* tls);
@@ -101,4 +105,8 @@ FREERDP_API BOOL tls_print_error(char* func, SSL* connection, int value);
 FREERDP_API rdpTls* tls_new(rdpSettings* settings);
 FREERDP_API void tls_free(rdpTls* tls);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_CRYPTO_TLS_H */
diff --git a/include/freerdp/gdi/16bpp.h b/include/freerdp/gdi/16bpp.h
index 25cb21cc0..afa10d2da 100644
--- a/include/freerdp/gdi/16bpp.h
+++ b/include/freerdp/gdi/16bpp.h
@@ -26,6 +26,10 @@
 
 typedef int (*pLineTo_16bpp)(HGDI_DC hdc, int nXEnd, int nYEnd);
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API UINT16 gdi_get_color_16bpp(HGDI_DC hdc, GDI_COLOR color);
 
 FREERDP_API int FillRect_16bpp(HGDI_DC hdc, HGDI_RECT rect, HGDI_BRUSH hbr);
@@ -33,4 +37,8 @@ FREERDP_API int BitBlt_16bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth
 FREERDP_API int PatBlt_16bpp(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight, int rop);
 FREERDP_API int LineTo_16bpp(HGDI_DC hdc, int nXEnd, int nYEnd);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_GDI_16BPP_H */
diff --git a/include/freerdp/gdi/32bpp.h b/include/freerdp/gdi/32bpp.h
index f33a42802..cb9139701 100644
--- a/include/freerdp/gdi/32bpp.h
+++ b/include/freerdp/gdi/32bpp.h
@@ -26,6 +26,10 @@
 
 typedef int (*pLineTo_32bpp)(HGDI_DC hdc, int nXEnd, int nYEnd);
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API UINT32 gdi_get_color_32bpp(HGDI_DC hdc, GDI_COLOR color);
 
 FREERDP_API int FillRect_32bpp(HGDI_DC hdc, HGDI_RECT rect, HGDI_BRUSH hbr);
@@ -33,4 +37,8 @@ FREERDP_API int BitBlt_32bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth
 FREERDP_API int PatBlt_32bpp(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight, int rop);
 FREERDP_API int LineTo_32bpp(HGDI_DC hdc, int nXEnd, int nYEnd);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_GDI_32BPP_H */
diff --git a/include/freerdp/gdi/8bpp.h b/include/freerdp/gdi/8bpp.h
index 31b64bb9a..b609eacd0 100644
--- a/include/freerdp/gdi/8bpp.h
+++ b/include/freerdp/gdi/8bpp.h
@@ -26,6 +26,10 @@
 
 typedef int (*pLineTo_8bpp)(HGDI_DC hdc, int nXEnd, int nYEnd);
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API BYTE gdi_get_color_8bpp(HGDI_DC hdc, GDI_COLOR color);
 
 FREERDP_API int FillRect_8bpp(HGDI_DC hdc, HGDI_RECT rect, HGDI_BRUSH hbr);
@@ -33,4 +37,8 @@ FREERDP_API int BitBlt_8bpp(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth,
 FREERDP_API int PatBlt_8bpp(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight, int rop);
 FREERDP_API int LineTo_8bpp(HGDI_DC hdc, int nXEnd, int nYEnd);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_GDI_8BPP_H */
diff --git a/include/freerdp/gdi/bitmap.h b/include/freerdp/gdi/bitmap.h
index 976bb0b9d..c34713c6c 100644
--- a/include/freerdp/gdi/bitmap.h
+++ b/include/freerdp/gdi/bitmap.h
@@ -23,6 +23,10 @@
 #include <freerdp/api.h>
 #include <freerdp/gdi/gdi.h>
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API GDI_COLOR gdi_GetPixel(HGDI_DC hdc, int nXPos, int nYPos);
 FREERDP_API GDI_COLOR gdi_SetPixel(HGDI_DC hdc, int X, int Y, GDI_COLOR crColor);
 FREERDP_API BYTE gdi_GetPixel_8bpp(HGDI_BITMAP hBmp, int X, int Y);
@@ -40,4 +44,8 @@ FREERDP_API int gdi_BitBlt(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth,
 
 typedef int (*p_BitBlt)(HGDI_DC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HGDI_DC hdcSrc, int nXSrc, int nYSrc, int rop);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_GDI_BITMAP_H */
diff --git a/include/freerdp/gdi/brush.h b/include/freerdp/gdi/brush.h
index 10b81cb40..5313664a8 100644
--- a/include/freerdp/gdi/brush.h
+++ b/include/freerdp/gdi/brush.h
@@ -23,11 +23,19 @@
 #include <freerdp/api.h>
 #include <freerdp/gdi/gdi.h>
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API HGDI_BRUSH gdi_CreateSolidBrush(GDI_COLOR crColor);
 FREERDP_API HGDI_BRUSH gdi_CreatePatternBrush(HGDI_BITMAP hbmp);
 FREERDP_API HGDI_BRUSH gdi_CreateHatchBrush(HGDI_BITMAP hbmp);
 FREERDP_API int gdi_PatBlt(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight, int rop);
 
+#ifdef __cplusplus
+ }
+#endif
+
 typedef int (*p_PatBlt)(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight, int rop);
 
 #endif /* FREERDP_GDI_BRUSH_H */
diff --git a/include/freerdp/gdi/clipping.h b/include/freerdp/gdi/clipping.h
index 0b2c4762e..75470f6e8 100644
--- a/include/freerdp/gdi/clipping.h
+++ b/include/freerdp/gdi/clipping.h
@@ -23,9 +23,17 @@
 #include <freerdp/api.h>
 #include <freerdp/gdi/gdi.h>
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API int gdi_SetClipRgn(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight);
 FREERDP_API HGDI_RGN gdi_GetClipRgn(HGDI_DC hdc);
 FREERDP_API int gdi_SetNullClipRgn(HGDI_DC hdc);
 FREERDP_API int gdi_ClipCoords(HGDI_DC hdc, int *x, int *y, int *w, int *h, int *srcx, int *srcy);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_GDI_CLIPPING_H */
diff --git a/include/freerdp/gdi/dc.h b/include/freerdp/gdi/dc.h
index ed6963e76..5c66903a6 100644
--- a/include/freerdp/gdi/dc.h
+++ b/include/freerdp/gdi/dc.h
@@ -23,6 +23,10 @@
 #include <freerdp/api.h>
 #include <freerdp/gdi/gdi.h>
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API HGDI_DC gdi_GetDC(void);
 FREERDP_API HGDI_DC gdi_CreateDC(UINT32 flags, int bpp);
 FREERDP_API HGDI_DC gdi_CreateCompatibleDC(HGDI_DC hdc);
@@ -30,4 +34,8 @@ FREERDP_API HGDIOBJECT gdi_SelectObject(HGDI_DC hdc, HGDIOBJECT hgdiobject);
 FREERDP_API int gdi_DeleteObject(HGDIOBJECT hgdiobject);
 FREERDP_API int gdi_DeleteDC(HGDI_DC hdc);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_GDI_DC_H */
diff --git a/include/freerdp/gdi/drawing.h b/include/freerdp/gdi/drawing.h
index d1b99b8ed..536ea3053 100644
--- a/include/freerdp/gdi/drawing.h
+++ b/include/freerdp/gdi/drawing.h
@@ -23,6 +23,10 @@
 #include <freerdp/api.h>
 #include <freerdp/gdi/gdi.h>
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API int gdi_GetROP2(HGDI_DC hdc);
 FREERDP_API int gdi_SetROP2(HGDI_DC hdc, int fnDrawMode);
 FREERDP_API GDI_COLOR gdi_GetBkColor(HGDI_DC hdc);
@@ -31,4 +35,8 @@ FREERDP_API int gdi_GetBkMode(HGDI_DC hdc);
 FREERDP_API int gdi_SetBkMode(HGDI_DC hdc, int iBkMode);
 FREERDP_API GDI_COLOR gdi_SetTextColor(HGDI_DC hdc, GDI_COLOR crColor);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_GDI_DRAWING_H */
diff --git a/include/freerdp/gdi/line.h b/include/freerdp/gdi/line.h
index bd30cc412..18014cfd5 100644
--- a/include/freerdp/gdi/line.h
+++ b/include/freerdp/gdi/line.h
@@ -23,12 +23,20 @@
 #include <freerdp/api.h>
 #include <freerdp/gdi/gdi.h>
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API int gdi_LineTo(HGDI_DC hdc, int nXEnd, int nYEnd);
 FREERDP_API int gdi_PolylineTo(HGDI_DC hdc, GDI_POINT *lppt, int cCount);
 FREERDP_API int gdi_Polyline(HGDI_DC hdc, GDI_POINT *lppt, int cPoints);
 FREERDP_API int gdi_PolyPolyline(HGDI_DC hdc, GDI_POINT *lppt, int *lpdwPolyPoints, int cCount);
 FREERDP_API int gdi_MoveToEx(HGDI_DC hdc, int X, int Y, HGDI_POINT lpPoint);
 
+#ifdef __cplusplus
+ }
+#endif
+
 typedef int (*p_LineTo)(HGDI_DC hdc, int nXEnd, int nYEnd);
 
 #endif /* FREERDP_GDI_LINE_H */
diff --git a/include/freerdp/gdi/palette.h b/include/freerdp/gdi/palette.h
index 8ed2ec1c1..bca284977 100644
--- a/include/freerdp/gdi/palette.h
+++ b/include/freerdp/gdi/palette.h
@@ -23,7 +23,15 @@
 #include <freerdp/api.h>
 #include <freerdp/gdi/gdi.h>
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API HGDI_PALETTE gdi_CreatePalette(HGDI_PALETTE palette);
 FREERDP_API HGDI_PALETTE gdi_GetSystemPalette(void);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_GDI_PALETTE_H */
diff --git a/include/freerdp/gdi/pen.h b/include/freerdp/gdi/pen.h
index cc4904439..c4b5a7e59 100644
--- a/include/freerdp/gdi/pen.h
+++ b/include/freerdp/gdi/pen.h
@@ -23,9 +23,17 @@
 #include <freerdp/api.h>
 #include <freerdp/gdi/gdi.h>
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API HGDI_PEN gdi_CreatePen(int fnPenStyle, int nWidth, int crColor);
 FREERDP_API BYTE gdi_GetPenColor_8bpp(HGDI_PEN pen);
 FREERDP_API UINT16 gdi_GetPenColor_16bpp(HGDI_PEN pen);
 FREERDP_API UINT32 gdi_GetPenColor_32bpp(HGDI_PEN pen);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_GDI_PEN_H */
diff --git a/include/freerdp/gdi/region.h b/include/freerdp/gdi/region.h
index 093545131..be3269150 100644
--- a/include/freerdp/gdi/region.h
+++ b/include/freerdp/gdi/region.h
@@ -23,6 +23,10 @@
 #include <freerdp/api.h>
 #include <freerdp/gdi/gdi.h>
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API HGDI_RGN gdi_CreateRectRgn(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
 FREERDP_API HGDI_RECT gdi_CreateRect(int xLeft, int yTop, int xRight, int yBottom);
 FREERDP_API void gdi_RectToRgn(HGDI_RECT rect, HGDI_RGN rgn);
@@ -42,4 +46,8 @@ FREERDP_API int gdi_CopyRect(HGDI_RECT dst, HGDI_RECT src);
 FREERDP_API int gdi_PtInRect(HGDI_RECT rc, int x, int y);
 FREERDP_API int gdi_InvalidateRegion(HGDI_DC hdc, int x, int y, int w, int h);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_GDI_REGION_H */
diff --git a/include/freerdp/gdi/shape.h b/include/freerdp/gdi/shape.h
index 1fdf9abb0..9b96324dd 100644
--- a/include/freerdp/gdi/shape.h
+++ b/include/freerdp/gdi/shape.h
@@ -23,6 +23,10 @@
 #include <freerdp/api.h>
 #include <freerdp/gdi/gdi.h>
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API int gdi_Ellipse(HGDI_DC hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
 FREERDP_API int gdi_FillRect(HGDI_DC hdc, HGDI_RECT rect, HGDI_BRUSH hbr);
 FREERDP_API int gdi_Polygon(HGDI_DC hdc, GDI_POINT *lpPoints, int nCount);
@@ -31,4 +35,8 @@ FREERDP_API int gdi_Rectangle(HGDI_DC hdc, int nLeftRect, int nTopRect, int nRig
 
 typedef int (*p_FillRect)(HGDI_DC hdc, HGDI_RECT rect, HGDI_BRUSH hbr);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_GDI_SHAPE_H */
diff --git a/include/freerdp/locale/locale.h b/include/freerdp/locale/locale.h
index c36c1027b..d2b767b0a 100644
--- a/include/freerdp/locale/locale.h
+++ b/include/freerdp/locale/locale.h
@@ -230,8 +230,16 @@
 #define YORUBA						0x046A
 #define ZULU						0x0435
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API DWORD freerdp_get_system_locale_id(void);
 FREERDP_API const char* freerdp_get_system_locale_name_from_id(DWORD localeId);
 FREERDP_API int freerdp_detect_keyboard_layout_from_system_locale(DWORD* keyboardLayoutId);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_LOCALE_H */
diff --git a/include/freerdp/locale/timezone.h b/include/freerdp/locale/timezone.h
index d4d14a25d..1d062c8f1 100644
--- a/include/freerdp/locale/timezone.h
+++ b/include/freerdp/locale/timezone.h
@@ -24,6 +24,14 @@
 #include <freerdp/types.h>
 #include <freerdp/settings.h>
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API void freerdp_time_zone_detect(TIME_ZONE_INFO* clientTimeZone);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_LOCALE_TIMEZONE_H */
diff --git a/include/freerdp/metrics.h b/include/freerdp/metrics.h
index 5b453ceb1..8706aa31d 100644
--- a/include/freerdp/metrics.h
+++ b/include/freerdp/metrics.h
@@ -31,10 +31,18 @@ struct rdp_metrics
 	double TotalCompressionRatio;
 };
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API double metrics_write_bytes(rdpMetrics* metrics, UINT32 UncompressedBytes, UINT32 CompressedBytes);
 
 FREERDP_API rdpMetrics* metrics_new(rdpContext* context);
 FREERDP_API void metrics_free(rdpMetrics* metrics);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_METRICS_H */
 
diff --git a/include/freerdp/server/cliprdr.h b/include/freerdp/server/cliprdr.h
index c7d881c6b..dd41b930c 100644
--- a/include/freerdp/server/cliprdr.h
+++ b/include/freerdp/server/cliprdr.h
@@ -47,7 +47,15 @@ struct _cliprdr_server_context
 	CliprdrServerPrivate* priv;
 };
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API CliprdrServerContext* cliprdr_server_context_new(HANDLE vcm);
 FREERDP_API void cliprdr_server_context_free(CliprdrServerContext* context);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_CHANNEL_SERVER_CLIPRDR_H */
diff --git a/include/freerdp/server/drdynvc.h b/include/freerdp/server/drdynvc.h
index 9b41126de..be1693a76 100644
--- a/include/freerdp/server/drdynvc.h
+++ b/include/freerdp/server/drdynvc.h
@@ -44,7 +44,15 @@ struct _drdynvc_client_context
 	DrdynvcServerPrivate* priv;
 };
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API DrdynvcServerContext* drdynvc_server_context_new(HANDLE vcm);
 FREERDP_API void drdynvc_server_context_free(DrdynvcServerContext* context);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_CHANNEL_SERVER_DRDYNVC_H */
diff --git a/include/freerdp/server/encomsp.h b/include/freerdp/server/encomsp.h
index dd1f9eba9..a5037e628 100644
--- a/include/freerdp/server/encomsp.h
+++ b/include/freerdp/server/encomsp.h
@@ -71,7 +71,15 @@ struct _encomsp_server_context
 	EncomspServerPrivate* priv;
 };
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API EncomspServerContext* encomsp_server_context_new(HANDLE vcm);
 FREERDP_API void encomsp_server_context_free(EncomspServerContext* context);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_CHANNEL_SERVER_ENCOMSP_H */
diff --git a/include/freerdp/server/rdpdr.h b/include/freerdp/server/rdpdr.h
index 3fe23e869..af9c3c46e 100644
--- a/include/freerdp/server/rdpdr.h
+++ b/include/freerdp/server/rdpdr.h
@@ -45,7 +45,15 @@ struct _rdpdr_server_context
 	RdpdrServerPrivate* priv;
 };
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API RdpdrServerContext* rdpdr_server_context_new(HANDLE vcm);
 FREERDP_API void rdpdr_server_context_free(RdpdrServerContext* context);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_CHANNEL_SERVER_RDPDR_H */
diff --git a/include/freerdp/server/remdesk.h b/include/freerdp/server/remdesk.h
index b2c3f118c..c817a199d 100644
--- a/include/freerdp/server/remdesk.h
+++ b/include/freerdp/server/remdesk.h
@@ -47,8 +47,16 @@ struct _remdesk_server_context
 	RemdeskServerPrivate* priv;
 };
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 FREERDP_API RemdeskServerContext* remdesk_server_context_new(HANDLE vcm);
 FREERDP_API void remdesk_server_context_free(RemdeskServerContext* context);
 
+#ifdef __cplusplus
+ }
+#endif
+
 #endif /* FREERDP_CHANNEL_SERVER_REMDESK_H */