Index: gst/gst.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gst.c,v
retrieving revision 1.199
diff -u -r1.199 gst.c
--- gst/gst.c	28 Apr 2006 20:44:21 -0000	1.199
+++ gst/gst.c	30 Apr 2006 08:35:48 -0000
@@ -101,10 +101,10 @@
  * Last reviewed on 2005-11-23 (0.9.5)
  */
 
+#include "gst_private.h"
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "gst_private.h"
 #include "gst-i18n-lib.h"
 #include <locale.h>             /* for LC_ALL */
 
Index: gst/gstbus.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gstbus.c,v
retrieving revision 1.57
diff -u -r1.57 gstbus.c
--- gst/gstbus.c	7 Apr 2006 14:02:12 -0000	1.57
+++ gst/gstbus.c	30 Apr 2006 08:35:49 -0000
@@ -66,13 +66,13 @@
  * Last reviewed on 2006-03-12 (0.10.5)
  */
 
+#include "gst_private.h"
 #include <errno.h>
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif
 #include <sys/types.h>
 
-#include "gst_private.h"
 #include "gstinfo.h"
 
 #include "gstbus.h"
Index: gst/gstclock.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gstclock.c,v
retrieving revision 1.92
diff -u -r1.92 gstclock.c
--- gst/gstclock.c	8 Apr 2006 20:57:29 -0000	1.92
+++ gst/gstclock.c	30 Apr 2006 08:35:49 -0000
@@ -102,9 +102,9 @@
  * Last reviewed on 2006-03-09 (0.10.4)
  */
 
-#include <time.h>
 
 #include "gst_private.h"
+#include <time.h>
 
 #include "gstclock.h"
 #include "gstinfo.h"
Index: gst/gstevent.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gstevent.c,v
retrieving revision 1.93
diff -u -r1.93 gstevent.c
--- gst/gstevent.c	7 Mar 2006 16:21:02 -0000	1.93
+++ gst/gstevent.c	30 Apr 2006 08:35:49 -0000
@@ -75,9 +75,9 @@
  * Last reviewed on 2006-01-24 (0.10.2)
  */
 
-#include <string.h>             /* memcpy */
 
 #include "gst_private.h"
+#include <string.h>             /* memcpy */
 
 #include "gstinfo.h"
 #include "gstevent.h"
Index: gst/gstformat.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gstformat.c,v
retrieving revision 1.19
diff -u -r1.19 gstformat.c
--- gst/gstformat.c	14 Mar 2006 19:16:45 -0000	1.19
+++ gst/gstformat.c	30 Apr 2006 08:35:50 -0000
@@ -31,9 +31,9 @@
  * operations.
  */
 
-#include <string.h>
 
 #include "gst_private.h"
+#include <string.h>
 #include "gstformat.h"
 
 static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
Index: gst/gstmessage.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gstmessage.c,v
retrieving revision 1.52
diff -u -r1.52 gstmessage.c
--- gst/gstmessage.c	6 Mar 2006 14:51:36 -0000	1.52
+++ gst/gstmessage.c	30 Apr 2006 08:35:50 -0000
@@ -48,9 +48,9 @@
  * Last reviewed on 2005-11-09 (0.9.4)
  */
 
-#include <string.h>             /* memcpy */
 
 #include "gst_private.h"
+#include <string.h>             /* memcpy */
 #include "gsterror.h"
 #include "gstenumtypes.h"
 #include "gstinfo.h"
Index: gst/gstparse.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gstparse.c,v
retrieving revision 1.69
diff -u -r1.69 gstparse.c
--- gst/gstparse.c	20 Oct 2005 20:46:17 -0000	1.69
+++ gst/gstparse.c	30 Apr 2006 08:35:50 -0000
@@ -29,9 +29,9 @@
  * gst-launch utillity.
  */
 
-#include <string.h>
 
 #include "gst_private.h"
+#include <string.h>
 
 #include "gstparse.h"
 #include "gstinfo.h"
Index: gst/gstquery.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gstquery.c,v
retrieving revision 1.30
diff -u -r1.30 gstquery.c
--- gst/gstquery.c	5 Apr 2006 13:18:29 -0000	1.30
+++ gst/gstquery.c	30 Apr 2006 08:35:50 -0000
@@ -58,9 +58,9 @@
  *
  * Last reviewed on 2006-02-14 (0.10.4)
  */
-#include <string.h>
 
 #include "gst_private.h"
+#include <string.h>
 #include "gstquery.h"
 #include "gstvalue.h"
 #include "gstenumtypes.h"
Index: gst/gstutils.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gstutils.c,v
retrieving revision 1.139
diff -u -r1.139 gstutils.c
--- gst/gstutils.c	28 Apr 2006 17:52:13 -0000	1.139
+++ gst/gstutils.c	30 Apr 2006 08:35:51 -0000
@@ -28,10 +28,10 @@
  * When defining own plugins, use the GST_BOILERPLATE ease gobject creation.
  */
 
+#include "gst_private.h"
 #include <stdio.h>
 #include <string.h>
 
-#include "gst_private.h"
 #include "gstghostpad.h"
 #include "gstutils.h"
 #include "gstinfo.h"
Index: gst/parse/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/parse/Makefile.am,v
retrieving revision 1.31
diff -u -r1.31 Makefile.am
--- gst/parse/Makefile.am	15 Oct 2005 13:58:17 -0000	1.31
+++ gst/parse/Makefile.am	30 Apr 2006 08:35:51 -0000
@@ -19,6 +19,21 @@
 
 grammar.tab.c grammar.tab.h: grammar.y 
 	$(BISON_PATH) -d -v -p_gst_parse__yy $(srcdir)/grammar.y -o grammar.tab.c
+	mv grammar.tab.c grammar.tab_tmp.c
+	echo '#ifdef HAVE_CONFIG_H' > grammar.tab_tmp2.c
+	echo '#include <config.h>' >> grammar.tab_tmp2.c
+	echo '#endif' >> grammar.tab_tmp2.c
+	cat grammar.tab_tmp.c >> grammar.tab_tmp2.c
+	rm grammar.tab_tmp.c
+	mv grammar.tab_tmp2.c grammar.tab.c
  
 lex._gst_parse_yy.c: parse.l grammar.tab.h
 	$(FLEX_PATH) -P_gst_parse_yy $^
+	mv lex._gst_parse_yy.c lex._gst_parse_yy_tmp.c
+	echo '#ifdef HAVE_CONFIG_H' > lex._gst_parse_yy_tmp2.c
+	echo '#include <config.h>' >> lex._gst_parse_yy_tmp2.c
+	echo '#endif' >> lex._gst_parse_yy_tmp2.c
+	cat lex._gst_parse_yy_tmp.c >> lex._gst_parse_yy_tmp2.c
+	rm lex._gst_parse_yy_tmp.c
+	mv lex._gst_parse_yy_tmp2.c lex._gst_parse_yy.c
+
Index: libs/gst/base/gstadapter.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/libs/gst/base/gstadapter.c,v
retrieving revision 1.16
diff -u -r1.16 gstadapter.c
--- libs/gst/base/gstadapter.c	15 Mar 2006 16:22:26 -0000	1.16
+++ libs/gst/base/gstadapter.c	30 Apr 2006 08:35:51 -0000
@@ -92,9 +92,9 @@
  * Last reviewed on 2006-03-07 (0.10.4).
  */
 
-#include <string.h>
 
 #include "gstadapter.h"
+#include <string.h>
 
 /* default size for the assembled data buffer */
 #define DEFAULT_SIZE 16
Index: libs/gst/base/gstbasesrc.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/libs/gst/base/gstbasesrc.c,v
retrieving revision 1.104
diff -u -r1.104 gstbasesrc.c
--- libs/gst/base/gstbasesrc.c	28 Apr 2006 13:18:41 -0000	1.104
+++ libs/gst/base/gstbasesrc.c	30 Apr 2006 08:35:52 -0000
@@ -165,13 +165,13 @@
  * </refsect2>
  */
 
-#include <stdlib.h>
-#include <string.h>
-
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
 
+#include <stdlib.h>
+#include <string.h>
+
 #include "gstbasesrc.h"
 #include "gsttypefindhelper.h"
 #include <gst/gstmarshal.h>
Index: libs/gst/base/gstpushsrc.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/libs/gst/base/gstpushsrc.c,v
retrieving revision 1.10
diff -u -r1.10 gstpushsrc.c
--- libs/gst/base/gstpushsrc.c	7 Mar 2006 09:28:44 -0000	1.10
+++ libs/gst/base/gstpushsrc.c	30 Apr 2006 08:35:52 -0000
@@ -44,13 +44,13 @@
  * base class.
  */
 
-#include <stdlib.h>
-#include <string.h>
-
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
 
+#include <stdlib.h>
+#include <string.h>
+
 #include "gstpushsrc.h"
 #include "gsttypefindhelper.h"
 #include <gst/gstmarshal.h>
Index: libs/gst/base/gsttypefindhelper.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/libs/gst/base/gsttypefindhelper.c,v
retrieving revision 1.17
diff -u -r1.17 gsttypefindhelper.c
--- libs/gst/base/gsttypefindhelper.c	9 Mar 2006 10:46:35 -0000	1.17
+++ libs/gst/base/gsttypefindhelper.c	30 Apr 2006 08:35:52 -0000
@@ -31,13 +31,13 @@
  * typefinding in push mode from a chain function.
  */
 
-#include <stdlib.h>
-#include <string.h>
-
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
 
+#include <stdlib.h>
+#include <string.h>
+
 #include "gsttypefindhelper.h"
 
 static gint
Index: plugins/elements/gstfakesrc.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/plugins/elements/gstfakesrc.c,v
retrieving revision 1.126
diff -u -r1.126 gstfakesrc.c
--- plugins/elements/gstfakesrc.c	28 Apr 2006 18:55:17 -0000	1.126
+++ plugins/elements/gstfakesrc.c	30 Apr 2006 08:35:52 -0000
@@ -47,13 +47,13 @@
  * </refsect2>
  */
 
-#include <stdlib.h>
-#include <string.h>
-
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
 
+#include <stdlib.h>
+#include <string.h>
+
 #include "gstfakesrc.h"
 #include <gst/gstmarshal.h>
 
Index: plugins/elements/gstidentity.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/plugins/elements/gstidentity.c,v
retrieving revision 1.101
diff -u -r1.101 gstidentity.c
--- plugins/elements/gstidentity.c	28 Apr 2006 18:55:17 -0000	1.101
+++ plugins/elements/gstidentity.c	30 Apr 2006 08:35:52 -0000
@@ -22,12 +22,12 @@
  */
 
 
-#include <stdlib.h>
-
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
 
+#include <stdlib.h>
+
 #include "../../gst/gst-i18n-lib.h"
 #include "gstidentity.h"
 #include <gst/gstmarshal.h>
Index: win32/common/config.h
===================================================================
RCS file: /cvs/gstreamer/gstreamer/win32/common/config.h,v
retrieving revision 1.48
diff -u -r1.48 config.h
--- win32/common/config.h	28 Apr 2006 13:05:19 -0000	1.48
+++ win32/common/config.h	30 Apr 2006 08:35:53 -0000
@@ -169,7 +169,7 @@
 #define HAVE_WIN32 1
 
 /* Define host CPU */
-#define HOST_CPU "i686"
+#define HOST_CPU "sparc"
 
 /* library dir */
 #ifdef _DEBUG
