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

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index 2406a2a0ed2313e414c75edf89d3c2da1d0d819c..049d64bc0b643a349a774c3a108a694f3a805112 100644 (file)
--- 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 7dcc79a466ec956781f3b4010dea3cde495b1e3f..e5011b2fa5777d0769bd58e419a4a91273897453 100644 (file)
--- 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 5145e77d7f18dbe5d960bfff9f1ed8c953498cb3..f4a54bf94f122c71b4fbc4ba229244e7bf0636ed 100644 (file)
--- 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 9cf99915c9eb43ade5f8f1a39b5661c699f7e1fb..9137dadf26f7f4fcf7c4e72fa147d568391a37ec 100644 (file)
--- 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 9fbf729ee155870748c776b7fdedcd9dbc971f08..a91306cb05d7214a7d06ad7d0d15b9cec263e7cf 100644 (file)
--- 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 b34abd26afcc9ff159623eb20fd84552fa83b045..ce633b71dcdb983d0ade6f0446134606a337e990 100644 (file)
--- 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 d98409703e3bab4719535ceb95effb750147b291..a2878840645e3f115fd9f81f548b9f3aaca88851 100644 (file)
--- 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 5ec02b76cc33dbbc38aebab04c3c1869ac3805b9..02dbacc085539cbdef4bd44a46249385e8009b01 100644 (file)
--- 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 f2fd80f2a7ab8bdcaa482b08eee3e1d308b91150..4711c4eb87e6f56f7495514a570909cbc592a011 100644 (file)
--- 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 db51b9652d337a27f1ce5805bbad7d45ffdeba6b..d69a048b6dfb20743bf3cf64611416896156b48f 100644 (file)
--- 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 727694672faf64ea196a048ecac0bad24cc35643..6924ec8c910915bcf801b3af364d439c80826104 100644 (file)
--- 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 957b46a8e95fb4c07c48045b606d4d1bd24f3302..c8de307e9052ff0481e0b59bc1bd28a3ae550d7f 100644 (file)
--- 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 a6869492705be6819fee30b879a1de585aa03753..acddd1782bf8775d4fd0626ad5965659805a651c 100644 (file)
--- 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 2ea7798b5ca377e5123b9ce266d244c1b8cb6b4f..7491b2aa009bac0fefe72b79507df7af708c9cb2 100644 (file)
--- 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 b0be19daf1c8a5638d309c47029ff53dacda8256..fec0daab3550644e3c2608c1fbec9951f7cefd7d 100644 (file)
--- 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 ab1c201d22c1c8acf123bf0f834a2eee6c7634c1..cd3f36353ec24711bc361d55211f95e4aca357bf 100644 (file)
--- 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 23ca14c88ace665978c62788b1781ebe821c8e31..70b70324fce62df782ddfd4c8ed45a98ecd05665 100644 (file)
--- 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 9d68d7208b6464f5d21ace078f095ee10d1358fe..d8558fe9fd34d0a586d1cd98cf7b9d8fbf07d262 100644 (file)
--- 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 99f984217164cfa3a8b8b7a135bae723e00e330a..462eb897845b90de5000b6ab88fd82fa19e0cc78 100644 (file)
--- 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 58cba587a5bca6968483595810ba77a0de7609c3..15d51bd6a8c1e740df12dae4fa6f87facb655738 100644 (file)
--- 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 267830c82daeab64c0ee1625ba129e6713852973..958d66b18061529ff75965f24082aeb620454a45 100644 (file)
--- 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 cecef9dc710334836cb5b6d5d0ea3abcba49d57c..01c5d86ebf759d595f6fcd62b162b5c49bb70e89 100644 (file)
--- 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 f5f026e23d5315a92712a04833442011cca33188..44ae8b0183512eb802e1be805d3d28d3ca8e4d78 100644 (file)
--- 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 35c5b9e7ac2fcadc895a550ed6bb2af443b2e11d..8f41fd794dd32af8d36bb4fd3907edf77f26a6d2 100644 (file)
--- 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 d00f690c266b7c79a08f2eb7b48f86d8cf4d15be..9ec54c970480041f84f1050f530c9b63223f77be 100644 (file)
--- 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 654c39d0deef585d2ddb42fa7189454c9be042a9..f909a7233339ee49d3205d24151e8db6ebb6af85 100644 (file)
--- 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 95fa936483ab3e6cc43bb76423466682790ba450..0fc35828c5a9f175be715e6a3d1045f1e7aad057 100644 (file)
--- 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 c785ad03339fc10450c3e6fb125578479daf40a6..c7c368d2ab18e2d87bd1925b239dce0e6b1143d3 100644 (file)
--- 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 31a480a677e8d38852e2debec3a0f64f4d159454..7c611a69c17532026382860231e9414490fc6ce1 100644 (file)
--- 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 9a2f6a7ceb27176507cdb8190c38c6e279444fba..25c120d69b4e048bf6552d2df507048bb5224833 100644 (file)
--- 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 bcda655bd303c081f251d970159520d5a7a08264..36076652ae15a6cfce2be5f97f9676459350df11 100644 (file)
--- 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 34ad7caa134fdbf1aa6529318ff25fcdf2fa3883..e03783b6088ef620df93aad8bfe2955fdc0e17af 100644 (file)
--- 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 abf6fdbae97b5a00db132deb12a8af4df977caa1..57deadb19d0d5643279b3f14a6f47ae33dfd0b30 100644 (file)
--- 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 678427f534e9d641d5295a89d3b9be2b8b768afa..2497ab2346b6c025efb892bec5edc2f465d6c2c5 100644 (file)
--- 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 120a1329e6f0bd24bb1ab77313266df8fa45cbac..0a90d8f1605e6f6dfc9ffe80a177eb4143d41bb6 100644 (file)
--- 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 66728e9fb0a704f5a4a601e623024ee8782c3802..b026ef8d874be2d4abfba1045e65a41b23788d15 100644 (file)
--- 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 87663a78f17cee04e4f98d78bb2a174a97afe428..518f1618ecd6e9e4e69ed58ef75537ef06d3284d 100644 (file)
--- 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 4e010711fc68fafc4dcfe0598ec44df0ac9a6aff..d9e25ead2a44f6e7b4eb9beaa8fe434d0840ba3a 100644 (file)
--- 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 e2a9418a221b8c2df01a53487059ada89b945a58..8f264633a46f1b9ab30061044122ff2c15bc4b2b 100644 (file)
--- 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 e9704839364f22b54473654296b8cad2267487e4..114e29e4264e832589aa85921f934c278247c398 100644 (file)
--- 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 6512a7635e1f1312ee6e4772c5d7082ec306af3b..5e03bece93f9cdef0003335a39c234e7444b95e0 100644 (file)
--- 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 0731899b4420e5e22bfd26c474eb1e3cf4274552..fb3861fd915e1ae36b5795f8cf366625fd2accc2 100644 (file)
--- 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 1ccdadbbbfdbbd87708cbabe7a8b2a9f68041ab0..96b061dfe91f856d2f3dfe0a767db5376f2f8435 100644 (file)
--- 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 4c140318e6e12b101ef4775db32de1341300e76f..b8f4afc2fac3e8352effb06f7c5bad0ad23f6a6e 100644 (file)
--- 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 30728383f897599d25a1e35a56b2e50920a1a3ff..c250e73e3562dc1894be8fe6a6ed421e7cab6aaf 100644 (file)
--- 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 def7b1170571d6176538f78c26a9c9f94766e88f..c6d3fc5c16d090240deeae9eff04b3177aec159e 100644 (file)
--- 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 ac4f08f5f7fa1f781e9b8729f33a4e856a223baf..107428f20ac87b4e0430631f164230bdaed9cc88 100644 (file)
--- 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 fa9aa119b4d742b3badc51bb90a43c6a1d478f93..d95bb63e6e0d44a899bd3c3eb5036a659454c7e7 100644 (file)
--- 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 33d767349b845ac2b1885bf17f2790b0dee4318d..51d0550e695c0e535d513d73c43b1258186e6c9c 100644 (file)
--- 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 b5f43dd8c0272925f744447272d69d7d87ad7888..43a3d6cc05a3862dd1018c05061d7571b71cb471 100644 (file)
--- 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 16be052a052442f928ca176294497892f67a7f14..bc33a6463e0e9567a32923f06b857211ea048a3c 100644 (file)
--- 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 f9437c6d295b425057213ba907824e5c50439f9b..333f57f3399159ded181249a49fd05ea2065de19 100644 (file)
--- 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 469379191766c280c750944953da20f0da117f36..b2983097eaafa3cee08b69f4e01354b91bbda04f 100644 (file)
--- 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 9dc59790ba7cc700ba8616b2f22621b8bcb0434c..b5648156d0ad6cb3fc79fd8e81a1e7a7f53020b9 100644 (file)
--- 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 f0d9de39baef7e23c98969d65367c025d7e9bd46..a1240c96a884fdfc0ab4554a671afd5f8eb04854 100644 (file)
--- 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 0ccfc71b420211904f341a8ea03dd1040a3d75cc..efbce89727bdf32f26ecd82dbdb0dee85f0ec032 100644 (file)
--- 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 573ef143e9984bc6dd7323c9a6a4aadbddd01f91..83f5599aac2d8ea52d87af2dc5a9a4a5d4c63358 100644 (file)
--- 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 6e9b583ced27a2313dacbd4560d736fc2a439fa2..d19a385cb1a44f95f7f6d18cafd52509c7801afe 100644 (file)
--- 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 cac3426d8dc394c91952c152b95d5f3b26a91d6e..1559b34ac45f3eea074c47528fdf23bc1ff8d23e 100644 (file)
--- 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 d3616997e89451d57cfadd54d8fbdb337d676517..db61a57c26498278bd67001f7924cd957e016527 100644 (file)
--- 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 83e18d3ccd8ba682010845ede679fe1d55677a0a..a4eb29630d8f4ec330197bd2f0e612941efc9b0f 100644 (file)
--- 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 25cd5b6623336a64831aa3e8f59d754dd21ac03a..70128aedcfc873fa84edfe49117e2651ed27ab99 100644 (file)
--- 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 96d975d402b4ce7fede61f669b8aa9441e3caa88..70e2bd0a462ab9c56087092ad8ca516f07cd8fb6 100644 (file)
--- 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 22f4f5f40b8198ea8658077c348e49d5ce7b4fc4..e2740db6e4e937b85b6a172e8dcc299f14512de5 100644 (file)
--- 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 5cea341c4a9275e7b2ff0247207145402d554da3..8c03dfa277ad18b18585983ff572260ef34241c9 100644 (file)
--- 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 b7d06f2de6a1d5231ef4e114aaa327e0c656033a..47a6293d950e8ecc098bc7198b09f4eb35e4f634 100644 (file)
--- 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 d1a745e0af761ec1da2d4367e23227219ce4f5a3..98f2361122d4b92301bf2c010556d65c9a504029 100644 (file)
--- 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 640ea540bd38ee203533b19267ed961c03c7f337..64cac185805010bff21ac1d286b62a6293107e49 100644 (file)
--- 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 90f0d70ea1d626bb1b88e9c55ab26fc7ea262a2f..6ee0324a76e8b0e557202bd563b0539ff2c3a199 100644 (file)
--- 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 bdb9af78b3183a3c724d39a4d4edaf8bf1ea2167..0a1420cb273281651b218ccdee4c480833ee1b63 100644 (file)
--- 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 184840a671c4a1ff1b977242555e0d34c32c6903..47c69af8e681820dd8d1c78211cb3566d91e6485 100644 (file)
--- 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 7678233c981e930614a464ce3078805ba6602f1f..cc4ad97bd8299210f43da01f2bc60ae9aa44a15a 100644 (file)
--- 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 cef32b6d6d1d78d2cb4af1a4a58660ad19f72d2f..7b55867b27391b66e40bbd6a94f27bf73b00b59a 100644 (file)
--- 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 70f9d4e8cc23fce5f491f963ba414a508ee7a41b..b1af536f0634400b408076a8e23c5c21a32e50bf 100644 (file)
--- 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 bd05217f58f6cb7e7b618e84422a339b95c79243..655cdcae8090f5aed64d4445c5de537359dace48 100644 (file)
--- 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 e8d99bbc703c33216009d2b56a4ef6563fe7cbed..b5d22502fde44607188053a75737f569be50b624 100644 (file)
--- 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 7bd596ca4e87de00798c5a1bb1b07e740eedab18..9103033bb18fd8b9bb84e40cd1dd1f45da806d8b 100644 (file)
--- 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 fceb40e964a0f7201da0f5bacc51e286fd4ddccc..d49987d1dd5763bf7133db892725053e8b6b944c 100644 (file)
--- 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 42f3ab064e9ca12b9883e416950d12616495ae10..7d95aeb51a4cf7e2e34202451858c5e5fa25567e 100644 (file)
--- 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 3c2b9f82b8470f260b33cbae499468bf5980a6bb..90fc19ec86599a68344c96431228b4dd2c2b6505 100644 (file)
--- 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 7f218ad8fb5dda51ba810156b47937347b3518be..95b41b7b943ac4729ad093cb91cf9ddd672153f9 100644 (file)
--- 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 0559a888e4cf81ca410c316d1a46e65c6c9f3ba2..c2451ba854e11991058ab50fb1b813156519b1d7 100644 (file)
--- 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 f6c5bfd20a9a5c5419e3e0c96b38fb7533d4a0d4..2f66ddb4214fab859445eaa85a20b76935457e77 100644 (file)
--- 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 1b9620157c1d49497747cae22ebe9ebc999a4627..ec7b8541e1d03b0c1fbd40462ddc5c164230d8e7 100644 (file)
--- 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 6bed15a50b67866c53c212fb9a46c635dae51784..d4a453b42ec92a2838305028ced5f650eb03fdfc 100644 (file)
--- 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 9407c6d7990175bc6617a13aa5c8cbad0aa7bd12..8616e0b3641bfe2df34d7be23a8572f6ef55670e 100644 (file)
--- 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 18706503e11c017672f67458ab1cf5c173ac9944..6a9ef9492d8ec188d027bdd0845b495a5afb8f7f 100644 (file)
--- 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 3d9f0539962fe32011c7975506e369a3afe87a6c..4fcbdc3dc9db8f63bb65549053b628ce49f536cf 100644 (file)
--- 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 c7475430d7c47957c5233a733da3d20052ee6226..255954a5c9462593f4881d8bee4138a32e65dd11 100644 (file)
--- 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 9c3a9e623289d5b1d1a29521442a1af65886ecb6..9a39bfc6f4022961531dbf22569ebb5421a56bc6 100644 (file)
--- 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 d98e93e9d3f0bd75235c21b3ca0a63d1bd972d4e..2cdded625864a43f8af230a05c9c160a40cdb28e 100644 (file)
--- 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 dd6dacc0c891c5216cee344bc7f55f74bc5702c8..9185b9fde4b603826683b91c468beee244b5975b 100644 (file)
--- 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 578863a4d41b83a56fd11c1088a2023bf77c0226..1ecf8d6d67bb602551dc8c0a1d1c86a541837b3f 100644 (file)
--- 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 2b6adf54fdb7425c9e43b95b37b4cf19de02e475..378bae4a085ff87a5d5579cc0ec52e7420d5bfa8 100644 (file)
--- 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 ba9d35a3201405b3f87487167cc908e2de4d3e73..9d60bf7cab6e077958182a07465434b2e989567c 100644 (file)
--- 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 bcb3fc7303332c4c2f447adbbe5d5212e1b324cf..d6d2604a1da1252d3c814ed96c3124f5e1bec4d9 100644 (file)
--- 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 fdbcf09118e0c9a979872f15e8ca4590517ff5f4..97b483b1b0798747524867c2847d32fcb563c26a 100644 (file)
--- 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 5a3906848f5d4a222c7022ca40e2e44a1998b2f5..2b855a3d237b1e65c03010b6c967e380b77a9bd5 100644 (file)
--- 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 9f0dbcf69cca5c60035b25d7547c2f2e17c6a424..b845c725b18223836c0fe43c4b95355f6b427623 100644 (file)
--- 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 4cabb6dec9c739c215bf1baca20d7521d271b1bb..567b82c9bd45070c9dff9920b284b976a12ab45d 100644 (file)
--- 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 0ef055969c88471f921f0b08e61b17e1425b7459..f725b139572b8b05e8e5e7052e2057315b71224c 100644 (file)
--- 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>