--- a/gst_plugins_base/gst-libs/gst/audio/audio.c	Wed Mar 31 22:03:18 2010 +0300
+++ b/gst_plugins_base/gst-libs/gst/audio/audio.c	Tue Aug 31 15:30:33 2010 +0300
@@ -16,27 +16,22 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+/**
+ * SECTION:gstaudio
+ * @short_description: Support library for audio elements
+ *
+ * This library contains some helper functions for audio elements.
+ */
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
 
 #include "audio.h"
-#include "multichannel-enumtypes.h"
+#include "audio-enumtypes.h"
 
 #include <gst/gststructure.h>
 
-#ifdef __SYMBIAN32__
-#include <glib_global.h>
-#endif
-
-/**
- * SECTION:gstaudio
- * @short_description: Support library for audio elements
- *
- * This library contains some helper functions for audio elements.
- */
-
 /**
  * gst_audio_frame_byte_size:
  * @pad: the #GstPad to get the caps from
@@ -117,7 +112,7 @@
  * Calculate length in nanoseconds of audio buffer @buf based on capabilities of
  * @pad.
  *
- * Return: the length.
+ * Returns: the length.
  */
 #ifdef __SYMBIAN32__
 EXPORT_C