diff --git a/gst-libs/gst/fft/gstfft.h b/gst-libs/gst/fft/gstfft.h
index f48f312308..fa5defe220 100644
--- a/gst-libs/gst/fft/gstfft.h
+++ b/gst-libs/gst/fft/gstfft.h
@@ -44,6 +44,6 @@ typedef enum
 
 /* Functions */
 
-gint gst_fft_next_fast_length (gint n);
+gint gst_fft_next_fast_length (gint n) G_GNUC_CONST;
 
 #endif /* __GST_FFT_H__ */
diff --git a/gst-libs/gst/fft/gstfftf32.h b/gst-libs/gst/fft/gstfftf32.h
index 8ec61b21b0..3b56b48394 100644
--- a/gst-libs/gst/fft/gstfftf32.h
+++ b/gst-libs/gst/fft/gstfftf32.h
@@ -28,6 +28,9 @@
 typedef struct _GstFFTF32 GstFFTF32;
 typedef struct _GstFFTF32Complex GstFFTF32Complex;
 
+/* FIXME 0.11: Move the struct definition to the sources,
+ *             there's no reason to have it public.
+ */
 /**
  * GstFFTF32:
  *
diff --git a/gst-libs/gst/fft/gstfftf64.h b/gst-libs/gst/fft/gstfftf64.h
index 57ba5aab9c..8ebbee49ab 100644
--- a/gst-libs/gst/fft/gstfftf64.h
+++ b/gst-libs/gst/fft/gstfftf64.h
@@ -28,6 +28,9 @@
 typedef struct _GstFFTF64 GstFFTF64;
 typedef struct _GstFFTF64Complex GstFFTF64Complex;
 
+/* FIXME 0.11: Move the struct definition to the sources,
+ *             there's no reason to have it public.
+ */
 /**
  * GstFFTF64:
  *
diff --git a/gst-libs/gst/fft/gstffts16.h b/gst-libs/gst/fft/gstffts16.h
index d13b8973b5..9a752f1ffd 100644
--- a/gst-libs/gst/fft/gstffts16.h
+++ b/gst-libs/gst/fft/gstffts16.h
@@ -28,6 +28,9 @@
 typedef struct _GstFFTS16 GstFFTS16;
 typedef struct _GstFFTS16Complex GstFFTS16Complex;
 
+/* FIXME 0.11: Move the struct definition to the sources,
+ *             there's no reason to have it public.
+ */
 /**
  * GstFFTS16:
  *
diff --git a/gst-libs/gst/fft/gstffts32.h b/gst-libs/gst/fft/gstffts32.h
index b4da3dcc3a..fd3b2798e4 100644
--- a/gst-libs/gst/fft/gstffts32.h
+++ b/gst-libs/gst/fft/gstffts32.h
@@ -28,6 +28,9 @@
 typedef struct _GstFFTS32 GstFFTS32;
 typedef struct _GstFFTS32Complex GstFFTS32Complex;
 
+/* FIXME 0.11: Move the struct definition to the sources,
+ *             there's no reason to have it public.
+ */
 /**
  * GstFFTS32:
  *