diff --git a/ChangeLog b/ChangeLog
index 8d0058fa0a..b351c28728 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-02-04  David Schleef  <ds@schleef.org>
+
+	Replace use of GST_PAD_FORMATS_FUNCTION() and similar macros
+	with the code that they would expand to.
+	* ext/flac/gstflacdec.c: (gst_flacdec_get_src_formats),
+	(gst_flacdec_get_src_query_types),
+	(gst_flacdec_get_src_event_masks):
+	* ext/gnomevfs/gstgnomevfssrc.c: (gst_gnomevfssrc_get_formats),
+	(gst_gnomevfssrc_get_query_types),
+	(gst_gnomevfssrc_get_event_mask):
+
 2004-02-04  Benjamin Otte  <in7y118@public.uni-hamburg.de>
 
 	* gst/sine/gstsinesrc.c: (gst_sinesrc_class_init),
diff --git a/ext/gnomevfs/gstgnomevfssrc.c b/ext/gnomevfs/gstgnomevfssrc.c
index 624cf66abd..87c8d29ae0 100644
--- a/ext/gnomevfs/gstgnomevfssrc.c
+++ b/ext/gnomevfs/gstgnomevfssrc.c
@@ -132,23 +132,42 @@ static GstElementDetails gst_gnomevfssrc_details = GST_ELEMENT_DETAILS (
 	"Bastien Nocera <hadess@hadess.net>"
 );
 
-GST_PAD_FORMATS_FUNCTION (gst_gnomevfssrc_get_formats,
-	GST_FORMAT_BYTES
-)
 
-GST_PAD_QUERY_TYPE_FUNCTION (gst_gnomevfssrc_get_query_types,
-	GST_QUERY_TOTAL,
-	GST_QUERY_POSITION
-)
+static const GstFormat *
+gst_gnomevfssrc_get_formats (GstPad *pad)
+{
+  static const GstFormat formats[] = {
+    GST_FORMAT_BYTES,
+    0,
+  };
+  return formats;
+}
 
-GST_PAD_EVENT_MASK_FUNCTION (gst_gnomevfssrc_get_event_mask,
-  { GST_EVENT_SEEK, GST_SEEK_METHOD_CUR |
-                    GST_SEEK_METHOD_SET |
-                    GST_SEEK_METHOD_END |
-                    GST_SEEK_FLAG_FLUSH },
-  { GST_EVENT_FLUSH, 0 },
-  { GST_EVENT_SIZE, 0 }
-)
+static const GstQueryType *
+gst_gnomevfssrc_get_query_types (GstPad *pad)
+{
+  static const GstQueryType types[] = {
+    GST_QUERY_TOTAL,
+    GST_QUERY_POSITION,
+    0,
+  };
+  return types;
+}
+
+static const GstEventMask *
+gst_gnomevfssrc_get_event_mask (GstPad *pad)
+{
+  static const GstEventMask masks[] = {
+    { GST_EVENT_SEEK, GST_SEEK_METHOD_CUR |
+                      GST_SEEK_METHOD_SET |
+                      GST_SEEK_METHOD_END |
+                      GST_SEEK_FLAG_FLUSH },
+    { GST_EVENT_FLUSH, 0 },
+    { GST_EVENT_SIZE, 0 },
+    { 0, 0 },
+  };
+  return masks;
+}
 
 /* GnomeVFSSrc signals and args */
 enum {