diff --git a/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.h b/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.h
index 105530b119..9318c01c68 100644
--- a/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.h
+++ b/gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.h
@@ -130,9 +130,12 @@ struct _GstBaseCameraSrcClass
 };
 
 
+/* FIXME: these should be properly namespaced if they're meant as exposed API */
+#ifndef __GI_SCANNER__
 #define MIN_ZOOM 1.0f
 #define MAX_ZOOM 10.0f
 #define ZOOM_1X MIN_ZOOM
+#endif /* !__GI_SCANNER__ */
 
 GST_BASE_CAMERA_BIN_SRC_API
 gboolean gst_base_camera_src_set_mode (GstBaseCameraSrc *self, GstCameraBinMode mode);
diff --git a/gst-libs/gst/basecamerabinsrc/gstcamerabin-enum.h b/gst-libs/gst/basecamerabinsrc/gstcamerabin-enum.h
index 6d075f513f..bba15c0b1f 100644
--- a/gst-libs/gst/basecamerabinsrc/gstcamerabin-enum.h
+++ b/gst-libs/gst/basecamerabinsrc/gstcamerabin-enum.h
@@ -31,6 +31,8 @@
 
 G_BEGIN_DECLS
 
+/* FIXME: these should be properly namespaced if they're meant as exposed API */
+#ifndef __GI_SCANNER__
 #define DEFAULT_WIDTH 640
 #define DEFAULT_HEIGHT 480
 #define DEFAULT_CAPTURE_WIDTH 800
@@ -38,8 +40,10 @@ G_BEGIN_DECLS
 #define DEFAULT_FPS_N 0         /* makes it use the default */
 #define DEFAULT_FPS_D 1
 #define DEFAULT_ZOOM MIN_ZOOM
+#endif /* !__GI_SCANNER__ */
 
 
+/* FIXME: properly namespace these enums */
 /**
  * GstCameraBinMode:
  * @MODE_IMAGE: image capture
@@ -54,7 +58,7 @@ typedef enum
   MODE_VIDEO = 2,
 } GstCameraBinMode;
 
-
+/* FIXME: should be CAMERA_BIN_MODE and camera_bin_mode */
 #define GST_TYPE_CAMERABIN_MODE (gst_camerabin_mode_get_type ())
 GST_BASE_CAMERA_BIN_SRC_API
 GType gst_camerabin_mode_get_type (void);
diff --git a/gst-libs/gst/basecamerabinsrc/gstcamerabinpreview.h b/gst-libs/gst/basecamerabinsrc/gstcamerabinpreview.h
index f66a9b72f9..a0f3c0f0ce 100644
--- a/gst-libs/gst/basecamerabinsrc/gstcamerabinpreview.h
+++ b/gst-libs/gst/basecamerabinsrc/gstcamerabinpreview.h
@@ -30,6 +30,9 @@
 #include <gst/gst.h>
 #include "basecamerabinsrc-prelude.h"
 
+/**
+ * GstCameraBinPreviewPipelineData: (skip)
+ */
 typedef struct
 {
   GstElement *pipeline;