4 files changed, 15 insertions, 13 deletions
diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c
index 775e322631..281c8f1c66 100644
--- a/addressbook/backend/pas/pas-backend-file.c
+++ b/addressbook/backend/pas/pas-backend-file.c
@@ -7,9 +7,7 @@
  */
 
 #include "config.h"  
-#include <gtk/gtksignal.h>
 #include <stdio.h>
-#include <gnome.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <time.h>
@@ -23,14 +21,18 @@
 #endif
 #endif
 
-#include "pas-backend-file.h"
-#include "pas-book.h"
-#include "pas-card-cursor.h"
+#include <gtk/gtksignal.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-util.h>
+#include <gal/util/e-util.h>
+#include <gal/widgets/e-unicode.h>
+
 #include <ebook/e-card-simple.h>
 #include <e-util/e-sexp.h>
 #include <e-util/e-dbhash.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-unicode.h>
+#include "pas-backend-file.h"
+#include "pas-book.h"
+#include "pas-card-cursor.h"
 
 #define PAS_BACKEND_FILE_VERSION_NAME "PAS-DB-VERSION"
 #define PAS_BACKEND_FILE_VERSION "0.1"
diff --git a/addressbook/backend/pas/pas-backend-ldap.c b/addressbook/backend/pas/pas-backend-ldap.c
index 0fb5347ca3..2aa8a884d4 100644
--- a/addressbook/backend/pas/pas-backend-ldap.c
+++ b/addressbook/backend/pas/pas-backend-ldap.c
@@ -9,10 +9,10 @@
 #define DEBUG
 
 #include "config.h"  
-#include <gtk/gtksignal.h>
 #include <fcntl.h>
 #include <time.h>
 #include <lber.h>
+#include <gtk/gtksignal.h>
 
 #ifdef DEBUG
 #define LDAP_DEBUG
@@ -39,12 +39,13 @@
 #include "ldap_schema.h"
 #endif
 
+#include <e-util/e-sexp.h>
+#include <ebook/e-card-simple.h>
+
 #include "pas-backend-ldap.h"
 #include "pas-book.h"
 #include "pas-card-cursor.h"
 
-#include <e-util/e-sexp.h>
-#include <ebook/e-card-simple.h>
 
 #define LDAP_MAX_SEARCH_RESPONSES 100
 
diff --git a/addressbook/backend/pas/pas-book-factory.c b/addressbook/backend/pas/pas-book-factory.c
index 54fbd2de84..052205b81d 100644
--- a/addressbook/backend/pas/pas-book-factory.c
+++ b/addressbook/backend/pas/pas-book-factory.c
@@ -9,9 +9,9 @@
 
 #include <config.h>
 #include <ctype.h>
-#include <gnome.h>
-#include <liboaf/liboaf.h>
 
+#include <gtk/gtksignal.h>
+#include <liboaf/liboaf.h>
 #include "addressbook.h"
 #include "pas-book-factory.h"
 
diff --git a/addressbook/backend/pas/pas-card-cursor.c b/addressbook/backend/pas/pas-card-cursor.c
index a7f56275fc..aeb1eddd48 100644
--- a/addressbook/backend/pas/pas-card-cursor.c
+++ b/addressbook/backend/pas/pas-card-cursor.c
@@ -7,7 +7,6 @@
  */
 
 #include <config.h>
-#include <bonobo.h>
 #include "addressbook.h"
 #include "pas-card-cursor.h"