diff --git a/sys/mediafoundation/gstmfcaptureengine.cpp b/sys/mediafoundation/gstmfcaptureengine.cpp
index 3bda2bf128..66107d4181 100644
--- a/sys/mediafoundation/gstmfcaptureengine.cpp
+++ b/sys/mediafoundation/gstmfcaptureengine.cpp
@@ -31,10 +31,12 @@
 
 using namespace Microsoft::WRL;
 
-extern "C" {
+G_BEGIN_DECLS
+
 GST_DEBUG_CATEGORY_EXTERN (gst_mf_source_object_debug);
 #define GST_CAT_DEFAULT gst_mf_source_object_debug
-}
+
+G_END_DECLS
 
 static HRESULT gst_mf_capture_engine_on_event (GstMFCaptureEngine * engine,
     IMFMediaEvent * event);
diff --git a/sys/mediafoundation/gstmfcapturewinrt.cpp b/sys/mediafoundation/gstmfcapturewinrt.cpp
index b0515f9a03..c98ff78d13 100644
--- a/sys/mediafoundation/gstmfcapturewinrt.cpp
+++ b/sys/mediafoundation/gstmfcapturewinrt.cpp
@@ -34,10 +34,12 @@ using namespace ABI::Windows::Media::MediaProperties;
 using namespace ABI::Windows::Graphics::Imaging;
 using namespace ABI::Windows::Foundation;
 
-extern "C" {
+G_BEGIN_DECLS
+
 GST_DEBUG_CATEGORY_EXTERN (gst_mf_source_object_debug);
 #define GST_CAT_DEFAULT gst_mf_source_object_debug
-}
+
+G_END_DECLS
 
 struct _GstMFCaptureWinRT
 {
diff --git a/sys/mediafoundation/gstmfsourcereader.cpp b/sys/mediafoundation/gstmfsourcereader.cpp
index 62879d9605..0f85030446 100644
--- a/sys/mediafoundation/gstmfsourcereader.cpp
+++ b/sys/mediafoundation/gstmfsourcereader.cpp
@@ -29,10 +29,12 @@
 
 using namespace Microsoft::WRL;
 
-extern "C" {
+G_BEGIN_DECLS
+
 GST_DEBUG_CATEGORY_EXTERN (gst_mf_source_object_debug);
 #define GST_CAT_DEFAULT gst_mf_source_object_debug
-}
+
+G_END_DECLS
 
 typedef struct _GstMFStreamMediaType
 {
diff --git a/sys/mediafoundation/gstmftransform.cpp b/sys/mediafoundation/gstmftransform.cpp
index 0d3f1d7a92..32ee71ba79 100644
--- a/sys/mediafoundation/gstmftransform.cpp
+++ b/sys/mediafoundation/gstmftransform.cpp
@@ -30,10 +30,12 @@
 
 using namespace Microsoft::WRL;
 
-extern "C" {
+G_BEGIN_DECLS
+
 GST_DEBUG_CATEGORY_EXTERN (gst_mf_transform_debug);
 #define GST_CAT_DEFAULT gst_mf_transform_debug
-}
+
+G_END_DECLS
 
 enum
 {
diff --git a/sys/mediafoundation/gstmfutils.cpp b/sys/mediafoundation/gstmfutils.cpp
index 22bcbb8ce1..684855f643 100644
--- a/sys/mediafoundation/gstmfutils.cpp
+++ b/sys/mediafoundation/gstmfutils.cpp
@@ -27,10 +27,12 @@
 
 using namespace Microsoft::WRL;
 
-extern "C" {
+G_BEGIN_DECLS
+
 GST_DEBUG_CATEGORY_EXTERN (gst_mf_utils_debug);
 #define GST_CAT_DEFAULT gst_mf_utils_debug
-}
+
+G_END_DECLS
 
 #define MAKE_RAW_FORMAT_CAPS(format) \
     "video/x-raw, format = (string) " format
diff --git a/sys/mediafoundation/mediacapturewrapper.cpp b/sys/mediafoundation/mediacapturewrapper.cpp
index f8c27bf633..f24de3c710 100644
--- a/sys/mediafoundation/mediacapturewrapper.cpp
+++ b/sys/mediafoundation/mediacapturewrapper.cpp
@@ -36,10 +36,12 @@ using namespace ABI::Windows::Foundation::Collections;
 using namespace ABI::Windows::Media::Devices;
 using namespace ABI::Windows::Media::MediaProperties;
 
-extern "C" {
+G_BEGIN_DECLS
+
 GST_DEBUG_CATEGORY_EXTERN (gst_mf_source_object_debug);
 #define GST_CAT_DEFAULT gst_mf_source_object_debug
-}
+
+G_END_DECLS
 
 static std::string
 convert_hstring_to_string (HString * hstr)