[gnome-scan] Never include SANE before config.h

[Étienne Bersac <bersace src gnome org>]

commit 16f567cce0304e92526b27a48cc17b817dc933d2
Author: Ã?tienne BERSAC <etienne bersac corp nerim net>
Date:   Sun Apr 3 13:05:09 2011 +0200

    Never include SANE before config.h

 modules/gsane/gsane-common.h                 |    6 ++++++
 modules/gsane/gsane-option-handler-generic.c |    5 -----
 modules/gsane/gsane-option-handler.c         |    6 ------
 modules/gsane/gsane-option-handler.h         |    8 ++++----
 4 files changed, 10 insertions(+), 15 deletions(-)
---
diff --git a/modules/gsane/gsane-common.h b/modules/gsane/gsane-common.h
index 7959ddc..1b45405 100644
--- a/modules/gsane/gsane-common.h
+++ b/modules/gsane/gsane-common.h
@@ -24,6 +24,12 @@
 #define _GSANE_COMMON_H_
 
 #include <glib.h>
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib/gi18n-lib.h>
 #include <sane/sane.h>
 #include <gnome-scan.h>
 
diff --git a/modules/gsane/gsane-option-handler-generic.c b/modules/gsane/gsane-option-handler-generic.c
index 732978a..e242055 100644
--- a/modules/gsane/gsane-option-handler-generic.c
+++ b/modules/gsane/gsane-option-handler-generic.c
@@ -19,11 +19,6 @@
  *	Boston, MA 02110-1301, USA
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib/gi18n-lib.h>
 #include <gnome-scan.h>
 
 #include "gsane-common.h"
diff --git a/modules/gsane/gsane-option-handler.c b/modules/gsane/gsane-option-handler.c
index d62aa03..1bd2da4 100644
--- a/modules/gsane/gsane-option-handler.c
+++ b/modules/gsane/gsane-option-handler.c
@@ -19,12 +19,6 @@
  *	Boston, MA 02110-1301, USA
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib/gi18n-lib.h>
-
 #include "gsane-option-handler.h"
 #include "gsane-scanner.h"
 #include "gsane-common.h"
diff --git a/modules/gsane/gsane-option-handler.h b/modules/gsane/gsane-option-handler.h
index 4b394a2..bb1aa9d 100644
--- a/modules/gsane/gsane-option-handler.h
+++ b/modules/gsane/gsane-option-handler.h
@@ -1,16 +1,16 @@
-/* GSane - SANE GNOME Scan backend 
+/* GSane - SANE GNOME Scan backend
  * Copyright © 2007-2008  �tienne Bersac <bersace gnome org>
  *
  * GSane is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation; either version 2.1 of
  * the License, or (at your option) any later version.
- * 
+ *
  * GSane is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with GSane.  If not, write to:
  *
@@ -23,9 +23,9 @@
 #define _GSANE_OPTION_HANDLER_H_
 
 #include <glib-object.h>
-#include <sane/sane.h>
 #include <gnome-scan.h>
 #include "gsane-common.h"
+#include <sane/sane.h>
 
 G_BEGIN_DECLS