diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_vp9.c b/gst-libs/gst/vaapi/gstvaapidecoder_vp9.c
index 260a35e7ab..2466b7bb74 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_vp9.c
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_vp9.c
@@ -182,7 +182,7 @@ get_profile (guint profile_idc)
       profile = GST_VAAPI_PROFILE_VP9_3;
       break;
     default:
-      g_debug ("unsupported profile_idc value");
+      GST_DEBUG ("unsupported profile_idc value");
       profile = GST_VAAPI_PROFILE_UNKNOWN;
       break;
   }
diff --git a/gst-libs/gst/vaapi/gstvaapiutils_h264.c b/gst-libs/gst/vaapi/gstvaapiutils_h264.c
index fa09ef4714..0d01253f21 100644
--- a/gst-libs/gst/vaapi/gstvaapiutils_h264.c
+++ b/gst-libs/gst/vaapi/gstvaapiutils_h264.c
@@ -25,6 +25,9 @@
 #include "gstvaapicompat.h"
 #include "gstvaapiutils_h264_priv.h"
 
+#define DEBUG 1
+#include "gstvaapidebug.h"
+
 struct map
 {
   guint value;
@@ -185,7 +188,7 @@ gst_vaapi_utils_h264_get_profile (guint8 profile_idc)
       profile = GST_VAAPI_PROFILE_H264_STEREO_HIGH;
       break;
     default:
-      g_debug ("unsupported profile_idc value");
+      GST_DEBUG ("unsupported profile_idc value");
       profile = GST_VAAPI_PROFILE_UNKNOWN;
       break;
   }
@@ -234,7 +237,7 @@ gst_vaapi_utils_h264_get_profile_idc (GstVaapiProfile profile)
       profile_idc = GST_H264_PROFILE_STEREO_HIGH;
       break;
     default:
-      g_debug ("unsupported GstVaapiProfile value");
+      GST_DEBUG ("unsupported GstVaapiProfile value");
       profile_idc = 0;
       break;
   }
@@ -274,7 +277,7 @@ gst_vaapi_utils_h264_get_level (guint8 level_idc)
     if (llp->level_idc == level_idc)
       return llp->level;
   }
-  g_debug ("unsupported level_idc value");
+  GST_DEBUG ("unsupported level_idc value");
   return (GstVaapiLevelH264) 0;
 }
 
@@ -371,7 +374,7 @@ gst_vaapi_utils_h264_get_chroma_type (guint chroma_format_idc)
       chroma_type = GST_VAAPI_CHROMA_TYPE_YUV444;
       break;
     default:
-      g_debug ("unsupported chroma_format_idc value");
+      GST_DEBUG ("unsupported chroma_format_idc value");
       chroma_type = (GstVaapiChromaType) 0;
       break;
   }
@@ -398,7 +401,7 @@ gst_vaapi_utils_h264_get_chroma_format_idc (GstVaapiChromaType chroma_type)
       chroma_format_idc = 3;
       break;
     default:
-      g_debug ("unsupported GstVaapiChromaType value");
+      GST_DEBUG ("unsupported GstVaapiChromaType value");
       chroma_format_idc = 1;
       break;
   }
diff --git a/gst-libs/gst/vaapi/gstvaapiutils_h265.c b/gst-libs/gst/vaapi/gstvaapiutils_h265.c
index 532a931f7a..080967b0fa 100644
--- a/gst-libs/gst/vaapi/gstvaapiutils_h265.c
+++ b/gst-libs/gst/vaapi/gstvaapiutils_h265.c
@@ -25,6 +25,9 @@
 #include "gstvaapicompat.h"
 #include "gstvaapiutils_h265_priv.h"
 
+#define DEBUG 1
+#include "gstvaapidebug.h"
+
 struct map
 {
   guint value;
@@ -160,7 +163,7 @@ gst_vaapi_utils_h265_get_profile (GstH265SPS * sps)
         break;
       }
     default:
-      g_debug ("unsupported profile_idc value");
+      GST_DEBUG ("unsupported profile_idc value");
       profile = GST_VAAPI_PROFILE_UNKNOWN;
       break;
   }
@@ -187,7 +190,7 @@ gst_vaapi_utils_h265_get_profile_idc (GstVaapiProfile profile)
       profile_idc = GST_H265_PROFILE_MAIN_422_10;
       break;
     default:
-      g_debug ("unsupported GstVaapiProfile value");
+      GST_DEBUG ("unsupported GstVaapiProfile value");
       profile_idc = 0;
       break;
   }
@@ -223,7 +226,7 @@ gst_vaapi_utils_h265_get_level (guint8 level_idc)
     if (llp->level_idc == level_idc)
       return llp->level;
   }
-  g_debug ("unsupported level_idc value");
+  GST_DEBUG ("unsupported level_idc value");
   return (GstVaapiLevelH265) 0;
 }
 
@@ -320,7 +323,7 @@ gst_vaapi_utils_h265_get_chroma_type (guint chroma_format_idc,
       chroma_type = GST_VAAPI_CHROMA_TYPE_YUV444;
       break;
     default:
-      g_debug ("unsupported chroma_format_idc value");
+      GST_DEBUG ("unsupported chroma_format_idc value");
       chroma_type = (GstVaapiChromaType) 0;
       break;
   }
@@ -348,7 +351,7 @@ gst_vaapi_utils_h265_get_chroma_format_idc (GstVaapiChromaType chroma_type)
       chroma_format_idc = 3;
       break;
     default:
-      g_debug ("unsupported GstVaapiChromaType value");
+      GST_DEBUG ("unsupported GstVaapiChromaType value");
       chroma_format_idc = 1;
       break;
   }
diff --git a/gst-libs/gst/vaapi/gstvaapiutils_mpeg2.c b/gst-libs/gst/vaapi/gstvaapiutils_mpeg2.c
index 20f7e1292f..baba0723d8 100644
--- a/gst-libs/gst/vaapi/gstvaapiutils_mpeg2.c
+++ b/gst-libs/gst/vaapi/gstvaapiutils_mpeg2.c
@@ -25,6 +25,9 @@
 #include "gstvaapicompat.h"
 #include "gstvaapiutils_mpeg2_priv.h"
 
+#define DEBUG 1
+#include "gstvaapidebug.h"
+
 struct map
 {
   guint value;
@@ -124,7 +127,7 @@ gst_vaapi_utils_mpeg2_get_profile (guint8 profile_idc)
       profile = GST_VAAPI_PROFILE_MPEG2_HIGH;
       break;
     default:
-      g_debug ("unsupported profile_idc value");
+      GST_DEBUG ("unsupported profile_idc value");
       profile = GST_VAAPI_PROFILE_UNKNOWN;
       break;
   }
@@ -148,7 +151,7 @@ gst_vaapi_utils_mpeg2_get_profile_idc (GstVaapiProfile profile)
       profile_idc = GST_MPEG_VIDEO_PROFILE_HIGH;
       break;
     default:
-      g_debug ("unsupported GstVaapiProfile value");
+      GST_DEBUG ("unsupported GstVaapiProfile value");
       profile_idc = 0;
       break;
   }
@@ -185,7 +188,7 @@ gst_vaapi_utils_mpeg2_get_level (guint8 level_idc)
     if (llp->level_idc == level_idc)
       return llp->level;
   }
-  g_debug ("unsupported level_idc value");
+  GST_DEBUG ("unsupported level_idc value");
   return (GstVaapiLevelMPEG2) 0;
 }
 
@@ -253,7 +256,7 @@ gst_vaapi_utils_mpeg2_get_chroma_type (guint chroma_format_idc)
       chroma_type = GST_VAAPI_CHROMA_TYPE_YUV444;
       break;
     default:
-      g_debug ("unsupported chroma_format_idc value");
+      GST_DEBUG ("unsupported chroma_format_idc value");
       chroma_type = (GstVaapiChromaType) 0;
       break;
   }
@@ -277,7 +280,7 @@ gst_vaapi_utils_mpeg2_get_chroma_format_idc (GstVaapiChromaType chroma_type)
       chroma_format_idc = GST_MPEG_VIDEO_CHROMA_444;
       break;
     default:
-      g_debug ("unsupported GstVaapiChromaType value");
+      GST_DEBUG ("unsupported GstVaapiChromaType value");
       chroma_format_idc = 1;
       break;
   }