Given the priority to string.h from system includes.

27 files changed, 34 insertions, 32 deletions

diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 5adc0f9..879b42d 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -6,6 +6,8 @@ libgui_la_SOURCES =						\
 	editem-int.h						\
 	editem.h editem.c					\
 	editor.h editor.c					\
+	panel-int.h							\
+	panel.h panel.c						\
 	status.h status.c
 
 libgui_la_LIBADD =						\
diff --git a/src/gui/core/panels.c b/src/gui/core/panels.c
index 71aee86..3fe8a86 100644
--- a/src/gui/core/panels.c
+++ b/src/gui/core/panels.c
@@ -27,13 +27,13 @@
 
 #include "global.h"
 #include "items.h"
+#include "../panel-int.h"
 #include "../panels/bintree.h"
 #include "../panels/bookmarks.h"
 #include "../panels/errors.h"
 #include "../panels/glance.h"
 #include "../panels/history.h"
 #include "../panels/log.h"
-#include "../panels/panel-int.h"
 #include "../panels/regedit.h"
 #include "../panels/strings.h"
 #include "../panels/symbols.h"
diff --git a/src/gui/core/panels.h b/src/gui/core/panels.h
index 5344f3d..ee61d14 100644
--- a/src/gui/core/panels.h
+++ b/src/gui/core/panels.h
@@ -29,7 +29,7 @@
 #include <stdbool.h>
 
 
-#include "../panels/panel.h"
+#include "../panel.h"
 #include "../../glibext/configuration.h"
 
 
diff --git a/src/gui/panels/panel-int.h b/src/gui/panel-int.h
index 07aafc1..a301fac 100644
--- a/src/gui/panels/panel-int.h
+++ b/src/gui/panel-int.h
@@ -32,9 +32,9 @@
 #include <gtk/gtk.h>
 
 
-#include "../editem-int.h"
-#include "../../common/dllist.h"
-#include "../../glibext/delayed.h"
+#include "editem-int.h"
+#include "../common/dllist.h"
+#include "../glibext/delayed.h"
 
 
 
diff --git a/src/gui/panels/panel.c b/src/gui/panel.c
index a0965f1..843018e 100644
--- a/src/gui/panels/panel.c
+++ b/src/gui/panel.c
@@ -30,9 +30,9 @@
 
 
 #include "panel-int.h"
-#include "../../common/extstr.h"
-#include "../../core/params.h"
-#include "../../gtkext/gtkdockable-int.h"
+#include "../common/extstr.h"
+#include "../core/params.h"
+#include "../gtkext/gtkdockable-int.h"
 
 
 
diff --git a/src/gui/panels/panel.h b/src/gui/panel.h
index 4a92409..5614728 100644
--- a/src/gui/panels/panel.h
+++ b/src/gui/panel.h
@@ -29,8 +29,8 @@
 #include <stdbool.h>
 
 
-#include "../editem.h"
-#include "../../glibext/configuration.h"
+#include "editem.h"
+#include "../glibext/configuration.h"
 
 
 
diff --git a/src/gui/panels/Makefile.am b/src/gui/panels/Makefile.am
index 8b63b24..457e507 100644
--- a/src/gui/panels/Makefile.am
+++ b/src/gui/panels/Makefile.am
@@ -1,4 +1,6 @@
 
+DEFAULT_INCLUDES = -idirafter. -I$(top_builddir)
+
 BUILT_SOURCES = resources.h resources.c
 
 noinst_LTLIBRARIES  = libguipanels.la
@@ -22,8 +24,6 @@ libguipanels_la_SOURCES =				\
 	glance.h glance.c					\
 	history.h history.c					\
 	log.h log.c							\
-	panel-int.h							\
-	panel.h panel.c						\
 	regedit.h regedit.c					\
 	resources.h resources.c				\
 	strings.h strings.c					\
diff --git a/src/gui/panels/bintree.c b/src/gui/panels/bintree.c
index ffecd6e..434aa94 100644
--- a/src/gui/panels/bintree.c
+++ b/src/gui/panels/bintree.c
@@ -33,9 +33,9 @@
 #include <i18n.h>
 
 
-#include "panel-int.h"
 #include "updating-int.h"
 #include "../agroup.h"
+#include "../panel-int.h"
 #include "../core/global.h"
 #include "../../core/queue.h"
 #include "../../gtkext/gtkdisplaypanel.h"
diff --git a/src/gui/panels/bintree.h b/src/gui/panels/bintree.h
index 8168481..dd8e8fd 100644
--- a/src/gui/panels/bintree.h
+++ b/src/gui/panels/bintree.h
@@ -29,7 +29,7 @@
 #include <i18n.h>
 
 
-#include "panel.h"
+#include "../panel.h"
 
 
 
diff --git a/src/gui/panels/bookmarks.c b/src/gui/panels/bookmarks.c
index c141ff3..112afe9 100644
--- a/src/gui/panels/bookmarks.c
+++ b/src/gui/panels/bookmarks.c
@@ -35,7 +35,7 @@
 #include <gtk/gtk.h>
 
 
-#include "panel-int.h"
+#include "../panel-int.h"
 #include "../core/global.h"
 #include "../../analysis/db/items/bookmark.h"
 #include "../../common/cpp.h"
diff --git a/src/gui/panels/bookmarks.h b/src/gui/panels/bookmarks.h
index 311868c..eb0c354 100644
--- a/src/gui/panels/bookmarks.h
+++ b/src/gui/panels/bookmarks.h
@@ -29,7 +29,7 @@
 #include <i18n.h>
 
 
-#include "panel.h"
+#include "../panel.h"
 
 
 
diff --git a/src/gui/panels/errors.c b/src/gui/panels/errors.c
index b258ecf..67551e2 100644
--- a/src/gui/panels/errors.c
+++ b/src/gui/panels/errors.c
@@ -33,8 +33,8 @@
 #include <i18n.h>
 
 
-#include "panel-int.h"
 #include "updating-int.h"
+#include "../panel-int.h"
 #include "../core/global.h"
 #include "../../core/global.h"
 #include "../../core/paths.h"
diff --git a/src/gui/panels/errors.h b/src/gui/panels/errors.h
index 02451ee..b1dfe8b 100644
--- a/src/gui/panels/errors.h
+++ b/src/gui/panels/errors.h
@@ -29,7 +29,7 @@
 #include <i18n.h>
 
 
-#include "panel.h"
+#include "../panel.h"
 
 
 
diff --git a/src/gui/panels/glance.c b/src/gui/panels/glance.c
index 9b2c088..fa4df51 100644
--- a/src/gui/panels/glance.c
+++ b/src/gui/panels/glance.c
@@ -29,7 +29,7 @@
 #include <gtk/gtk.h>
 
 
-#include "panel-int.h"
+#include "../panel-int.h"
 
 
 
diff --git a/src/gui/panels/glance.h b/src/gui/panels/glance.h
index a7deee6..2e42f21 100644
--- a/src/gui/panels/glance.h
+++ b/src/gui/panels/glance.h
@@ -29,7 +29,7 @@
 #include <i18n.h>
 
 
-#include "panel.h"
+#include "../panel.h"
 
 
 
diff --git a/src/gui/panels/history.c b/src/gui/panels/history.c
index 9edd32e..4b694c7 100644
--- a/src/gui/panels/history.c
+++ b/src/gui/panels/history.c
@@ -32,7 +32,7 @@
 #include <i18n.h>
 
 
-#include "panel-int.h"
+#include "../panel-int.h"
 #include "../../analysis/binary.h"
 #include "../../glibext/chrysamarshal.h"
 #include "../../glibext/signal.h"
diff --git a/src/gui/panels/history.h b/src/gui/panels/history.h
index 61934cd..68261db 100644
--- a/src/gui/panels/history.h
+++ b/src/gui/panels/history.h
@@ -29,7 +29,7 @@
 #include <i18n.h>
 
 
-#include "panel.h"
+#include "../panel.h"
 
 
 
diff --git a/src/gui/panels/log.c b/src/gui/panels/log.c
index ffe8b42..213a726 100644
--- a/src/gui/panels/log.c
+++ b/src/gui/panels/log.c
@@ -32,7 +32,7 @@
 #include <gtk/gtk.h>
 
 
-#include "panel-int.h"
+#include "../panel-int.h"
 #include "../core/panels.h"
 #include "../../gtkext/easygtk.h"
 
diff --git a/src/gui/panels/log.h b/src/gui/panels/log.h
index 67b7160..724f263 100644
--- a/src/gui/panels/log.h
+++ b/src/gui/panels/log.h
@@ -29,7 +29,7 @@
 #include <i18n.h>
 
 
-#include "panel.h"
+#include "../panel.h"
 #include "../../core/logs.h"
 
 
diff --git a/src/gui/panels/regedit.c b/src/gui/panels/regedit.c
index db98f28..aa749f9 100644
--- a/src/gui/panels/regedit.c
+++ b/src/gui/panels/regedit.c
@@ -35,8 +35,8 @@
 #include <gtk/gtk.h>
 
 
-#include "panel-int.h"
 #include "../agroup.h"
+#include "../panel-int.h"
 #include "../../core/params.h"
 #include "../../common/cpp.h"
 #include "../../common/extstr.h"
diff --git a/src/gui/panels/regedit.h b/src/gui/panels/regedit.h
index 1ce4290..636e6cf 100644
--- a/src/gui/panels/regedit.h
+++ b/src/gui/panels/regedit.h
@@ -29,7 +29,7 @@
 #include <i18n.h>
 
 
-#include "panel.h"
+#include "../panel.h"
 
 
 
diff --git a/src/gui/panels/strings.c b/src/gui/panels/strings.c
index 8248c08..7fd0ffc 100644
--- a/src/gui/panels/strings.c
+++ b/src/gui/panels/strings.c
@@ -31,8 +31,8 @@
 #include <string.h>
 
 
-#include "panel-int.h"
 #include "updating-int.h"
+#include "../panel-int.h"
 #include "../core/global.h"
 #include "../dialogs/gotox.h"
 #include "../../common/extstr.h"
diff --git a/src/gui/panels/strings.h b/src/gui/panels/strings.h
index c2e2332..1856d12 100644
--- a/src/gui/panels/strings.h
+++ b/src/gui/panels/strings.h
@@ -29,7 +29,7 @@
 #include <i18n.h>
 
 
-#include "panel.h"
+#include "../panel.h"
 
 
 
diff --git a/src/gui/panels/symbols.c b/src/gui/panels/symbols.c
index e0a5857..6ea7a72 100644
--- a/src/gui/panels/symbols.c
+++ b/src/gui/panels/symbols.c
@@ -36,9 +36,9 @@
 #include <gdk/gdkkeysyms.h>
 
 
-#include "panel-int.h"
 #include "updating-int.h"
 #include "../agroup.h"
+#include "../panel-int.h"
 #include "../core/global.h"
 #include "../../common/extstr.h"
 #include "../../core/paths.h"
diff --git a/src/gui/panels/symbols.h b/src/gui/panels/symbols.h
index b7e12fc..942aa6c 100644
--- a/src/gui/panels/symbols.h
+++ b/src/gui/panels/symbols.h
@@ -29,7 +29,7 @@
 #include <i18n.h>
 
 
-#include "panel.h"
+#include "../panel.h"
 
 
 
diff --git a/src/gui/panels/welcome.c b/src/gui/panels/welcome.c
index 8b74f78..6812125 100644
--- a/src/gui/panels/welcome.c
+++ b/src/gui/panels/welcome.c
@@ -36,7 +36,7 @@
 #include <i18n.h>
 
 
-#include "panel-int.h"
+#include "../panel-int.h"
 #include "../core/global.h"
 #include "../../common/cpp.h"
 #include "../../common/io.h"
diff --git a/src/gui/panels/welcome.h b/src/gui/panels/welcome.h
index aa018f5..45f465b 100644
--- a/src/gui/panels/welcome.h
+++ b/src/gui/panels/welcome.h
@@ -29,7 +29,7 @@
 #include <i18n.h>
 
 
-#include "panel.h"
+#include "../panel.h"