Clean up and sort includes

src/app-manager.c

@@ -9,18 +9,14 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <glib-object.h>
-#include <gtk/gtk.h>
-#define WNCK_I_KNOW_THIS_IS_UNSTABLE
-#include <libwnck/libwnck.h>
-
 #include "app-manager.h"
 #include "task-manager.h"
 
+#include <gtk/gtk.h>
+
 
 
 typedef struct _XtmAppManagerClass XtmAppManagerClass;

src/app-manager.h

@@ -10,12 +10,7 @@
 #ifndef APP_MANAGER_H
 #define APP_MANAGER_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <glib-object.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
 #define WNCK_I_KNOW_THIS_IS_UNSTABLE
 #include <libwnck/libwnck.h>
 

src/main.c

@@ -9,20 +9,18 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <gtk/gtk.h>
-#include <gio/gio.h>
-
-#include <xfconf/xfconf.h>
-#include <libxfce4ui/libxfce4ui.h>
-
-#include "settings.h"
 #include "process-window.h"
+#include "settings.h"
 #include "task-manager.h"
 
+#include <gio/gio.h>
+#include <gtk/gtk.h>
+#include <libxfce4ui/libxfce4ui.h>
+#include <xfconf/xfconf.h>
+
 static XtmSettings *settings;
 static GtkWidget *window;
 static GtkStatusIcon *status_icon_or_null = NULL;

src/process-monitor.c

@@ -8,14 +8,13 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
-#include <gtk/gtk.h>
-#include <cairo.h>
-
-#include "task-manager.h"
 #include "process-monitor.h"
+#include "task-manager.h"
+
+#include <cairo.h>
 
 
 

src/process-monitor.h

@@ -10,11 +10,8 @@
 #ifndef PROCESS_MONITOR_H
 #define PROCESS_MONITOR_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <glib-object.h>
+#include <gtk/gtk.h>
 
 #define XTM_TYPE_PROCESS_MONITOR		(xtm_process_monitor_get_type ())
 #define XTM_PROCESS_MONITOR(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), XTM_TYPE_PROCESS_MONITOR, XtmProcessMonitor))

src/process-statusbar.c

@@ -8,17 +8,15 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
-#include <glib-object.h>
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
 #include "process-statusbar.h"
 #include "settings.h"
 #include "task-manager.h"
 
+#include <glib/gi18n.h>
+
 
 
 enum

src/process-statusbar.h

@@ -10,10 +10,6 @@
 #ifndef PROCESS_STATUSBAR_H
 #define PROCESS_STATUSBAR_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <glib-object.h>
 #include <gtk/gtk.h>
 

src/process-tree-model.c

@@ -8,17 +8,15 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
-#include <glib-object.h>
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-
-#include "task-manager.h"
-#include "process-tree-view.h"
 #include "process-tree-model.h"
+#include "process-tree-view.h"
+#include "task-manager.h"
+
+#include <gdk/gdkkeysyms.h>
+#include <glib/gi18n.h>
 
 
 
@@ -950,4 +948,3 @@ xtm_process_tree_model_new (GtkTreeModel * model)
 
 	return g_object_new (XTM_TYPE_PROCESS_TREE_MODEL, "model", model, NULL);
 }
-

src/process-tree-model.h

@@ -10,11 +10,8 @@
 #ifndef PROCESS_TREE_MODEL_H
 #define PROCESS_TREE_MODEL_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <glib-object.h>
+#include <gtk/gtk.h>
 
 #define XTM_TYPE_PROCESS_TREE_MODEL		(xtm_process_tree_model_get_type ())
 #define XTM_PROCESS_TREE_MODEL(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), XTM_TYPE_PROCESS_TREE_MODEL, XtmProcessTreeModel))

src/process-tree-view.c

@@ -8,20 +8,18 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
-#include <unistd.h>
-#include <glib-object.h>
-#include <glib/gi18n.h>
-#include <glib/gprintf.h>
-#include <cairo-gobject.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
 #include "process-tree-model.h"
 #include "process-tree-view.h"
-#include "task-manager.h"
 #include "settings.h"
+#include "task-manager.h"
+
+#include <cairo-gobject.h>
+#include <gdk/gdkkeysyms.h>
+#include <glib/gi18n.h>
+#include <glib/gprintf.h>
 
 
 

src/process-tree-view.h

@@ -10,11 +10,8 @@
 #ifndef PROCESS_TREE_VIEW_H
 #define PROCESS_TREE_VIEW_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <glib-object.h>
+#include <gtk/gtk.h>
 
 enum
 {

src/process-window.c

@@ -8,40 +8,32 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
+#include "process-monitor.h"
+#include "process-statusbar.h"
+#include "process-tree-view.h"
+#include "process-window.h"
+#include "process-window_ui.h"
+#include "settings-dialog.h"
+#include "settings.h"
+#include "task-manager.h"
 
 #ifdef HAVE_LIBX11
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
 #include <X11/Xatom.h>
-#include <X11/Xos.h>
+#include <X11/Xlib.h>
 #include <X11/Xmu/WinUtil.h>
-#include <X11/cursorfont.h>
+#include <X11/Xos.h>
 #include <X11/Xproto.h>
+#include <X11/Xutil.h>
+#include <X11/cursorfont.h>
 #include <gdk/gdkx.h>
 #endif
 
-#include <glib-object.h>
-#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-
-#include <xfconf/xfconf.h>
 #include <libxfce4ui/libxfce4ui.h>
 
-#include "settings.h"
-#include "task-manager.h"
-#include "process-window.h"
-#include "process-window_ui.h"
-#include "process-monitor.h"
-#include "process-tree-view.h"
-#include "process-statusbar.h"
-#include "settings-dialog.h"
-
 
 
 typedef struct _XtmProcessWindowClass XtmProcessWindowClass;

src/process-window.h

@@ -10,12 +10,9 @@
 #ifndef PROCESS_WINDOW_H
 #define PROCESS_WINDOW_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <glib-object.h>
 #include <gtk/gtk.h>
+#include <xfconf/xfconf.h>
 
 #define XTM_TYPE_PROCESS_WINDOW			(xtm_process_window_get_type ())
 #define XTM_PROCESS_WINDOW(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), XTM_TYPE_PROCESS_WINDOW, XtmProcessWindow))

src/settings-dialog.c

@@ -8,21 +8,19 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
-#include <glib-object.h>
-#include <gtk/gtk.h>
+#include "settings-dialog.h"
+#include "settings-dialog_ui.h"
+#include "settings.h"
+
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
 #endif
 
 #include <libxfce4ui/libxfce4ui.h>
 
-#include "settings.h"
-#include "settings-dialog.h"
-#include "settings-dialog_ui.h"
-
 static void	show_about_dialog				(GtkWidget *widget, gpointer user_data);
 static GtkWidget *xtm_settings_dialog_new (GtkBuilder *builder, GtkWidget *parent_window);
 

src/settings-dialog.h

@@ -10,10 +10,6 @@
 #ifndef SETTINGS_DIALOG_H
 #define SETTINGS_DIALOG_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <glib-object.h>
 #include <gtk/gtk.h>
 

src/settings.c

@@ -11,27 +11,18 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#include <glib-object.h>
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#ifdef GDK_WINDOWING_X11
-#include <gdk/gdkx.h>
+#include "config.h"
 #endif
 
 #include "settings.h"
 
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+#ifdef GDK_WINDOWING_X11
+#include <gdk/gdkx.h>
+#endif
+
 
 
 enum

src/settings.h

@@ -10,12 +10,7 @@
 #ifndef SETTINGS_H
 #define SETTINGS_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <glib-object.h>
-
 #include <xfconf/xfconf.h>
 
 #define DEFAULT_WINDOW_HEIGHT	600

src/task-manager-bsd.c

@@ -17,11 +17,13 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
-#include <stdlib.h>
+#include "task-manager.h"
+
 #include <err.h>
+#include <stdlib.h>
 #include <sys/types.h>
 /* for sysctl() */
 #include <sys/param.h>
@@ -37,7 +39,6 @@
 #include <sys/proc.h>
 /* for struct vmtotal */
 #include <sys/vmmeter.h>
-#include "task-manager.h"
 
 #include <errno.h>
 extern int errno;
@@ -282,4 +283,3 @@ get_memory_usage (guint64 *memory_total, guint64 *memory_available, guint64 *mem
 	free(swdev);
 	return TRUE;
 }
-

src/task-manager-freebsd.c

@@ -10,27 +10,26 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
-#include <kvm.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <sys/user.h>
-#include <sys/proc.h>
+#include "task-manager.h"
+
 #include <fcntl.h>
+#include <kvm.h>
 #include <paths.h>
-#include <unistd.h>
 #include <string.h>
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/sysctl.h>
+#include <sys/types.h>
+#include <sys/user.h>
+#include <unistd.h>
+
 #if defined(__FreeBSD_version) && __FreeBSD_version >= 900044
 #include <sys/vmmeter.h>
 #endif
 
-#include <glib.h>
-
-#include "task-manager.h"
-
 static const gchar ki_stat2state[] = {
 	' ', /* - */
 	'R', /* SIDL */

src/task-manager-linux.c

@@ -9,17 +9,9 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <string.h>
-
-#include <glib.h>
-
 #include "task-manager.h"
 
 static gushort _cpu_count = 0;

src/task-manager-skel.c

@@ -16,11 +16,9 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
-#include <glib.h>
-
 #include "task-manager.h"
 
 /* Cache some values */
@@ -91,4 +89,3 @@ pid_is_sleeping (GPid pid)
 
 	return FALSE; /* (state == sleeping) ? TRUE : FALSE;*/
 }
-

src/task-manager-solaris.c

@@ -9,24 +9,22 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
-#include <kstat.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <fcntl.h>
-#include <procfs.h>
-#include <sys/procfs.h>
-#include <sys/swap.h>
-
-#include <glib.h>
-
 #include "task-manager.h"
 
+#include <fcntl.h>
+#include <kstat.h>
+#include <procfs.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/procfs.h>
+#include <sys/stat.h>
+#include <sys/swap.h>
+#include <sys/types.h>
+#include <unistd.h>
+
 static kstat_ctl_t *kc;
 static gushort _cpu_count = 0;
 static gulong ticks_total_delta = 0;
@@ -256,4 +254,3 @@ pid_is_sleeping (GPid pid)
 
 	return (state[0] == 'T') ? TRUE : FALSE;
 }
-

src/task-manager.c

@@ -9,28 +9,21 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <pwd.h>
-#include <signal.h>
-#include <sys/resource.h>
-
-#include <glib-object.h>
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#include <gmodule.h>
-
-#include "task-manager.h"
-#ifdef HAVE_WNCK
-#include <gdk/gdkx.h>
-#include "app-manager.h"
-#endif
 #include "process-tree-view.h" /* for the columns of the model */
 #include "settings.h"
+#include "task-manager.h"
+
+#ifdef HAVE_WNCK
+#include "app-manager.h"
+#include <gdk/gdkx.h>
+#endif
+
+#include <glib/gi18n.h>
+#include <pwd.h>
+#include <sys/resource.h>
 
 #define TIMESTAMP_DELTA 4
 

src/task-manager.h

@@ -10,10 +10,6 @@
 #ifndef TASK_MANAGER_H
 #define TASK_MANAGER_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <glib-object.h>
 #include <gtk/gtk.h>