2005-04-17 Jim Evins <evins@snaught.com>

	* libglabels/libglabels-private.h:
	* libglabels/paper.c:
	* libglabels/paper.h:
	* libglabels/template.c:
	* libglabels/template.h:
	* libglabels/xml-paper.c:
	* libglabels/xml-paper.h:
	* libglabels/xml-template.c:
	* libglabels/xml.c:
	* libglabels/xml.h:
	* src/base64.c:
	* src/base64.h:
	* src/bc-gnubarcode.c:
	* src/bc-postnet.c:
	* src/bc.c:
	* src/bc.h:
	* src/commands.c:
	* src/debug.c:
	* src/debug.h:
	* src/file.c:
	* src/file.h:
	* src/hig.c:
	* src/hig.h:
	* src/label-barcode.c:
	* src/label-box.c:
	* src/label-ellipse.c:
	* src/label-image.c:
	* src/label-image.h:
	* src/label-line.c:
	* src/label-object.c:
	* src/label-text.c:
	* src/label-text.h:
	* src/label.c:
	* src/merge-properties-dialog.c:
	* src/object-editor-bc-page.c:
	* src/object-editor-data-page.c:
	* src/object-editor-edit-page.c:
	* src/object-editor-fill-page.c:
	* src/object-editor-image-page.c:
	* src/object-editor-line-page.c:
	* src/object-editor-lsize-page.c:
	* src/object-editor-position-page.c:
	* src/object-editor-private.h:
	* src/object-editor-size-page.c:
	* src/object-editor-text-page.c:
	* src/object-editor.c:
	* src/object-editor.h:
	* src/pixbuf-cache.h:
	* src/prefs-dialog.c:
	* src/prefs-dialog.h:
	* src/prefs-model.c:
	* src/prefs-model.h:
	* src/prefs.c:
	* src/print-dialog.c:
	* src/print-dialog.h:
	* src/print.c:
	* src/print.h:
	* src/recent.c:
	* src/recent.h:
	* src/splash.c:
	* src/splash.h:
	* src/stock.h:
	* src/template-designer.c:
	* src/template-designer.h:
	* src/text-node.h:
	* src/tools.c:
	* src/ui-property-bar.c: (gl_ui_property_bar_construct):
	* src/ui-sidebar.c:
	* src/ui-util.c:
	* src/ui.c:
	* src/util.c:
	* src/util.h:
	* src/view-barcode.c:
	* src/view-box.c:
	* src/view-ellipse.c:
	* src/view-highlight.c:
	* src/view-highlight.h:
	* src/view-image.c:
	* src/view-line.c:
	* src/view-object.c:
	* src/view-object.h:
	* src/view-text.c:
	* src/view.c:
	* src/view.h:
	* src/wdgt-chain-button.c:
	* src/wdgt-media-select.c:
	* src/wdgt-media-select.h:
	* src/wdgt-mini-preview.c:
	* src/wdgt-mini-preview.h:
	* src/wdgt-print-copies.c:
	* src/wdgt-print-copies.h:
	* src/wdgt-print-merge.c:
	* src/wdgt-print-merge.h:
	* src/wdgt-rotate-label.c:
	* src/wdgt-rotate-label.h:
	* src/window.c:
	* src/window.h:
	* src/xml-label-04.c:
	* src/xml-label-191.c:
	* src/xml-label.c:
		Cleanup of header files:
		- all header files are now stand-alone, verified by including
		  first in corresponding "c" files
		- replaced blanket includes of gnome, gtk, and glib with
		  targetted includes


git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@522 f5e0f49d-192f-0410-a22d-a8d8700d0965

101 files changed, 454 insertions, 151 deletions

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index 2406a2a..049d64b 100644
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,111 @@
+2005-04-17  Jim Evins  <evins@snaught.com>
+
+	* libglabels/libglabels-private.h:
+	* libglabels/paper.c:
+	* libglabels/paper.h:
+	* libglabels/template.c:
+	* libglabels/template.h:
+	* libglabels/xml-paper.c:
+	* libglabels/xml-paper.h:
+	* libglabels/xml-template.c:
+	* libglabels/xml.c:
+	* libglabels/xml.h:
+	* src/base64.c:
+	* src/base64.h:
+	* src/bc-gnubarcode.c:
+	* src/bc-postnet.c:
+	* src/bc.c:
+	* src/bc.h:
+	* src/commands.c:
+	* src/debug.c:
+	* src/debug.h:
+	* src/file.c:
+	* src/file.h:
+	* src/hig.c:
+	* src/hig.h:
+	* src/label-barcode.c:
+	* src/label-box.c:
+	* src/label-ellipse.c:
+	* src/label-image.c:
+	* src/label-image.h:
+	* src/label-line.c:
+	* src/label-object.c:
+	* src/label-text.c:
+	* src/label-text.h:
+	* src/label.c:
+	* src/merge-properties-dialog.c:
+	* src/object-editor-bc-page.c:
+	* src/object-editor-data-page.c:
+	* src/object-editor-edit-page.c:
+	* src/object-editor-fill-page.c:
+	* src/object-editor-image-page.c:
+	* src/object-editor-line-page.c:
+	* src/object-editor-lsize-page.c:
+	* src/object-editor-position-page.c:
+	* src/object-editor-private.h:
+	* src/object-editor-size-page.c:
+	* src/object-editor-text-page.c:
+	* src/object-editor.c:
+	* src/object-editor.h:
+	* src/pixbuf-cache.h:
+	* src/prefs-dialog.c:
+	* src/prefs-dialog.h:
+	* src/prefs-model.c:
+	* src/prefs-model.h:
+	* src/prefs.c:
+	* src/print-dialog.c:
+	* src/print-dialog.h:
+	* src/print.c:
+	* src/print.h:
+	* src/recent.c:
+	* src/recent.h:
+	* src/splash.c:
+	* src/splash.h:
+	* src/stock.h:
+	* src/template-designer.c:
+	* src/template-designer.h:
+	* src/text-node.h:
+	* src/tools.c:
+	* src/ui-property-bar.c: (gl_ui_property_bar_construct):
+	* src/ui-sidebar.c:
+	* src/ui-util.c:
+	* src/ui.c:
+	* src/util.c:
+	* src/util.h:
+	* src/view-barcode.c:
+	* src/view-box.c:
+	* src/view-ellipse.c:
+	* src/view-highlight.c:
+	* src/view-highlight.h:
+	* src/view-image.c:
+	* src/view-line.c:
+	* src/view-object.c:
+	* src/view-object.h:
+	* src/view-text.c:
+	* src/view.c:
+	* src/view.h:
+	* src/wdgt-chain-button.c:
+	* src/wdgt-media-select.c:
+	* src/wdgt-media-select.h:
+	* src/wdgt-mini-preview.c:
+	* src/wdgt-mini-preview.h:
+	* src/wdgt-print-copies.c:
+	* src/wdgt-print-copies.h:
+	* src/wdgt-print-merge.c:
+	* src/wdgt-print-merge.h:
+	* src/wdgt-rotate-label.c:
+	* src/wdgt-rotate-label.h:
+	* src/window.c:
+	* src/window.h:
+	* src/xml-label-04.c:
+	* src/xml-label-191.c:
+	* src/xml-label.c:
+		Cleanup of header files:
+		- all header files are now stand-alone, verified by including
+		  first in corresponding "c" files
+		- replaced blanket includes of gnome, gtk, and glib with
+		  targetted includes
+	
 2005-04-16  Jim Evins  <evins@snaught.com>
 
 	* data/glade/Makefile.am:
diff --git a/glabels2/libglabels/libglabels-private.h b/glabels2/libglabels/libglabels-private.h
index 7dcc79a..e5011b2 100644
--- a/glabels2/libglabels/libglabels-private.h
+++ b/glabels2/libglabels/libglabels-private.h
@@ -26,6 +26,9 @@
 #ifndef __LIBGLABELS_PRIVATE_H__
 #define __LIBGLABELS_PRIVATE_H__
 
+#include <glib/gutils.h>
+#include <glib/gfileutils.h>
+
 /* Data system and user data directories.  (must free w/ g_free()) */
 #define GL_SYSTEM_DATA_DIR g_build_filename (LIBGLABELS_TEMPLATE_DIR, NULL)
 #define GL_USER_DATA_DIR   g_build_filename (g_get_home_dir (), ".glabels", NULL)
diff --git a/glabels2/libglabels/paper.c b/glabels2/libglabels/paper.c
index 5145e77..f4a54bf 100644
--- a/glabels2/libglabels/paper.c
+++ b/glabels2/libglabels/paper.c
@@ -24,12 +24,17 @@
  */
 #include <config.h>
 
+#include "paper.h"
+
 #include <glib/gi18n.h>
+#include <glib/gmem.h>
+#include <glib/gstrfuncs.h>
+#include <glib/gdir.h>
+#include <glib/gmessages.h>
 #include <string.h>
 
 #include "libglabels-private.h"
 
-#include "paper.h"
 #include "xml-paper.h"
 
 /*===========================================*/
diff --git a/glabels2/libglabels/paper.h b/glabels2/libglabels/paper.h
index 9cf9991..9137dad 100644
--- a/glabels2/libglabels/paper.h
+++ b/glabels2/libglabels/paper.h
@@ -26,7 +26,8 @@
 #ifndef __PAPER_H__
 #define __PAPER_H__
 
-#include <glib.h>
+#include <glib/gtypes.h>
+#include <glib/glist.h>
 
 G_BEGIN_DECLS
 
diff --git a/glabels2/libglabels/template.c b/glabels2/libglabels/template.c
index 9fbf729..a91306c 100644
--- a/glabels2/libglabels/template.c
+++ b/glabels2/libglabels/template.c
@@ -24,13 +24,17 @@
  */
 #include <config.h>
 
+#include "template.h"
+
 #include <glib/gi18n.h>
+#include <glib/gmem.h>
+#include <glib/gstrfuncs.h>
+#include <glib/gdir.h>
+#include <glib/gmessages.h>
 #include <string.h>
 
 #include "libglabels-private.h"
-
 #include "xml.h"
-#include "template.h"
 #include "xml-template.h"
 #include "paper.h"
 
diff --git a/glabels2/libglabels/template.h b/glabels2/libglabels/template.h
index b34abd2..ce633b7 100644
--- a/glabels2/libglabels/template.h
+++ b/glabels2/libglabels/template.h
@@ -26,7 +26,8 @@
 #ifndef __TEMPLATE_H__
 #define __TEMPLATE_H__
 
-#include <glib.h>
+#include <glib/gtypes.h>
+#include <glib/glist.h>
 
 G_BEGIN_DECLS
 
diff --git a/glabels2/libglabels/xml-paper.c b/glabels2/libglabels/xml-paper.c
index d984097..a287884 100644
--- a/glabels2/libglabels/xml-paper.c
+++ b/glabels2/libglabels/xml-paper.c
@@ -24,14 +24,16 @@
  */
 #include <config.h>
 
+#include "xml-paper.h"
+
 #include <glib/gi18n.h>
+#include <glib/gmessages.h>
 #include <string.h>
 #include <libintl.h>
 
 #include "libglabels-private.h"
 
 #include "xml.h"
-#include "xml-paper.h"
 
 /*===========================================*/
 /* Private types                             */
diff --git a/glabels2/libglabels/xml-paper.h b/glabels2/libglabels/xml-paper.h
index 5ec02b7..02dbacc 100644
--- a/glabels2/libglabels/xml-paper.h
+++ b/glabels2/libglabels/xml-paper.h
@@ -26,7 +26,8 @@
 #ifndef __XML_PAPER_H__
 #define __XML_PAPER_H__
 
-#include <glib.h>
+#include <glib/gtypes.h>
+#include <glib/glist.h>
 #include <libxml/tree.h>
 
 #include "paper.h"
diff --git a/glabels2/libglabels/xml-template.c b/glabels2/libglabels/xml-template.c
index f2fd80f..4711c4e 100644
--- a/glabels2/libglabels/xml-template.c
+++ b/glabels2/libglabels/xml-template.c
@@ -24,7 +24,10 @@
  */
 #include <config.h>
 
+#include "xml-template.h"
+
 #include <glib/gi18n.h>
+#include <glib/gmessages.h>
 #include <string.h>
 #include <libintl.h>
 
@@ -32,7 +35,6 @@
 
 #include "paper.h"
 #include "xml.h"
-#include "xml-template.h"
 
 /*===========================================*/
 /* Private types                             */
diff --git a/glabels2/libglabels/xml.c b/glabels2/libglabels/xml.c
index db51b96..d69a048 100644
--- a/glabels2/libglabels/xml.c
+++ b/glabels2/libglabels/xml.c
@@ -24,11 +24,14 @@
  */
 #include <config.h>
 
+#include "xml.h"
+
 #include <glib/gi18n.h>
+#include <glib/gstrfuncs.h>
+#include <glib/gmessages.h>
 
 #include "libglabels-private.h"
 
-#include "xml.h"
 
 /*========================================================*/
 /* Private macros and constants.                          */
diff --git a/glabels2/libglabels/xml.h b/glabels2/libglabels/xml.h
index 7276946..6924ec8 100644
--- a/glabels2/libglabels/xml.h
+++ b/glabels2/libglabels/xml.h
@@ -26,7 +26,7 @@
 #ifndef __XML_H__
 #define __XML_H__
 
-#include <glib.h>
+#include <glib/gtypes.h>
 #include <libxml/tree.h>
 
 #include "enums.h"
diff --git a/glabels2/src/base64.c b/glabels2/src/base64.c
index 957b46a..c8de307 100644
--- a/glabels2/src/base64.c
+++ b/glabels2/src/base64.c
@@ -30,11 +30,11 @@
  */
 #include <config.h>
 
-#include <glib.h>
-#include <string.h>
-
 #include "base64.h"
 
+#include <glib/gmem.h>
+#include <string.h>
+
 /*========================================================*/
 /* Private macros and constants.                          */
 /*========================================================*/
diff --git a/glabels2/src/base64.h b/glabels2/src/base64.h
index a686949..acddd17 100644
--- a/glabels2/src/base64.h
+++ b/glabels2/src/base64.h
@@ -27,6 +27,8 @@
 #ifndef __BASE64_H__
 #define __BASE64_H__
 
+#include <glib/gtypes.h>
+
 G_BEGIN_DECLS
 
 gchar  *gl_base64_encode (const guchar *in,
diff --git a/glabels2/src/bc-gnubarcode.c b/glabels2/src/bc-gnubarcode.c
index 2ea7798..7491b2a 100644
--- a/glabels2/src/bc-gnubarcode.c
+++ b/glabels2/src/bc-gnubarcode.c
@@ -28,11 +28,14 @@
 
 #include <config.h>
 
+#include "bc-gnubarcode.h"
+
 #include <ctype.h>
 #include <string.h>
+#include <glib/gstring.h>
+#include <glib/gstrfuncs.h>
+#include <glib/gmessages.h>
 
-#include "bc.h"
-#include "bc-gnubarcode.h"
 #include "barcode.h"
 
 #include "debug.h"
diff --git a/glabels2/src/bc-postnet.c b/glabels2/src/bc-postnet.c
index b0be19d..fec0daa 100644
--- a/glabels2/src/bc-postnet.c
+++ b/glabels2/src/bc-postnet.c
@@ -27,11 +27,13 @@
 
 #include <config.h>
 
-#include <ctype.h>
-
-#include "bc.h"
 #include "bc-postnet.h"
 
+#include <ctype.h>
+#include <glib/gstring.h>
+#include <glib/gstrfuncs.h>
+#include <glib/gmessages.h>
+
 #include "debug.h"
 
 /*========================================================*/
diff --git a/glabels2/src/bc.c b/glabels2/src/bc.c
index ab1c201..cd3f363 100644
--- a/glabels2/src/bc.c
+++ b/glabels2/src/bc.c
@@ -21,9 +21,13 @@
  */
 #include <config.h>
 
+#include "bc.h"
+
 #include <glib/gi18n.h>
+#include <glib/gmem.h>
+#include <glib/gstrfuncs.h>
+#include <glib/gmessages.h>
 
-#include "bc.h"
 #include "bc-postnet.h"
 #include "bc-gnubarcode.h"
 
diff --git a/glabels2/src/bc.h b/glabels2/src/bc.h
index 23ca14c..70b7032 100644
--- a/glabels2/src/bc.h
+++ b/glabels2/src/bc.h
@@ -22,7 +22,8 @@
 #ifndef __BC_H__
 #define __BC_H__
 
-#include <glib.h>
+#include <glib/gtypes.h>
+#include <glib/glist.h>
 
 G_BEGIN_DECLS
 
diff --git a/glabels2/src/commands.c b/glabels2/src/commands.c
index 9d68d72..d8558fe 100644
--- a/glabels2/src/commands.c
+++ b/glabels2/src/commands.c
@@ -22,12 +22,14 @@
 
 #include <config.h>
 
+#include "commands.h"
+
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
+#include <gtk/gtkwindow.h>
+#include <gtk/gtkaboutdialog.h>
 #include <libgnome/gnome-help.h>
 #include <libgnome/gnome-url.h>
 
-#include "commands.h"
 #include "view.h"
 #include "file.h"
 #include "template-designer.h"
diff --git a/glabels2/src/debug.c b/glabels2/src/debug.c
index 99f9842..462eb89 100644
--- a/glabels2/src/debug.c
+++ b/glabels2/src/debug.c
@@ -30,6 +30,10 @@
 
 #include "debug.h"
 
+#include <glib/gutils.h>
+#include <glib/gmessages.h>
+#include <glib/gstrfuncs.h>
+
 glDebugSection debug_flags = GLABELS_DEBUG_NONE;
 
 /****************************************************************************/
diff --git a/glabels2/src/debug.h b/glabels2/src/debug.h
index 58cba58..15d51bd 100644
--- a/glabels2/src/debug.h
+++ b/glabels2/src/debug.h
@@ -30,7 +30,7 @@
 #ifndef __DEBUG_H__
 #define __DEBUG_H__
 
-#include <glib.h>
+#include <glib/gtypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/glabels2/src/file.c b/glabels2/src/file.c
index 267830c..958d66b 100644
--- a/glabels2/src/file.c
+++ b/glabels2/src/file.c
@@ -22,11 +22,15 @@
 
 #include <config.h>
 
+#include "file.h"
+
 #include <glib/gi18n.h>
+#include <gtk/gtkdialog.h>
+#include <gtk/gtkfilechooserdialog.h>
+#include <gtk/gtkstock.h>
 #include <string.h>
 
 #include "xml-label.h"
-#include "file.h"
 #include "recent.h"
 #include "hig.h"
 #include "util.h"
diff --git a/glabels2/src/file.h b/glabels2/src/file.h
index cecef9d..01c5d86 100644
--- a/glabels2/src/file.h
+++ b/glabels2/src/file.h
@@ -24,7 +24,7 @@
 #define __FILE_H__
 
 #include "recent-files/egg-recent-view.h"
-#include <gtk/gtk.h>
+#include <gtk/gtkwindow.h>
 
 #include "label.h"
 #include "window.h"
diff --git a/glabels2/src/hig.c b/glabels2/src/hig.c
index f5f026e..44ae8b0 100644
--- a/glabels2/src/hig.c
+++ b/glabels2/src/hig.c
@@ -22,10 +22,15 @@
 
 #include <config.h>
 
-#include <glib.h>
-
 #include "hig.h"
 
+#include <glib/gmem.h>
+#include <glib/gstrfuncs.h>
+#include <glib/gmessages.h>
+#include <gtk/gtkstock.h>
+#include <gtk/gtkimage.h>
+#include <gtk/gtklabel.h>
+
 /*========================================================*/
 /* Private macros and constants.                          */
 /*========================================================*/
diff --git a/glabels2/src/hig.h b/glabels2/src/hig.h
index 35c5b9e..8f41fd7 100644
--- a/glabels2/src/hig.h
+++ b/glabels2/src/hig.h
@@ -23,7 +23,9 @@
 #ifndef __HIG_H__
 #define __HIG_H__
 
-#include <gtk/gtk.h>
+#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtkvbox.h>
+#include <gtk/gtkhbox.h>
 
 G_BEGIN_DECLS
 
diff --git a/glabels2/src/label-barcode.c b/glabels2/src/label-barcode.c
index d00f690..9ec54c9 100644
--- a/glabels2/src/label-barcode.c
+++ b/glabels2/src/label-barcode.c
@@ -20,10 +20,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#include <glib.h>
-
 #include "label-barcode.h"
 
+#include <glib/gmem.h>
+#include <glib/gstrfuncs.h>
+#include <glib/gmessages.h>
+
 #include "pixmaps/checkerboard.xpm"
 
 #include "debug.h"
diff --git a/glabels2/src/label-box.c b/glabels2/src/label-box.c
index 654c39d..f909a72 100644
--- a/glabels2/src/label-box.c
+++ b/glabels2/src/label-box.c
@@ -20,10 +20,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#include <glib.h>
-
 #include "label-box.h"
 
+#include <glib/gmem.h>
+#include <glib/gstrfuncs.h>
+#include <glib/gmessages.h>
+
 #include "debug.h"
 
 /*========================================================*/
diff --git a/glabels2/src/label-ellipse.c b/glabels2/src/label-ellipse.c
index 95fa936..0fc3582 100644
--- a/glabels2/src/label-ellipse.c
+++ b/glabels2/src/label-ellipse.c
@@ -20,10 +20,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#include <glib.h>
-
 #include "label-ellipse.h"
 
+#include <glib/gmem.h>
+#include <glib/gstrfuncs.h>
+#include <glib/gmessages.h>
+
 #include "debug.h"
 
 /*========================================================*/
diff --git a/glabels2/src/label-image.c b/glabels2/src/label-image.c
index c785ad0..c7c368d 100644
--- a/glabels2/src/label-image.c
+++ b/glabels2/src/label-image.c
@@ -20,10 +20,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#include <glib.h>
-
 #include "label-image.h"
 
+#include <glib/gmem.h>
+#include <glib/gstrfuncs.h>
+#include <glib/gmessages.h>
+
 #include "pixmaps/checkerboard.xpm"
 
 #include "debug.h"
diff --git a/glabels2/src/label-image.h b/glabels2/src/label-image.h
index 31a480a..7c611a6 100644
--- a/glabels2/src/label-image.h
+++ b/glabels2/src/label-image.h
@@ -26,7 +26,7 @@
 #include "label-object.h"
 #include "text-node.h"
 #include "merge.h"
-#include "gdk-pixbuf/gdk-pixbuf.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 G_BEGIN_DECLS
 
diff --git a/glabels2/src/label-line.c b/glabels2/src/label-line.c
index 9a2f6a7..25c120d 100644
--- a/glabels2/src/label-line.c
+++ b/glabels2/src/label-line.c
@@ -20,10 +20,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#include <glib.h>
-
 #include "label-line.h"
 
+#include <glib/gmem.h>
+#include <glib/gstrfuncs.h>
+#include <glib/gmessages.h>
+
 #include "debug.h"
 
 /*========================================================*/
diff --git a/glabels2/src/label-object.c b/glabels2/src/label-object.c
index bcda655..3607665 100644
--- a/glabels2/src/label-object.c
+++ b/glabels2/src/label-object.c
@@ -21,10 +21,13 @@
  */
 #include <config.h>
 
-#include <glib.h>
+#include "label-object.h"
+
+#include <glib/gmem.h>
+#include <glib/gstrfuncs.h>
+#include <glib/gmessages.h>
 #include <libart_lgpl/libart.h>
 
-#include "label-object.h"
 #include "marshal.h"
 
 #include "debug.h"
diff --git a/glabels2/src/label-text.c b/glabels2/src/label-text.c
index 34ad7ca..e03783b 100644
--- a/glabels2/src/label-text.c
+++ b/glabels2/src/label-text.c
@@ -20,12 +20,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#include <glib.h>
-#include <libgnomeprint/gnome-glyphlist.h>
-
 #include "label-text.h"
 
-#include "pixmaps/checkerboard.xpm"
+#include <glib/gmem.h>
+#include <glib/gstrfuncs.h>
+#include <glib/gmessages.h>
+#include <libgnomeprint/gnome-glyphlist.h>
 
 #include "debug.h"
 
diff --git a/glabels2/src/label-text.h b/glabels2/src/label-text.h
index abf6fdb..57deadb 100644
--- a/glabels2/src/label-text.h
+++ b/glabels2/src/label-text.h
@@ -24,6 +24,7 @@
 #define __LABEL_TEXT_H__
 
 #include <gtk/gtkenums.h>
+#include <gtk/gtktextbuffer.h>
 #include <libgnomeprint/gnome-font.h>
 #include "text-node.h"
 #include "label-object.h"
diff --git a/glabels2/src/label.c b/glabels2/src/label.c
index 678427f..2497ab2 100644
--- a/glabels2/src/label.c
+++ b/glabels2/src/label.c
@@ -22,10 +22,10 @@
 
 #include <config.h>
 
+#include "label.h"
+
 #include <glib/gi18n.h>
 
-#include "label.h"
-#include "label-object.h"
 #include "marshal.h"
 #include "util.h"
 
diff --git a/glabels2/src/merge-properties-dialog.c b/glabels2/src/merge-properties-dialog.c
index 120a132..0a90d8f 100644
--- a/glabels2/src/merge-properties-dialog.c
+++ b/glabels2/src/merge-properties-dialog.c
@@ -27,6 +27,11 @@
 #include <glade/glade-xml.h>
 #include <gtk/gtkfilechooserbutton.h>
 #include <gtk/gtkcombobox.h>
+#include <gtk/gtkstock.h>
+#include <gtk/gtktreestore.h>
+#include <gtk/gtkcellrenderertoggle.h>
+#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtklabel.h>
 
 #include "view.h"
 #include "merge.h"
diff --git a/glabels2/src/object-editor-bc-page.c b/glabels2/src/object-editor-bc-page.c
index 66728e9..b026ef8 100644
--- a/glabels2/src/object-editor-bc-page.c
+++ b/glabels2/src/object-editor-bc-page.c
@@ -21,10 +21,16 @@
  */
 #include <config.h>
 
-#include <gnome.h>
+#include "object-editor.h"
+
+#include <glib/gi18n.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkspinbutton.h>
+#include <gtk/gtkcombo.h>
+#include <gtk/gtktogglebutton.h>
+#include <gtk/gtkeditable.h>
 #include <math.h>
 
-#include "object-editor.h"
 #include "prefs.h"
 #include "mygal/widget-color-combo.h"
 #include "color.h"
diff --git a/glabels2/src/object-editor-data-page.c b/glabels2/src/object-editor-data-page.c
index 87663a7..518f161 100644
--- a/glabels2/src/object-editor-data-page.c
+++ b/glabels2/src/object-editor-data-page.c
@@ -21,10 +21,13 @@
  */
 #include <config.h>
 
-#include <gnome.h>
+#include "object-editor.h"
+
+#include <glib/gi18n.h>
+#include <gtk/gtkeditable.h>
+#include <gtk/gtktogglebutton.h>
 #include <math.h>
 
-#include "object-editor.h"
 #include "prefs.h"
 
 #include "object-editor-private.h"
diff --git a/glabels2/src/object-editor-edit-page.c b/glabels2/src/object-editor-edit-page.c
index 4e01071..d9e25ea 100644
--- a/glabels2/src/object-editor-edit-page.c
+++ b/glabels2/src/object-editor-edit-page.c
@@ -21,10 +21,14 @@
  */
 #include <config.h>
 
-#include <gnome.h>
+#include "object-editor.h"
+
+#include <glib/gi18n.h>
+#include <gtk/gtksizegroup.h>
+#include <gtk/gtkeditable.h>
+#include <gtk/gtktextview.h>
 #include <math.h>
 
-#include "object-editor.h"
 #include "prefs.h"
 #include "mygal/widget-color-combo.h"
 #include "color.h"
diff --git a/glabels2/src/object-editor-fill-page.c b/glabels2/src/object-editor-fill-page.c
index e2a9418..8f26463 100644
--- a/glabels2/src/object-editor-fill-page.c
+++ b/glabels2/src/object-editor-fill-page.c
@@ -21,10 +21,13 @@
  */
 #include <config.h>
 
-#include <gnome.h>
+#include "object-editor.h"
+
+#include <glib/gi18n.h>
+#include <gtk/gtktogglebutton.h>
+#include <gtk/gtkeditable.h>
 #include <math.h>
 
-#include "object-editor.h"
 #include "prefs.h"
 #include "mygal/widget-color-combo.h"
 #include "color.h"
diff --git a/glabels2/src/object-editor-image-page.c b/glabels2/src/object-editor-image-page.c
index e970483..114e29e 100644
--- a/glabels2/src/object-editor-image-page.c
+++ b/glabels2/src/object-editor-image-page.c
@@ -21,11 +21,15 @@
  */
 #include <config.h>
 
-#include <gnome.h>
-#include <math.h>
+#include "object-editor.h"
+
+#include <glib/gi18n.h>
 #include <gtk/gtkimage.h>
+#include <gtk/gtkfilechooserbutton.h>
+#include <gtk/gtkeditable.h>
+#include <gtk/gtktogglebutton.h>
+#include <math.h>
 
-#include "object-editor.h"
 #include "prefs.h"
 
 #include "object-editor-private.h"
diff --git a/glabels2/src/object-editor-line-page.c b/glabels2/src/object-editor-line-page.c
index 6512a76..5e03bec 100644
--- a/glabels2/src/object-editor-line-page.c
+++ b/glabels2/src/object-editor-line-page.c
@@ -21,10 +21,16 @@
  */
 #include <config.h>
 
-#include <gnome.h>
+#include "object-editor.h"
+
+#include <glib/gi18n.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkspinbutton.h>
+#include <gtk/gtkcombo.h>
+#include <gtk/gtktogglebutton.h>
+#include <gtk/gtkeditable.h>
 #include <math.h>
 
-#include "object-editor.h"
 #include "prefs.h"
 #include "mygal/widget-color-combo.h"
 #include "color.h"
diff --git a/glabels2/src/object-editor-lsize-page.c b/glabels2/src/object-editor-lsize-page.c
index 0731899..fb3861f 100644
--- a/glabels2/src/object-editor-lsize-page.c
+++ b/glabels2/src/object-editor-lsize-page.c
@@ -21,10 +21,13 @@
  */
 #include <config.h>
 
-#include <gnome.h>
+#include "object-editor.h"
+
+#include <glib/gi18n.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkspinbutton.h>
 #include <math.h>
 
-#include "object-editor.h"
 #include "prefs.h"
 
 #include "object-editor-private.h"
diff --git a/glabels2/src/object-editor-position-page.c b/glabels2/src/object-editor-position-page.c
index 1ccdadb..96b061d 100644
--- a/glabels2/src/object-editor-position-page.c
+++ b/glabels2/src/object-editor-position-page.c
@@ -21,10 +21,13 @@
  */
 #include <config.h>
 
-#include <gnome.h>
+#include "object-editor.h"
+
+#include <glib/gi18n.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkspinbutton.h>
 #include <math.h>
 
-#include "object-editor.h"
 #include "prefs.h"
 
 #include "object-editor-private.h"
diff --git a/glabels2/src/object-editor-private.h b/glabels2/src/object-editor-private.h
index 4c14031..b8f4afc 100644
--- a/glabels2/src/object-editor-private.h
+++ b/glabels2/src/object-editor-private.h
@@ -22,7 +22,7 @@
 #ifndef __OBJECT_EDITOR_PRIVATE_H__
 #define __OBJECT_EDITOR_PRIVATE_H__
 
-#include <gtk/gtk.h>
+#include <gtk/gtkwidget.h>
 #include <glade/glade-xml.h>
 
 G_BEGIN_DECLS
diff --git a/glabels2/src/object-editor-size-page.c b/glabels2/src/object-editor-size-page.c
index 3072838..c250e73 100644
--- a/glabels2/src/object-editor-size-page.c
+++ b/glabels2/src/object-editor-size-page.c
@@ -21,10 +21,13 @@
  */
 #include <config.h>
 
-#include <gnome.h>
+#include "object-editor.h"
+
+#include <glib/gi18n.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkspinbutton.h>
 #include <math.h>
 
-#include "object-editor.h"
 #include "prefs.h"
 #include "wdgt-chain-button.h"
 
diff --git a/glabels2/src/object-editor-text-page.c b/glabels2/src/object-editor-text-page.c
index def7b11..c6d3fc5 100644
--- a/glabels2/src/object-editor-text-page.c
+++ b/glabels2/src/object-editor-text-page.c
@@ -21,10 +21,15 @@
  */
 #include <config.h>
 
-#include <gnome.h>
+#include "object-editor.h"
+
+#include <glib/gi18n.h>
+#include <gtk/gtktogglebutton.h>
+#include <gtk/gtkspinbutton.h>
+#include <gtk/gtkcombo.h>
+#include <gtk/gtkeditable.h>
 #include <math.h>
 
-#include "object-editor.h"
 #include "prefs.h"
 #include "mygal/widget-color-combo.h"
 #include "color.h"
diff --git a/glabels2/src/object-editor.c b/glabels2/src/object-editor.c
index ac4f08f..107428f 100644
--- a/glabels2/src/object-editor.c
+++ b/glabels2/src/object-editor.c
@@ -21,11 +21,17 @@
  */
 #include <config.h>
 
+#include "object-editor.h"
+
 #include <glib/gi18n.h>
 #include <glade/glade-xml.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtknotebook.h>
+#include <gtk/gtkcombo.h>
+#include <gtk/gtktogglebutton.h>
+
 #include <math.h>
 
-#include "object-editor.h"
 #include "prefs.h"
 #include "mygal/widget-color-combo.h"
 #include "color.h"
diff --git a/glabels2/src/object-editor.h b/glabels2/src/object-editor.h
index fa9aa11..d95bb63 100644
--- a/glabels2/src/object-editor.h
+++ b/glabels2/src/object-editor.h
@@ -22,13 +22,15 @@
 #ifndef __OBJECT_EDITOR_H__
 #define __OBJECT_EDITOR_H__
 
-#include <gtk/gtk.h>
+#include <gtk/gtkvbox.h>
+#include <gtk/gtkenums.h>
+#include <libgnomeprint/gnome-font.h>
+#include <gtk/gtktextbuffer.h>
+
 #include "text-node.h"
 #include "merge.h"
 #include "bc.h"
 #include "color.h"
-#include <gtk/gtkenums.h>
-#include <libgnomeprint/gnome-font.h>
 
 G_BEGIN_DECLS
 
diff --git a/glabels2/src/pixbuf-cache.h b/glabels2/src/pixbuf-cache.h
index 33d7673..51d0550 100644
--- a/glabels2/src/pixbuf-cache.h
+++ b/glabels2/src/pixbuf-cache.h
@@ -22,7 +22,8 @@
 #ifndef __PIXBUF_CACHE_H__
 #define __PIXBUF_CACHE_H__
 
-#include <glib.h>
+#include <glib/gmem.h>
+#include <glib/ghash.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 G_BEGIN_DECLS
diff --git a/glabels2/src/prefs-dialog.c b/glabels2/src/prefs-dialog.c
index b5f43dd..43a3d6c 100644
--- a/glabels2/src/prefs-dialog.c
+++ b/glabels2/src/prefs-dialog.c
@@ -21,12 +21,17 @@
  */
 #include <config.h>
 
+#include "prefs-dialog.h"
+
 #include <glib/gi18n.h>
-#include <libgnome/libgnome.h>
-#include <libgnomeui/libgnomeui.h>
+#include <libgnomeprint/gnome-font.h>
 #include <glade/glade-xml.h>
+#include <gtk/gtktogglebutton.h>
+#include <gtk/gtkstock.h>
+#include <gtk/gtkcombo.h>
+#include <gtk/gtkentry.h>
+#include <gtk/gtkspinbutton.h>
 
-#include "prefs-dialog.h"
 #include "prefs.h"
 #include "mygal/widget-color-combo.h"
 #include "color.h"
diff --git a/glabels2/src/prefs-dialog.h b/glabels2/src/prefs-dialog.h
index 16be052..bc33a64 100644
--- a/glabels2/src/prefs-dialog.h
+++ b/glabels2/src/prefs-dialog.h
@@ -23,7 +23,7 @@
 #ifndef __PREFS_DIALOG_H__
 #define __PREFS_DIALOG_H__
 
-#include <gtk/gtk.h>
+#include <gtk/gtkwindow.h>
 #include "hig.h"
 
 G_BEGIN_DECLS
diff --git a/glabels2/src/prefs-model.c b/glabels2/src/prefs-model.c
index f9437c6..333f57f 100644
--- a/glabels2/src/prefs-model.c
+++ b/glabels2/src/prefs-model.c
@@ -21,11 +21,12 @@
  */
 #include <config.h>
 
+#include "prefs-model.h"
+
+#include <libglabels/paper.h>
 
 #include "marshal.h"
-#include "prefs-model.h"
 #include "util.h"
-#include <libglabels/paper.h>
 #include "color.h"
 
 #include "debug.h"
diff --git a/glabels2/src/prefs-model.h b/glabels2/src/prefs-model.h
index 4693791..b298309 100644
--- a/glabels2/src/prefs-model.h
+++ b/glabels2/src/prefs-model.h
@@ -23,7 +23,7 @@
 #define __PREFS_MODEL_H__
 
 #include <glib-object.h>
-#include <gtk/gtk.h>
+#include <gtk/gtkenums.h>
 #include <gconf/gconf-client.h>
 #include <libgnomeprint/gnome-font.h>
 #include <libglabels/enums.h>
diff --git a/glabels2/src/prefs.c b/glabels2/src/prefs.c
index 9dc5979..b564815 100644
--- a/glabels2/src/prefs.c
+++ b/glabels2/src/prefs.c
@@ -21,9 +21,9 @@
  */
 #include <config.h>
 
-#include <glib/gi18n.h>
+#include "prefs.h"
 
-#include "prefs-model.h"
+#include <glib/gi18n.h>
 
 #include "debug.h"
 
diff --git a/glabels2/src/print-dialog.c b/glabels2/src/print-dialog.c
index f0d9de3..a1240c9 100644
--- a/glabels2/src/print-dialog.c
+++ b/glabels2/src/print-dialog.c
@@ -21,16 +21,18 @@
  */
 #include <config.h>
 
+#include "print-dialog.h"
+
 #include <glib/gi18n.h>
 #include <math.h>
 #include <time.h>
 #include <ctype.h>
-#include <gtk/gtk.h>
+#include <gtk/gtkdialog.h>
+#include <gtk/gtknotebook.h>
 #include <libgnomeprintui/gnome-print-dialog.h>
 #include <libgnomeprint/gnome-print-job.h>
 #include <libgnomeprintui/gnome-print-job-preview.h>
 
-#include "print-dialog.h"
 #include "print.h"
 #include "label.h"
 
diff --git a/glabels2/src/print-dialog.h b/glabels2/src/print-dialog.h
index 0ccfc71..efbce89 100644
--- a/glabels2/src/print-dialog.h
+++ b/glabels2/src/print-dialog.h
@@ -22,7 +22,6 @@
 #ifndef __PRINT_DIALOG_H__
 #define __PRINT_DIALOG_H__
 
-#include <gtk/gtk.h>
 #include <bonobo/bonobo-window.h>
 #include "hig.h"
 #include "view.h"
diff --git a/glabels2/src/print.c b/glabels2/src/print.c
index 573ef14..83f5599 100644
--- a/glabels2/src/print.c
+++ b/glabels2/src/print.c
@@ -21,13 +21,14 @@
  */
 #include <config.h>
 
+#include "print.h"
+
 #include <glib/gi18n.h>
 #include <math.h>
 #include <time.h>
 #include <ctype.h>
-#include <gtk/gtk.h>
+#include <gtk/gtkenums.h>
 
-#include "print.h"
 #include "label.h"
 #include "label-text.h"
 #include "label-box.h"
diff --git a/glabels2/src/print.h b/glabels2/src/print.h
index 6e9b583..d19a385 100644
--- a/glabels2/src/print.h
+++ b/glabels2/src/print.h
@@ -22,7 +22,6 @@
 #ifndef __PRINT_H__
 #define __PRINT_H__
 
-#include <gnome.h>
 #include <libgnomeprint/gnome-print-job.h>
 
 #include "label.h"
diff --git a/glabels2/src/recent.c b/glabels2/src/recent.c
index cac3426..1559b34 100644
--- a/glabels2/src/recent.c
+++ b/glabels2/src/recent.c
@@ -21,8 +21,8 @@
  */
 #include <config.h>
 
-
 #include "recent.h"
+
 #include "prefs.h"
 
 #include "debug.h"
diff --git a/glabels2/src/recent.h b/glabels2/src/recent.h
index d361699..db61a57 100644
--- a/glabels2/src/recent.h
+++ b/glabels2/src/recent.h
@@ -24,11 +24,14 @@
 
 #include "recent-files/egg-recent-model.h"
 
+G_BEGIN_DECLS
 
 gchar * 		gl_recent_get_filename (EggRecentItem *item);
 void			gl_recent_add_uri (gchar *uri);
 EggRecentModel * 	gl_recent_get_model (void);
 void               	gl_recent_init (void);
 
+G_END_DECLS
+
 #endif /*__RECENT_H__*/
 
diff --git a/glabels2/src/splash.c b/glabels2/src/splash.c
index 83e18d3..a4eb296 100644
--- a/glabels2/src/splash.c
+++ b/glabels2/src/splash.c
@@ -20,13 +20,18 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#include "config.h"
-
-#include <gtk/gtk.h>
-#include <libgnome/libgnome.h>
+#include <config.h>
 
 #include "splash.h"
 
+#include <gtk/gtkwindow.h>
+#include <gtk/gtkframe.h>
+#include <gtk/gtkvbox.h>
+#include <gtk/gtkhbox.h>
+#include <gtk/gtkimage.h>
+#include <gtk/gtklabel.h>
+#include <libgnome/gnome-util.h>
+
 #define SPLASH_PIXMAP gnome_program_locate_file (NULL,\
 						 GNOME_FILE_DOMAIN_APP_PIXMAP,\
 						 "glabels/glabels-splash.png",\
diff --git a/glabels2/src/splash.h b/glabels2/src/splash.h
index 25cd5b6..70128ae 100644
--- a/glabels2/src/splash.h
+++ b/glabels2/src/splash.h
@@ -23,6 +23,12 @@
 #ifndef __SPLASH_H__
 #define __SPLASH_H__
 
+#include <glib/gmacros.h>
+
+G_BEGIN_DECLS
+
 void gl_splash (void);
 
+G_END_DECLS
+
 #endif
diff --git a/glabels2/src/stock.h b/glabels2/src/stock.h
index 96d975d..70e2bd0 100644
--- a/glabels2/src/stock.h
+++ b/glabels2/src/stock.h
@@ -23,6 +23,10 @@
 #ifndef __STOCK_H__
 #define __STOCK_H__
 
+#include <glib/gmacros.h>
+
+G_BEGIN_DECLS
+
 /* Stock names */
 
 #define GL_STOCK_ARROW         "gl_stock_arrow"
@@ -57,4 +61,6 @@
 
 void gl_stock_init (void);
 
+G_END_DECLS
+
 #endif
diff --git a/glabels2/src/template-designer.c b/glabels2/src/template-designer.c
index 22f4f5f..e2740db 100644
--- a/glabels2/src/template-designer.c
+++ b/glabels2/src/template-designer.c
@@ -21,13 +21,20 @@
  */
 #include <config.h>
 
+#include "template-designer.h"
+
 #include <glib/gi18n.h>
 #include <math.h>
-#include <libgnome/libgnome.h>
-#include <libgnomeui/libgnomeui.h>
 #include <glade/glade-xml.h>
+#include <libgnome/gnome-program.h>
+#include <libgnomeui/gnome-druid.h>
+#include <libgnomeui/gnome-druid-page-edge.h>
+#include <libgnomeui/gnome-druid-page-standard.h>
+#include <gtk/gtktogglebutton.h>
+#include <gtk/gtkcombo.h>
+#include <gtk/gtkentry.h>
+#include <gtk/gtkspinbutton.h>
 
-#include "template-designer.h"
 #include "prefs.h"
 #include <libglabels/paper.h>
 #include <libglabels/template.h>
diff --git a/glabels2/src/template-designer.h b/glabels2/src/template-designer.h
index 5cea341..8c03dfa 100644
--- a/glabels2/src/template-designer.h
+++ b/glabels2/src/template-designer.h
@@ -23,7 +23,7 @@
 #ifndef __TEMPLATE_DESIGNER_H__
 #define __TEMPLATE_DESIGNER_H__
 
-#include <gtk/gtk.h>
+#include <gtk/gtkwindow.h>
 
 G_BEGIN_DECLS
 
diff --git a/glabels2/src/text-node.h b/glabels2/src/text-node.h
index b7d06f2..47a6293 100644
--- a/glabels2/src/text-node.h
+++ b/glabels2/src/text-node.h
@@ -22,7 +22,8 @@
 #ifndef __TEXT_NODE_H__
 #define __TEXT_NODE_H__
 
-#include <gnome.h>
+#include <glib/gtypes.h>
+#include <glib/glist.h>
 #include "merge.h"
 
 G_BEGIN_DECLS
diff --git a/glabels2/src/tools.c b/glabels2/src/tools.c
index d1a745e..98f2361 100644
--- a/glabels2/src/tools.c
+++ b/glabels2/src/tools.c
@@ -23,6 +23,7 @@
 #include <config.h>
 
 #include "tools.h"
+
 #include "window.h"
 
 /*===========================================*/
diff --git a/glabels2/src/ui-property-bar.c b/glabels2/src/ui-property-bar.c
index 640ea54..64cac18 100644
--- a/glabels2/src/ui-property-bar.c
+++ b/glabels2/src/ui-property-bar.c
@@ -22,10 +22,13 @@
 
 #include <config.h>
 
+#include "ui-property-bar.h"
+
 #include <glib/gi18n.h>
+#include <gtk/gtkcombobox.h>
+#include <gtk/gtkspinbutton.h>
 #include <libgnomeprint/gnome-font.h>
 
-#include "ui-property-bar.h"
 #include "ui-util.h"
 #include "mygal/widget-color-combo.h"
 #include "stock-pixmaps/stockpixbufs.h"
@@ -274,11 +277,11 @@ gl_ui_property_bar_construct (glUIPropertyBar   *property_bar,
 					  gl_prefs->default_font_family,
 					  (GCompareFunc)g_utf8_collate);
 	if (family_node) {
-		gtk_combo_box_set_active (wcombo,
+		gtk_combo_box_set_active (GTK_COMBO_BOX (wcombo),
 					  g_list_position (family_names,
 							   family_node));
 	} else {
-		gtk_combo_box_set_active (wcombo, 0);
+		gtk_combo_box_set_active (GTK_COMBO_BOX (wcombo), 0);
 	}
 	gnome_font_family_list_free (family_names);
 
diff --git a/glabels2/src/ui-sidebar.c b/glabels2/src/ui-sidebar.c
index 90f0d70..6ee0324 100644
--- a/glabels2/src/ui-sidebar.c
+++ b/glabels2/src/ui-sidebar.c
@@ -22,10 +22,11 @@
 
 #include <config.h>
 
+#include "ui-sidebar.h"
+
 #include <glib/gi18n.h>
 #include <libgnomeprint/gnome-font.h>
 
-#include "ui-sidebar.h"
 #include "ui-util.h"
 #include "object-editor.h"
 #include "stock.h"
diff --git a/glabels2/src/ui-util.c b/glabels2/src/ui-util.c
index bdb9af7..0a1420c 100644
--- a/glabels2/src/ui-util.c
+++ b/glabels2/src/ui-util.c
@@ -20,10 +20,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 #include <config.h>
-#include <bonobo/bonobo-control.h>
 
 #include "ui-util.h"
 
+#include <bonobo/bonobo-control.h>
+
 #include "debug.h"
 
 /*==========================================================================*/
diff --git a/glabels2/src/ui.c b/glabels2/src/ui.c
index 184840a..47c69af 100644
--- a/glabels2/src/ui.c
+++ b/glabels2/src/ui.c
@@ -21,11 +21,12 @@
  */
 #include <config.h>
 
+#include "ui.h"
+
 #include "recent-files/egg-recent-view.h"
 #include "recent-files/egg-recent-view-bonobo.h"
 #include <gconf/gconf-client.h>
 
-#include "ui.h"
 #include "ui-util.h"
 #include "commands.h"
 #include "tools.h"
diff --git a/glabels2/src/util.c b/glabels2/src/util.c
index 7678233..cc4ad97 100644
--- a/glabels2/src/util.c
+++ b/glabels2/src/util.c
@@ -28,6 +28,9 @@
 #include <glib.h>
 #include <math.h>
 #include <libgnomeprint/gnome-font.h>
+#include <gtk/gtkliststore.h>
+#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtkcelllayout.h>
 
 #define FRAC_EPSILON 0.00005
 
diff --git a/glabels2/src/util.h b/glabels2/src/util.h
index cef32b6..7b55867 100644
--- a/glabels2/src/util.h
+++ b/glabels2/src/util.h
@@ -23,7 +23,8 @@
 #ifndef __UTIL_H__
 #define __UTIL_H__
 
-#include <gtk/gtk.h>
+#include <gtk/gtkenums.h>
+#include <gtk/gtkcombobox.h>
 #include <libgnomeprint/gnome-font.h>
 
 G_BEGIN_DECLS
diff --git a/glabels2/src/view-barcode.c b/glabels2/src/view-barcode.c
index 70f9d4e..b1af536 100644
--- a/glabels2/src/view-barcode.c
+++ b/glabels2/src/view-barcode.c
@@ -21,14 +21,16 @@
  */
 #include <config.h>
 
-#include <glib.h>
+#include "view-barcode.h"
+
 #include <glib/gi18n.h>
+#include <glib/gmem.h>
+#include <glib/glist.h>
+#include <gtk/gtkmenu.h>
 #include <libgnomeprint/gnome-glyphlist.h>
 
-#include "view-barcode.h"
 #include "canvas-hacktext.h"
 #include "view-highlight.h"
-
 #include "color.h"
 #include "object-editor.h"
 #include "stock.h"
diff --git a/glabels2/src/view-box.c b/glabels2/src/view-box.c
index bd05217..655cdca 100644
--- a/glabels2/src/view-box.c
+++ b/glabels2/src/view-box.c
@@ -21,12 +21,12 @@
  */
 #include <config.h>
 
-#include <glib.h>
+#include "view-box.h"
+
 #include <glib/gi18n.h>
+#include <glib/gmem.h>
 
-#include "view-box.h"
 #include "view-highlight.h"
-
 #include "color.h"
 #include "object-editor.h"
 #include "stock.h"
diff --git a/glabels2/src/view-ellipse.c b/glabels2/src/view-ellipse.c
index e8d99bb..b5d2250 100644
--- a/glabels2/src/view-ellipse.c
+++ b/glabels2/src/view-ellipse.c
@@ -21,12 +21,12 @@
  */
 #include <config.h>
 
-#include <glib.h>
+#include "view-ellipse.h"
+
 #include <glib/gi18n.h>
+#include <glib/gmem.h>
 
-#include "view-ellipse.h"
 #include "view-highlight.h"
-
 #include "color.h"
 #include "object-editor.h"
 #include "stock.h"
diff --git a/glabels2/src/view-highlight.c b/glabels2/src/view-highlight.c
index 7bd596c..9103033 100644
--- a/glabels2/src/view-highlight.c
+++ b/glabels2/src/view-highlight.c
@@ -22,10 +22,10 @@
 
 #include <config.h>
 
-#include <math.h>
-
 #include "view-highlight.h"
 
+#include <math.h>
+
 #include "debug.h"
 
 /*===========================================*/
diff --git a/glabels2/src/view-highlight.h b/glabels2/src/view-highlight.h
index fceb40e..d49987d 100644
--- a/glabels2/src/view-highlight.h
+++ b/glabels2/src/view-highlight.h
@@ -22,8 +22,6 @@
 #ifndef __VIEW_HIGHLIGHT_H__
 #define __VIEW_HIGHLIGHT_H__
 
-#include <gnome.h>
-
 typedef enum {
 	GL_VIEW_HIGHLIGHT_BOX_RESIZABLE,
 	GL_VIEW_HIGHLIGHT_ELLIPSE_RESIZABLE,
diff --git a/glabels2/src/view-image.c b/glabels2/src/view-image.c
index 42f3ab0..7d95aeb 100644
--- a/glabels2/src/view-image.c
+++ b/glabels2/src/view-image.c
@@ -21,12 +21,12 @@
  */
 #include <config.h>
 
-#include <glib.h>
+#include "view-image.h"
+
 #include <glib/gi18n.h>
+#include <glib/gmem.h>
 
-#include "view-image.h"
 #include "view-highlight.h"
-
 #include "color.h"
 #include "object-editor.h"
 #include "stock.h"
diff --git a/glabels2/src/view-line.c b/glabels2/src/view-line.c
index 3c2b9f8..90fc19e 100644
--- a/glabels2/src/view-line.c
+++ b/glabels2/src/view-line.c
@@ -21,12 +21,12 @@
  */
 #include <config.h>
 
-#include <glib.h>
+#include "view-line.h"
+
 #include <glib/gi18n.h>
+#include <glib/gmem.h>
 
-#include "view-line.h"
 #include "view-highlight.h"
-
 #include "color.h"
 #include "object-editor.h"
 #include "stock.h"
diff --git a/glabels2/src/view-object.c b/glabels2/src/view-object.c
index 7f218ad..95b41b7 100644
--- a/glabels2/src/view-object.c
+++ b/glabels2/src/view-object.c
@@ -23,6 +23,7 @@
 #include <glib.h>
 
 #include "view-object.h"
+
 #include "libart_lgpl/libart.h"
 
 #include "debug.h"
diff --git a/glabels2/src/view-object.h b/glabels2/src/view-object.h
index 0559a88..c2451ba 100644
--- a/glabels2/src/view-object.h
+++ b/glabels2/src/view-object.h
@@ -24,7 +24,6 @@
 #define __VIEW_OBJECT_H__
 
 #include <glib-object.h>
-#include <gnome.h>
 #include "label-object.h"
 
 #define GL_TYPE_VIEW_OBJECT              (gl_view_object_get_type ())
diff --git a/glabels2/src/view-text.c b/glabels2/src/view-text.c
index f6c5bfd..2f66ddb 100644
--- a/glabels2/src/view-text.c
+++ b/glabels2/src/view-text.c
@@ -21,11 +21,13 @@
  */
 #include <config.h>
 
-#include <glib.h>
+#include "view-text.h"
+
 #include <glib/gi18n.h>
+#include <glib/gmem.h>
+#include <gtk/gtkmenu.h>
 #include <libgnomeprint/gnome-glyphlist.h>
 
-#include "view-text.h"
 #include "canvas-hacktext.h"
 #include "view-highlight.h"
 
diff --git a/glabels2/src/view.c b/glabels2/src/view.c
index 1b96201..ec7b854 100644
--- a/glabels2/src/view.c
+++ b/glabels2/src/view.c
@@ -22,13 +22,19 @@
 
 #include <config.h>
 
+#include "view.h"
+
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
+#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtkselection.h>
 #include <gtk/gtkinvisible.h>
+#include <gtk/gtkmenu.h>
+#include <gtk/gtkimagemenuitem.h>
+#include <gtk/gtkstock.h>
+#include <gdk/gdkkeysyms.h>
 #include <string.h>
 #include <math.h>
 
-#include "view.h"
 #include "view-object.h"
 #include "view-box.h"
 #include "view-ellipse.h"
diff --git a/glabels2/src/view.h b/glabels2/src/view.h
index 6bed15a..d4a453b 100644
--- a/glabels2/src/view.h
+++ b/glabels2/src/view.h
@@ -23,7 +23,8 @@
 #ifndef __VIEW_H__
 #define __VIEW_H__
 
-#include <gtk/gtk.h>
+#include <gtk/gtkvbox.h>
+#include <gtk/gtkenums.h>
 #include <libgnomecanvas/libgnomecanvas.h>
 #include <libgnomeprint/gnome-font.h>
 
diff --git a/glabels2/src/wdgt-chain-button.c b/glabels2/src/wdgt-chain-button.c
index 9407c6d..8616e0b 100644
--- a/glabels2/src/wdgt-chain-button.c
+++ b/glabels2/src/wdgt-chain-button.c
@@ -25,9 +25,12 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gtk/gtk.h>
-
 #include "wdgt-chain-button.h"
+
+#include <gtk/gtkdrawingarea.h>
+#include <gtk/gtkimage.h>
+#include <gtk/gtkbutton.h>
+
 #include "stock.h"
 
 
diff --git a/glabels2/src/wdgt-media-select.c b/glabels2/src/wdgt-media-select.c
index 1870650..6a9ef94 100644
--- a/glabels2/src/wdgt-media-select.c
+++ b/glabels2/src/wdgt-media-select.c
@@ -22,9 +22,14 @@
 
 #include <config.h>
 
+#include "wdgt-media-select.h"
+
 #include <glib/gi18n.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkcombo.h>
+#include <gtk/gtkentry.h>
+#include <gtk/gtksizegroup.h>
 
-#include "wdgt-media-select.h"
 #include "hig.h"
 #include "wdgt-mini-preview.h"
 #include "prefs.h"
diff --git a/glabels2/src/wdgt-media-select.h b/glabels2/src/wdgt-media-select.h
index 3d9f053..4fcbdc3 100644
--- a/glabels2/src/wdgt-media-select.h
+++ b/glabels2/src/wdgt-media-select.h
@@ -23,7 +23,6 @@
 #ifndef __WDGT_MEDIA_SELECT_H__
 #define __WDGT_MEDIA_SELECT_H__
 
-#include <gnome.h>
 #include "hig.h"
 
 G_BEGIN_DECLS
diff --git a/glabels2/src/wdgt-mini-preview.c b/glabels2/src/wdgt-mini-preview.c
index c747543..255954a 100644
--- a/glabels2/src/wdgt-mini-preview.c
+++ b/glabels2/src/wdgt-mini-preview.c
@@ -22,9 +22,11 @@
 
 #include <config.h>
 
+#include "wdgt-mini-preview.h"
+
+#include <libgnomecanvas/gnome-canvas-util.h>
 #include <math.h>
 
-#include "wdgt-mini-preview.h"
 #include "marshal.h"
 #include "color.h"
 
diff --git a/glabels2/src/wdgt-mini-preview.h b/glabels2/src/wdgt-mini-preview.h
index 9c3a9e6..9a39bfc 100644
--- a/glabels2/src/wdgt-mini-preview.h
+++ b/glabels2/src/wdgt-mini-preview.h
@@ -23,7 +23,8 @@
 #ifndef __WDGT_MINI_PREVIEW_H__
 #define __WDGT_MINI_PREVIEW_H__
 
-#include <gnome.h>
+#include <gtk/gtkhbox.h>
+#include <libgnomecanvas/gnome-canvas.h>
 #include "label.h"
 
 G_BEGIN_DECLS
diff --git a/glabels2/src/wdgt-print-copies.c b/glabels2/src/wdgt-print-copies.c
index d98e93e..2cdded6 100644
--- a/glabels2/src/wdgt-print-copies.c
+++ b/glabels2/src/wdgt-print-copies.c
@@ -22,9 +22,14 @@
 
 #include <config.h>
 
+#include "wdgt-print-copies.h"
+
 #include <glib/gi18n.h>
+#include <gtk/gtktogglebutton.h>
+#include <gtk/gtkspinbutton.h>
+#include <gtk/gtkradiobutton.h>
+#include <gtk/gtklabel.h>
 
-#include "wdgt-print-copies.h"
 #include "wdgt-mini-preview.h"
 #include "marshal.h"
 
diff --git a/glabels2/src/wdgt-print-copies.h b/glabels2/src/wdgt-print-copies.h
index dd6dacc..9185b9f 100644
--- a/glabels2/src/wdgt-print-copies.h
+++ b/glabels2/src/wdgt-print-copies.h
@@ -23,7 +23,6 @@
 #ifndef __WDGT_PRINT_COPIES_H__
 #define __WDGT_PRINT_COPIES_H__
 
-#include <gnome.h>
 #include "label.h"
 #include "hig.h"
 
diff --git a/glabels2/src/wdgt-print-merge.c b/glabels2/src/wdgt-print-merge.c
index 578863a..1ecf8d6 100644
--- a/glabels2/src/wdgt-print-merge.c
+++ b/glabels2/src/wdgt-print-merge.c
@@ -22,9 +22,15 @@
 
 #include <config.h>
 
+#include "wdgt-print-merge.h"
+
 #include <glib/gi18n.h>
+#include <gtk/gtktogglebutton.h>
+#include <gtk/gtkspinbutton.h>
+#include <gtk/gtkcheckbutton.h>
+#include <gtk/gtklabel.h>
+
 
-#include "wdgt-print-merge.h"
 #include "wdgt-mini-preview.h"
 #include "marshal.h"
 
diff --git a/glabels2/src/wdgt-print-merge.h b/glabels2/src/wdgt-print-merge.h
index 2b6adf5..378bae4 100644
--- a/glabels2/src/wdgt-print-merge.h
+++ b/glabels2/src/wdgt-print-merge.h
@@ -23,7 +23,6 @@
 #ifndef __WDGT_PRINT_MERGE_H__
 #define __WDGT_PRINT_MERGE_H__
 
-#include <gnome.h>
 #include "label.h"
 #include "hig.h"
 
diff --git a/glabels2/src/wdgt-rotate-label.c b/glabels2/src/wdgt-rotate-label.c
index ba9d35a..9d60bf7 100644
--- a/glabels2/src/wdgt-rotate-label.c
+++ b/glabels2/src/wdgt-rotate-label.c
@@ -22,10 +22,14 @@
 
 #include <config.h>
 
+#include "wdgt-rotate-label.h"
+
 #include <glib/gi18n.h>
+#include <gtk/gtktogglebutton.h>
+#include <gtk/gtkcheckbutton.h>
+#include <libgnomecanvas/gnome-canvas-util.h>
 #include <math.h>
 
-#include "wdgt-rotate-label.h"
 #include "hig.h"
 #include "marshal.h"
 #include "color.h"
diff --git a/glabels2/src/wdgt-rotate-label.h b/glabels2/src/wdgt-rotate-label.h
index bcb3fc7..d6d2604 100644
--- a/glabels2/src/wdgt-rotate-label.h
+++ b/glabels2/src/wdgt-rotate-label.h
@@ -23,7 +23,6 @@
 #ifndef __WDGT_ROTATE_LABEL_H__
 #define __WDGT_ROTATE_LABEL_H__
 
-#include <gnome.h>
 #include "hig.h"
 #include <libglabels/template.h>
 
diff --git a/glabels2/src/window.c b/glabels2/src/window.c
index fdbcf09..97b483b 100644
--- a/glabels2/src/window.c
+++ b/glabels2/src/window.c
@@ -22,10 +22,13 @@
 
 #include <config.h>
 
+#include "window.h"
+
 #include <glib/gi18n.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkframe.h>
 
 #include "ui.h"
-#include "window.h"
 #include "util.h"
 #include "xml-label.h"
 #include "prefs.h"
diff --git a/glabels2/src/window.h b/glabels2/src/window.h
index 5a39068..2b855a3 100644
--- a/glabels2/src/window.h
+++ b/glabels2/src/window.h
@@ -23,7 +23,6 @@
 #ifndef __WINDOW_H__
 #define __WINDOW_H__
 
-#include <gtk/gtk.h>
 #include <bonobo/bonobo-window.h>
 #include <bonobo/bonobo-ui-component.h>
 
diff --git a/glabels2/src/xml-label-04.c b/glabels2/src/xml-label-04.c
index 9f0dbcf..b845c72 100644
--- a/glabels2/src/xml-label-04.c
+++ b/glabels2/src/xml-label-04.c
@@ -22,11 +22,10 @@
 
 #include <config.h>
 
-#include <gnome.h>
+#include "xml-label-04.h"
 
 #include <glib/gi18n.h>
 
-#include "xml-label-04.h"
 #include "label-text.h"
 #include "label-box.h"
 #include "label-line.h"
diff --git a/glabels2/src/xml-label-191.c b/glabels2/src/xml-label-191.c
index 4cabb6d..567b82c 100644
--- a/glabels2/src/xml-label-191.c
+++ b/glabels2/src/xml-label-191.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include <gnome.h>
+#include "xml-label-191.h"
 
 #include <glib/gi18n.h>
 #include <libxml/tree.h>
@@ -39,7 +39,6 @@
 #include "label-barcode.h"
 #include "base64.h"
 #include "xml-label.h"
-#include "xml-label-04.h"
 #include <libglabels/paper.h>
 #include <libglabels/template.h>
 #include <libglabels/xml-template.h>
diff --git a/glabels2/src/xml-label.c b/glabels2/src/xml-label.c
index 0ef0559..f725b13 100644
--- a/glabels2/src/xml-label.c
+++ b/glabels2/src/xml-label.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include <gnome.h>
+#include "xml-label.h"
 
 #include <glib/gi18n.h>
 #include <libxml/tree.h>
@@ -38,7 +38,6 @@
 #include "label-image.h"
 #include "label-barcode.h"
 #include "base64.h"
-#include "xml-label.h"
 #include "xml-label-04.h"
 #include "xml-label-191.h"
 #include <libglabels/template.h>