diff --git a/ChangeLog b/ChangeLog
index 59ec506254..8093adf8b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-01-30  Jan Schmidt  <jan.schmidt@sun.com>
+
+	* gst-libs/gst/interfaces/mixeroptions.h:
+	* gst-libs/gst/interfaces/mixertrack.h:
+	Change the way these deprecated function pointers are removed
+	so that the compiled ABI is unconditionally smaller. This 
+	sets in stone an ABI break that actually occurred when the
+	things were deprecated in 0.10.14, which seems to be the best
+	fix as the only known users are oss-mixer and sunaudio-mixer in 
+	gst-plugins-good.
+
 2008-01-30  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* win32/common/libgstpbutils.def:
diff --git a/gst-libs/gst/interfaces/mixeroptions.h b/gst-libs/gst/interfaces/mixeroptions.h
index e59a7e54e6..832c5bc52f 100644
--- a/gst-libs/gst/interfaces/mixeroptions.h
+++ b/gst-libs/gst/interfaces/mixeroptions.h
@@ -57,11 +57,11 @@ struct _GstMixerOptions {
 struct _GstMixerOptionsClass {
   GstMixerTrackClass parent;
 
-#ifndef GST_DISABLE_DEPRECATED
+#ifdef GST_MIXER_NEED_DEPRECATED
   /* signals */
   void (* option_changed) (GstMixerOptions *opts,
                            gchar           *value);
-#endif /* not GST_DISABLE_DEPRECATED */
+#endif /* GST_MIXER_NEED_DEPRECATED */
 
   gpointer _gst_reserved[GST_PADDING];
 };
diff --git a/gst-libs/gst/interfaces/mixertrack.h b/gst-libs/gst/interfaces/mixertrack.h
index 655e8d028d..dad838ca27 100644
--- a/gst-libs/gst/interfaces/mixertrack.h
+++ b/gst-libs/gst/interfaces/mixertrack.h
@@ -88,7 +88,7 @@ struct _GstMixerTrack {
 struct _GstMixerTrackClass {
   GObjectClass parent;
 
-#ifndef GST_DISABLE_DEPRECATED
+#ifdef GST_MIXER_NEED_DEPRECATED
   /* signals (deprecated) */
   void (* mute_toggled)   (GstMixerTrack *channel,
                            gboolean       mute);
@@ -96,7 +96,7 @@ struct _GstMixerTrackClass {
                            gboolean       record);
   void (* volume_changed) (GstMixerTrack *channel,
                            gint          *volumes);
-#endif /* not GST_DISABLE_DEPRECATED */
+#endif /* GST_MIXER_NEED_DEPRECATED */
 
   gpointer _gst_reserved[GST_PADDING];
 };