diff --git a/gir-files/GstGL-1.0.gir b/gir-files/GstGL-1.0.gir
index ae1ebda32..e72653c4d 100644
--- a/gir-files/GstGL-1.0.gir
+++ b/gir-files/GstGL-1.0.gir
@@ -927,7 +927,7 @@ function to allocate and OpenGL resources needed for your application</doc>
         </parameter>
       </parameters>
     </callback>
-    <enumeration name="GLBaseMemoryError" c:type="GstGLBaseMemoryError" glib:error-domain="gst-gl-base-buffer-error-quark">
+    <enumeration name="GLBaseMemoryError" c:type="GstGLBaseMemoryError" glib:error-domain="gst-gl-base-memory-error-quark">
       <member name="failed" value="0" c:identifier="GST_GL_BASE_MEMORY_ERROR_FAILED">
         <doc xml:space="preserve">generic faliure</doc>
       </member>
@@ -2212,7 +2212,7 @@ MT-safe</doc>
         </array>
       </field>
     </record>
-    <enumeration name="GLContextError" c:type="GstGLContextError">
+    <enumeration name="GLContextError" c:type="GstGLContextError" glib:error-domain="gst-gl-context-error-quark">
       <doc xml:space="preserve">OpenGL context errors.</doc>
       <member name="failed" value="0" c:identifier="GST_GL_CONTEXT_ERROR_FAILED">
         <doc xml:space="preserve">Failed for an unspecified reason</doc>
@@ -4242,7 +4242,7 @@ multiple times.  This must be called before any other GstGLRenderbuffer operatio
         </array>
       </field>
     </record>
-    <enumeration name="GLSLError" version="1.8" c:type="GstGLSLError" glib:error-domain="gst-glsl-error">
+    <enumeration name="GLSLError" version="1.8" c:type="GstGLSLError" glib:error-domain="gst-glsl-error-quark">
       <doc xml:space="preserve">Compilation stage that caused an error</doc>
       <member name="compile" value="0" c:identifier="GST_GLSL_ERROR_COMPILE">
         <doc xml:space="preserve">Compilation error occured</doc>
@@ -7526,7 +7526,7 @@ require this to be called with a valid handle before drawing can commence.</doc>
         </array>
       </field>
     </record>
-    <enumeration name="GLWindowError" c:type="GstGLWindowError">
+    <enumeration name="GLWindowError" c:type="GstGLWindowError" glib:error-domain="gst-gl-window-error-quark">
       <member name="failed" value="0" c:identifier="GST_GL_WINDOW_ERROR_FAILED">
         <doc xml:space="preserve">failed for a unspecified reason</doc>
       </member>
diff --git a/gir-files/fix.sh b/gir-files/fix.sh
index d87481540..9f3788827 100755
--- a/gir-files/fix.sh
+++ b/gir-files/fix.sh
@@ -57,3 +57,19 @@ xmlstarlet ed --pf --inplace \
 	   --delete '//_:callback[starts-with(@name, "Check")]' \
 	   --delete '//_:record[starts-with(@name, "Check")]' \
 	   GstCheck-1.0.gir
+
+# Fix gst_gl_base_buffer_error_quark() and gst_glsl_error_quark()
+xmlstarlet ed --pf --inplace \
+	   --update '//*[@glib:error-domain="gst-gl-base-buffer-error-quark"]/@glib:error-domain' \
+	     --value gst-gl-base-memory-error-quark \
+	   --update '//*[@glib:error-domain="gst-glsl-error"]/@glib:error-domain' \
+	     --value  gst-glsl-error-quark \
+	   GstGL-1.0.gir
+
+# Fix error domains for GstGLContext and GstGLWindow
+xmlstarlet ed --pf --inplace \
+	   --insert '//_:enumeration[@name="GLContextError"][not(@glib:error-domain)]' \
+	     --type attr -n 'glib:error-domain' --value gst-gl-context-error-quark \
+	   --insert '//_:enumeration[@name="GLWindowError"][not(@glib:error-domain)]' \
+	     --type attr -n 'glib:error-domain' --value gst-gl-window-error-quark \
+	   GstGL-1.0.gir