diff --git a/src/app_menu_item.c b/src/app_menu_item.c
index cf1fe6ef469847d069ea6b0338fc64cded09b4cd..73c62c5c386c7c1c74dee5ff0fd41c1164800cf4 100644
--- a/src/app_menu_item.c
+++ b/src/app_menu_item.c
@@ -17,9 +17,7 @@
  *  02110-1301, USA.
  */
 
-#include <config.h>
 #include <gio/gio.h>
-#include <string.h>
 
 #include "app_menu_item.h"
 
diff --git a/src/app_menu_item.h b/src/app_menu_item.h
index 1318a7af15d973dd12cdd6e6600842719eccfc2d..712a3be6be59457b4b9b96d30e0a0383948d324c 100644
--- a/src/app_menu_item.h
+++ b/src/app_menu_item.h
@@ -26,10 +26,6 @@ G_BEGIN_DECLS
 
 #define RSTTO_TYPE_APP_MENU_ITEM            (rstto_app_menu_item_get_type())
 #define RSTTO_APP_MENU_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), RSTTO_TYPE_APP_MENU_ITEM, RsttoAppMenuItem))
-#define RSTTO_APP_MENU_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), RSTTO_TYPE_APP_MENU_ITEM, RsttoAppMenuItemClass))
-#define RSTTO_IS_APP_MENU_ITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), RSTTO_TYPE_APP_MENU_ITEM))
-#define RSTTO_IS_APP_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), RSTTO_TYPE_APP_MENU_ITEM ()))
-#define RSTTO_APP_MENU_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), RSTTO_TYPE_APP_MENU_ITEM, RsttoAppMenuItemClass))
 
 typedef struct _RsttoAppMenuItemPrivate RsttoAppMenuItemPrivate;
 
diff --git a/src/file.c b/src/file.c
index f8f3724daa506cc8de48ae8e3cc5d3446afc44ad..5697a5ddebe6b8cafec797f386b547c4c76526a7 100644
--- a/src/file.c
+++ b/src/file.c
@@ -17,12 +17,8 @@
  *  02110-1301, USA.
  */
 
-#include <config.h>
-
 #include <gio/gio.h>
 
-#include <libxfce4util/libxfce4util.h>
-
 #if HAVE_MAGIC_H
 #include <magic.h>
 #endif
diff --git a/src/file.h b/src/file.h
index c1cd87b17944e0cd491000fa4441c55304c94407..e02462d051b2c720dcddb423f3ed6c7bf30a29ad 100644
--- a/src/file.h
+++ b/src/file.h
@@ -43,10 +43,6 @@ G_BEGIN_DECLS
                 RSTTO_TYPE_FILE, \
                 RsttoFileClass))
 
-#define RSTTO_IS_FILE_CLASS(klass)( \
-        G_TYPE_CHECK_CLASS_TYPE ((klass), \
-                RSTTO_TYPE_FILE()))
-
 
 typedef struct _RsttoFile RsttoFile;
 typedef struct _RsttoFilePriv RsttoFilePriv;
diff --git a/src/gnome_wallpaper_manager.c b/src/gnome_wallpaper_manager.c
index 268e3215072ef6650a830efe6a70c65a74484b03..3c5708ab12f5c3ec6327489e0eee9115a2841962 100644
--- a/src/gnome_wallpaper_manager.c
+++ b/src/gnome_wallpaper_manager.c
@@ -17,18 +17,10 @@
  *  02110-1301, USA.
  */
 
-#include <config.h>
-
 #include <gdk/gdkx.h>
-#include <X11/Xlib.h>
-#include <xfconf/xfconf.h>
 #include <libxfce4util/libxfce4util.h>
 #include <libxfce4ui/libxfce4ui.h>
-#include <gio/gio.h>
-
-#include <libexif/exif-data.h>
 
-#include "util.h"
 #include "file.h"
 #include "monitor_chooser.h"
 #include "gnome_wallpaper_manager.h"
diff --git a/src/gnome_wallpaper_manager.h b/src/gnome_wallpaper_manager.h
index 553010f24bc8e228ff603e13587db134d1a74821..242eab6a6b254fbeaf8fd2f8a9c008137a45c534 100644
--- a/src/gnome_wallpaper_manager.h
+++ b/src/gnome_wallpaper_manager.h
@@ -33,19 +33,11 @@ G_BEGIN_DECLS
                 RSTTO_TYPE_GNOME_WALLPAPER_MANAGER, \
                 RsttoGnomeWallpaperManager))
 
-#define RSTTO_IS_GNOME_WALLPAPER_MANAGER(obj)( \
-        G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-                RSTTO_TYPE_GNOME_WALLPAPER_MANAGER))
-
 #define RSTTO_GNOME_WALLPAPER_MANAGER_CLASS(klass)( \
         G_TYPE_CHECK_CLASS_CAST ((klass), \
                 RSTTO_TYPE_GNOME_WALLPAPER_MANAGER, \
                 RsttoGnomeWallpaperManagerClass))
 
-#define RSTTO_IS_GNOME_WALLPAPER_MANAGER_CLASS(klass)( \
-        G_TYPE_CHECK_CLASS_TYPE ((klass), \
-                RSTTO_TYPE_GNOME_WALLPAPER_MANAGER()))
-
 
 typedef struct _RsttoGnomeWallpaperManager RsttoGnomeWallpaperManager;
 typedef struct _RsttoGnomeWallpaperManagerPriv RsttoGnomeWallpaperManagerPriv;
diff --git a/src/icon_bar.c b/src/icon_bar.c
index 32f964495d99522f2151b7604c17be4471103fa2..14343627b84e1fc9b638bc9aaa7587d6fdf6cf9e 100644
--- a/src/icon_bar.c
+++ b/src/icon_bar.c
@@ -21,22 +21,14 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
-
 #include <libxfce4util/libxfce4util.h>
 
-#include <libexif/exif-data.h>
-
 #include "util.h"
 #include "file.h"
 #include "thumbnailer.h"
 #include "settings.h"
-#include "marshal.h"
 #include "icon_bar.h"
 
-#define MINIMUM_ICON_ITEM_WIDTH 32
-#define ICON_TEXT_PADDING 1
-
 #define RSTTO_ICON_BAR_VALID_MODEL_AND_COLUMNS(obj) \
             ((obj)->priv->model != NULL && \
             (obj)->priv->file_column != -1)
diff --git a/src/icon_bar.h b/src/icon_bar.h
index 03f0e426ef207509c997cdb5b0aeb6a503db0a78..adb85593cac6c6d60425dd38196adde7c7f21113 100644
--- a/src/icon_bar.h
+++ b/src/icon_bar.h
@@ -29,10 +29,7 @@ G_BEGIN_DECLS
 
 #define RSTTO_TYPE_ICON_BAR             (rstto_icon_bar_get_type ())
 #define RSTTO_ICON_BAR(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), RSTTO_TYPE_ICON_BAR, RsttoIconBar))
-#define RSTTO_ICON_BAR_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), RSTTO_TYPE_ICON_BAR, RsttoIconBarClass))
 #define RSTTO_IS_ICON_BAR(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), RSTTO_TYPE_ICON_BAR))
-#define RSTTO_IS_ICON_BAR_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((obj), RSTTO_TYPE_ICON_BAR))
-#define RSTTO_ICON_BAR_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), RSTTO_TYPE_ICON_BAR, RsttoIconBarClass))
 
 typedef struct _RsttoIconBarPrivate RsttoIconBarPrivate;
 typedef struct _RsttoIconBarClass   RsttoIconBarClass;
diff --git a/src/image_list.c b/src/image_list.c
index 3aa69304c2b36ec86a7c3cfc790512dcdcca46d6..4c0f58d09b4235c5f50c0f5bae809f55046b2feb 100644
--- a/src/image_list.c
+++ b/src/image_list.c
@@ -20,13 +20,8 @@
  *    Copyright (c) Benedict Meurer <benny@xfce.org>
  */
 
-#include <config.h>
-
-#include <stdlib.h>
 #include <string.h>
 
-#include <libexif/exif-data.h>
-
 #include "util.h"
 #include "image_list.h"
 #include "thumbnailer.h"
diff --git a/src/image_list.h b/src/image_list.h
index 223761ef0a7c4e1bce28a2c446ec370e07af01ef..81e85ea53d56f00e7cbc15fa37313a66f282acb7 100644
--- a/src/image_list.h
+++ b/src/image_list.h
@@ -37,15 +37,6 @@ G_BEGIN_DECLS
         G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
                 RSTTO_TYPE_IMAGE_LIST))
 
-#define RSTTO_IMAGE_LIST_CLASS(klass)( \
-        G_TYPE_CHECK_CLASS_CAST ((klass), \
-                RSTTO_TYPE_IMAGE_LIST, \
-                RsttoImageListClass))
-
-#define RSTTO_IS_IMAGE_LIST_CLASS(klass)( \
-        G_TYPE_CHECK_CLASS_TYPE ((klass), \
-                RSTTO_TYPE_IMAGE_LIST()))
-
 typedef struct _RsttoImageListPriv RsttoImageListPriv;
 typedef struct _RsttoImageList RsttoImageList;
 
@@ -69,19 +60,6 @@ struct _RsttoImageListClass
                 RSTTO_TYPE_IMAGE_LIST_ITER, \
                 RsttoImageListIter))
 
-#define RSTTO_IS_IMAGE_LIST_ITER(obj)( \
-        G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-                RSTTO_TYPE_IMAGE_LIST_ITER))
-
-#define RSTTO_IMAGE_LIST_ITER_CLASS(klass)( \
-        G_TYPE_CHECK_CLASS_CAST ((klass), \
-                RSTTO_TYPE_IMAGE_LIST_ITER, \
-                RsttoImageListIterClass))
-
-#define RSTTO_IS_IMAGE_LIST_ITER_CLASS(klass)( \
-        G_TYPE_CHECK_CLASS_TYPE ((klass), \
-                RSTTO_TYPE_IMAGE_LIST_ITER()))
-
 typedef struct _RsttoImageListIter RsttoImageListIter;
 typedef struct _RsttoImageListIterPriv RsttoImageListIterPriv;
 struct _RsttoImageListIter
diff --git a/src/image_viewer.c b/src/image_viewer.c
index ebacd7304042a7c78ee3ca14764b55d829f575e8..d8331a1cf214c3b5612bfc62687c36392e650bfc 100644
--- a/src/image_viewer.c
+++ b/src/image_viewer.c
@@ -17,19 +17,13 @@
  *  02110-1301, USA.
  */
 
-#include <config.h>
-#include <string.h>
 #include <gio/gio.h>
-#include <libxfce4ui/libxfce4ui.h>
-#include <libexif/exif-data.h>
-#include <cairo/cairo.h>
 
 #include <math.h>
 
 #include "util.h"
 #include "image_viewer.h"
 #include "settings.h"
-#include "marshal.h"
 
 /* Do not make this buffer too large,
  * this breaks some pixbufloaders.
@@ -2482,8 +2476,6 @@ rstto_motion_notify_event (GtkWidget *widget, GdkEventMotion *event)
                         gtk_adjustment_set_value (adjustment,
                                 gtk_adjustment_get_lower (adjustment));
                     }
-                    if (val != gtk_adjustment_get_value (adjustment))
-                        gtk_adjustment_value_changed (adjustment);
                 }
 
                 if (viewer->priv->motion.y != viewer->priv->motion.current_y)
@@ -2503,8 +2495,6 @@ rstto_motion_notify_event (GtkWidget *widget, GdkEventMotion *event)
                         gtk_adjustment_set_value (adjustment,
                                 gtk_adjustment_get_lower (adjustment));
                     }
-                    if (val != gtk_adjustment_get_value (adjustment))
-                        gtk_adjustment_value_changed (adjustment);
                 }
                 break;
             case RSTTO_IMAGE_VIEWER_MOTION_STATE_BOX_ZOOM:
@@ -2768,14 +2758,6 @@ rstto_button_release_event (GtkWidget *widget, GdkEventButton *event)
                 g_object_thaw_notify(G_OBJECT(viewer->vadjustment));
                 g_object_thaw_notify(G_OBJECT(viewer->hadjustment));
 
-                /*
-                 * Trigger the 'changed' signal, update the rest
-                 * of
-                 * the appliaction.
-                 */
-                gtk_adjustment_changed(viewer->hadjustment);
-                gtk_adjustment_changed(viewer->vadjustment);
-
                 g_signal_emit_by_name(viewer, "scale-changed");
             }
             break;
diff --git a/src/image_viewer.h b/src/image_viewer.h
index 7ce06151fcd730937c848d11eb42547f7b93ba6d..6d4b22077fede800141294962afd143b96aeebfc 100644
--- a/src/image_viewer.h
+++ b/src/image_viewer.h
@@ -37,15 +37,6 @@ G_BEGIN_DECLS
         G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
                 RSTTO_TYPE_IMAGE_VIEWER))
 
-#define RSTTO_IMAGE_VIEWER_CLASS(klass)( \
-        G_TYPE_CHECK_CLASS_CAST ((klass), \
-                RSTTO_TYPE_IMAGE_VIEWER, \
-                RsttoImageViewerClass))
-
-#define RSTTO_IS_IMAGE_VIEWER_CLASS(klass)( \
-        G_TYPE_CHECK_CLASS_TYPE ((klass), \
-                RSTTO_TYPE_IMAGE_VIEWER()))
-
 typedef struct _RsttoImageViewerPriv RsttoImageViewerPriv;
 
 typedef struct _RsttoImageViewer RsttoImageViewer;
diff --git a/src/main.c b/src/main.c
index b4e4869d97449135fb6fea5e14a88a7c7eaabdeb..6cec195ebfddd144fd0f629f6c7165655e94456a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -25,14 +25,9 @@
 
 #include <xfconf/xfconf.h>
 #include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-#include <string.h>
 
 #include <libxfce4ui/libxfce4ui.h>
-#include <libxfce4util/libxfce4util.h>
-#include <libexif/exif-data.h>
 
-#include "util.h"
 #include "file.h"
 #include "image_list.h"
 #include "settings.h"
diff --git a/src/main_window.c b/src/main_window.c
index 7978f79576462806b1fff46201615131b337761d..780042c85dd8192a78895d5d4abae0deb68ed664 100644
--- a/src/main_window.c
+++ b/src/main_window.c
@@ -19,7 +19,6 @@
 
 #include <config.h>
 #include <gdk/gdkkeysyms.h>
-#include <X11/Xlib.h>
 #include <string.h>
 
 #include <gio/gio.h>
@@ -28,8 +27,6 @@
 #include <libxfce4ui/libxfce4ui.h>
 #include <libexif/exif-data.h>
 
-#include <cairo/cairo.h>
-
 #include "settings.h"
 #include "mime_db.h"
 #include "util.h"
diff --git a/src/main_window.h b/src/main_window.h
index 00b2115bbc215a883424eb02879a60daf77aac0e..0ed203d05adc22b5551a4ee91e5981e868a47fc1 100644
--- a/src/main_window.h
+++ b/src/main_window.h
@@ -37,15 +37,6 @@ G_BEGIN_DECLS
         G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
                 RSTTO_TYPE_MAIN_WINDOW))
 
-#define RSTTO_MAIN_WINDOW_CLASS(klass)( \
-        G_TYPE_CHECK_CLASS_CAST ((klass), \
-                RSTTO_TYPE_MAIN_WINDOW, \
-                RsttoMainWindowClass))
-
-#define RSTTO_IS_MAIN_WINDOW_CLASS(klass)( \
-        G_TYPE_CHECK_CLASS_TYPE ((klass), \
-                RSTTO_TYPE_MAIN_WINDOW()))
-
 typedef struct _RsttoMainWindowPriv RsttoMainWindowPriv;
 
 typedef struct _RsttoMainWindow RsttoMainWindow;
diff --git a/src/mime_db.c b/src/mime_db.c
index 505b6d81ca2bfd164ab9e7008b552dff9e822dac..e39331ecf583f02034bcf3b5f388d7e4c45bba4e 100644
--- a/src/mime_db.c
+++ b/src/mime_db.c
@@ -17,16 +17,8 @@
  *  02110-1301, USA.
  */
 
-#include <config.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-
 #include <glib.h>
 #include <gio/gio.h>
-#include <locale.h>
 
 #include <libxfce4util/libxfce4util.h>
 
diff --git a/src/mime_db.h b/src/mime_db.h
index 4ab5b70de4987bfeeb33509624c87d7bfac4fd49..97be37f032d9e789b3bb456b81a3f01c1c469eeb 100644
--- a/src/mime_db.h
+++ b/src/mime_db.h
@@ -31,19 +31,11 @@ G_BEGIN_DECLS
                 RSTTO_TYPE_MIME_DB, \
                 RsttoMimeDB))
 
-#define RSTTO_IS_MIME_DB(obj)( \
-        G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-                RSTTO_TYPE_MIME_DB))
-
 #define RSTTO_MIME_DB_CLASS(klass)( \
         G_TYPE_CHECK_CLASS_CAST ((klass), \
                 RSTTO_TYPE_MIME_DB, \
                 RsttoMimeDBClass))
 
-#define RSTTO_IS_MIME_DB_CLASS(klass)( \
-        G_TYPE_CHECK_CLASS_TYPE ((klass), \
-                RSTTO_TYPE_MIME_DB()))
-
 
 typedef struct _RsttoMimeDB RsttoMimeDB;
 typedef struct _RsttoMimeDBPriv RsttoMimeDBPriv;
diff --git a/src/monitor_chooser.c b/src/monitor_chooser.c
index b973aedd354ec7ef49fcec86718bd4af34582680..a65706f9b668d6cc2f8286f71ddd0ce0149f85d4 100644
--- a/src/monitor_chooser.c
+++ b/src/monitor_chooser.c
@@ -17,8 +17,6 @@
  *  02110-1301, USA.
  */
 
-#include <config.h>
-#include <string.h>
 #include <math.h>
 
 #include "monitor_chooser.h"
diff --git a/src/monitor_chooser.h b/src/monitor_chooser.h
index 2fe5e40b0807ae6138b758ba40c164e32f569d6f..203296d4ea8865ad6347df568cdb07c99e6d83d6 100644
--- a/src/monitor_chooser.h
+++ b/src/monitor_chooser.h
@@ -35,15 +35,6 @@ G_BEGIN_DECLS
         G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
                 RSTTO_TYPE_MONITOR_CHOOSER))
 
-#define RSTTO_MONITOR_CHOOSER_CLASS(klass)( \
-        G_TYPE_CHECK_CLASS_CAST ((klass), \
-                RSTTO_TYPE_MONITOR_CHOOSER, \
-                RsttoMonitorChooserClass))
-
-#define RSTTO_IS_MONITOR_CHOOSER_CLASS(klass)( \
-        G_TYPE_CHECK_CLASS_TYPE ((klass), \
-                RSTTO_TYPE_MONITOR_CHOOSER()))
-
 typedef struct _RsttoMonitorChooserPriv RsttoMonitorChooserPriv;
 
 typedef struct _RsttoMonitorChooser RsttoMonitorChooser;
diff --git a/src/preferences_dialog.c b/src/preferences_dialog.c
index 314261b40f48adf3760d7257820a23280dca033f..43e51661e8b702c53563bbbc857dd47d9fcd538d 100644
--- a/src/preferences_dialog.c
+++ b/src/preferences_dialog.c
@@ -17,9 +17,7 @@
  *  02110-1301, USA.
  */
 
-#include <config.h>
 #include <libxfce4ui/libxfce4ui.h>
-#include <libxfce4util/libxfce4util.h>
 
 #include "util.h"
 #include "settings.h"
diff --git a/src/preferences_dialog.h b/src/preferences_dialog.h
index 35832697d8edae4c4084782b0c8229cba8e60de4..fbc6f6ab51df3609fcda7c966bcd8ac6c5e9af27 100644
--- a/src/preferences_dialog.h
+++ b/src/preferences_dialog.h
@@ -31,19 +31,11 @@ G_BEGIN_DECLS
                 RSTTO_TYPE_PREFERENCES_DIALOG, \
                 RsttoPreferencesDialog))
 
-#define RSTTO_IS_PREFERENCES_DIALOG(obj)( \
-        G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-                RSTTO_TYPE_PREFERENCES_DIALOG))
-
 #define RSTTO_PREFERENCES_DIALOG_CLASS(klass)( \
         G_TYPE_CHECK_CLASS_CAST ((klass), \
                 RSTTO_TYPE_PREFERENCES_DIALOG, \
                 RsttoPreferencesDialogClass))
 
-#define RSTTO_IS_PREFERENCES_DIALOG_CLASS(klass)( \
-        G_TYPE_CHECK_CLASS_TYPE ((klass), \
-                RSTTO_TYPE_PREFERENCES_DIALOG()))
-
 typedef struct _RsttoPreferencesDialog RsttoPreferencesDialog;
 
 typedef struct _RsttoPreferencesDialogPriv RsttoPreferencesDialogPriv;
diff --git a/src/privacy_dialog.c b/src/privacy_dialog.c
index 152fa3b3d6e1b9fe2a8d2c4b555652eaefd3c924..d53803436de4d8e8b8a57e87f33d501726def5c4 100644
--- a/src/privacy_dialog.c
+++ b/src/privacy_dialog.c
@@ -17,9 +17,7 @@
  *  02110-1301, USA.
  */
 
-#include <config.h>
 #include <libxfce4ui/libxfce4ui.h>
-#include <libxfce4util/libxfce4util.h>
 
 #include "settings.h"
 #include "privacy_dialog.h"
diff --git a/src/privacy_dialog.h b/src/privacy_dialog.h
index bef4af068445d7e9a5e122385a086a40781fb89d..020053cb922d9a068b76b2e62bd16811284f8604 100644
--- a/src/privacy_dialog.h
+++ b/src/privacy_dialog.h
@@ -31,19 +31,11 @@ G_BEGIN_DECLS
                 RSTTO_TYPE_PRIVACY_DIALOG, \
                 RsttoPrivacyDialog))
 
-#define RSTTO_IS_PRIVACY_DIALOG(obj)( \
-        G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-                RSTTO_TYPE_PRIVACY_DIALOG))
-
 #define RSTTO_PRIVACY_DIALOG_CLASS(klass)( \
         G_TYPE_CHECK_CLASS_CAST ((klass), \
                 RSTTO_TYPE_PRIVACY_DIALOG, \
                 RsttoPrivacyDialogClass))
 
-#define RSTTO_IS_PRIVACY_DIALOG_CLASS(klass)( \
-        G_TYPE_CHECK_CLASS_TYPE ((klass), \
-                RSTTO_TYPE_PRIVACY_DIALOG()))
-
 typedef struct _RsttoPrivacyDialog RsttoPrivacyDialog;
 
 typedef struct _RsttoPrivacyDialogPriv RsttoPrivacyDialogPriv;
diff --git a/src/properties_dialog.c b/src/properties_dialog.c
index 4b2432dc9b9938afa948b09b156b4997bc3de5be..a250e9cb748a81bf3d3499270919192a6376ef7a 100644
--- a/src/properties_dialog.c
+++ b/src/properties_dialog.c
@@ -17,14 +17,11 @@
  *  02110-1301, USA.
  */
 
-#include <config.h>
-
 #include <libexif/exif-data.h>
 
 #include <libxfce4util/libxfce4util.h>
 
 #include "settings.h"
-#include "util.h"
 #include "file.h"
 #include "properties_dialog.h"
 
@@ -64,7 +61,7 @@ enum
     EXIF_PROP_MAKE,
     EXIF_PROP_APERATURE,
     EXIF_PROP_COUNT
-} RsttoExifProp;
+};
 
 enum
 {
diff --git a/src/properties_dialog.h b/src/properties_dialog.h
index 512b9d2c8513d6ec40ed7a42b45b2b11f6a48331..40713cff6e72f9ba55a4404634d30b69823d4081 100644
--- a/src/properties_dialog.h
+++ b/src/properties_dialog.h
@@ -31,19 +31,11 @@ G_BEGIN_DECLS
                 RSTTO_TYPE_PROPERTIES_DIALOG, \
                 RsttoPropertiesDialog))
 
-#define RSTTO_IS_PROPERTIES_DIALOG(obj)( \
-        G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-                RSTTO_TYPE_PROPERTIES_DIALOG))
-
 #define RSTTO_PROPERTIES_DIALOG_CLASS(klass)( \
         G_TYPE_CHECK_CLASS_CAST ((klass), \
                 RSTTO_TYPE_PROPERTIES_DIALOG, \
                 RsttoPropertiesDialogClass))
 
-#define RSTTO_IS_PROPERTIES_DIALOG_CLASS(klass)( \
-        G_TYPE_CHECK_CLASS_TYPE ((klass), \
-                RSTTO_TYPE_PROPERTIES_DIALOG()))
-
 typedef struct _RsttoPropertiesDialog RsttoPropertiesDialog;
 
 typedef struct _RsttoPropertiesDialogPriv RsttoPropertiesDialogPriv;
diff --git a/src/settings.c b/src/settings.c
index c16a0fab4ece842d203572d02044e2520080a0ae..5e35fa92a47b816a1084bbfc861d3e7180065be4 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -17,8 +17,6 @@
  *  02110-1301, USA.
  */
 
-#include <config.h>
-
 #include <glib.h>
 #include <gdk/gdkkeysyms.h>
 #include <xfconf/xfconf.h>
diff --git a/src/settings.h b/src/settings.h
index d3f4bea5e29f1c50d02b1e713c71380155bc3d6f..8d589d7598d100aab5d64bf94d6d126d36c07432 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -31,19 +31,11 @@ G_BEGIN_DECLS
                 RSTTO_TYPE_SETTINGS, \
                 RsttoSettings))
 
-#define RSTTO_IS_SETTINGS(obj)( \
-        G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-                RSTTO_TYPE_SETTINGS))
-
 #define RSTTO_SETTINGS_CLASS(klass)( \
         G_TYPE_CHECK_CLASS_CAST ((klass), \
                 RSTTO_TYPE_SETTINGS, \
                 RsttoSettingsClass))
 
-#define RSTTO_IS_SETTINGS_CLASS(klass)( \
-        G_TYPE_CHECK_CLASS_TYPE ((klass), \
-                RSTTO_TYPE_SETTINGS()))
-
 
 typedef struct _RsttoSettings RsttoSettings;
 typedef struct _RsttoSettingsPriv RsttoSettingsPriv;
diff --git a/src/thumbnailer.c b/src/thumbnailer.c
index b883423dc9fb42972f7e3376d8102fdab9dc39c7..6da977708eb529d48e300e4a9f9a466ba962ad44 100644
--- a/src/thumbnailer.c
+++ b/src/thumbnailer.c
@@ -17,22 +17,17 @@
  *  02110-1301, USA.
  */
 
-#include <config.h>
-
 #include <string.h>
 
 #include <glib.h>
 #include <gio/gio.h>
 
-#include <libexif/exif-data.h>
-
 #include <libxfce4util/libxfce4util.h>
 
 #include "util.h"
 #include "file.h"
 #include "settings.h"
 #include "thumbnailer.h"
-#include "marshal.h"
 #include "tumbler.h"
 
 static void
diff --git a/src/thumbnailer.h b/src/thumbnailer.h
index 806c0c853a307557d98680b42357da09156ecd24..a928cf4684f58ade6b27f901601ea98157a169e8 100644
--- a/src/thumbnailer.h
+++ b/src/thumbnailer.h
@@ -40,10 +40,6 @@ G_BEGIN_DECLS
                 RSTTO_TYPE_THUMBNAILER, \
                 RsttoThumbnailerClass))
 
-#define RSTTO_IS_THUMBNAILER_CLASS(klass)( \
-        G_TYPE_CHECK_CLASS_TYPE ((klass), \
-                RSTTO_TYPE_THUMBNAILER()))
-
 
 typedef struct _RsttoThumbnailer RsttoThumbnailer;
 typedef struct _RsttoThumbnailerPriv RsttoThumbnailerPriv;
diff --git a/src/util.c b/src/util.c
index 56b9a3312255a0725b4843ea3dc45bd3ac667aad..3ee8e2207d15490995e6380bc1d1b0ce2b3f4e78 100644
--- a/src/util.c
+++ b/src/util.c
@@ -17,7 +17,4 @@
  *  02110-1301, USA.
  */
 
-#include <config.h>
-#include <locale.h>
-
 #include "util.h"
diff --git a/src/wallpaper_manager.c b/src/wallpaper_manager.c
index 0e24b834540264e67e93a5746ac1b7fbd9817324..44d5f67bd1a64b7ca934c6f2f408ae521d63b1b4 100644
--- a/src/wallpaper_manager.c
+++ b/src/wallpaper_manager.c
@@ -17,16 +17,9 @@
  *  02110-1301, USA.
  */
 
-#include <config.h>
-#include <string.h>
-
 #include <glib.h>
 #include <glib-object.h>
-#include <gio/gio.h>
-
-#include <libexif/exif-data.h>
 
-#include "util.h"
 #include "wallpaper_manager.h"
 
 gint 
diff --git a/src/wallpaper_manager.h b/src/wallpaper_manager.h
index 89902285a5f142afe3a5338fee712da2bff7b212..b89c83ea9c7a3b53c82cb0812760434ee56d1aab 100644
--- a/src/wallpaper_manager.h
+++ b/src/wallpaper_manager.h
@@ -28,13 +28,7 @@ G_BEGIN_DECLS
 
 #define RSTTO_WALLPAPER_MANAGER_TYPE \
         rstto_wallpaper_manager_get_type ()
-#define RSTTO_WALLPAPER_MANAGER(obj)( \
-        G_TYPE_CHECK_INSTANCE_CAST ((obj), \
-                RSTTO_WALLPAPER_MANAGER_TYPE, \
-                RsttoWallpaperManager))
-#define RSTTO_IS_WALLPAPER_MANAGER(obj)( \
-        G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-                RSTTO_WALLPAPER_MANAGER_TYPE))
+
 #define RSTTO_WALLPAPER_MANAGER_GET_IFACE(inst)( \
         G_TYPE_INSTANCE_GET_INTERFACE ((inst), \
                 RSTTO_WALLPAPER_MANAGER_TYPE, \
diff --git a/src/xfce_wallpaper_manager.c b/src/xfce_wallpaper_manager.c
index ffa26f571433e00f8a32b7dc9174b3a8971a7cb3..b7354139a48c7e3e919aa76b4b90ed0c9229ad27 100644
--- a/src/xfce_wallpaper_manager.c
+++ b/src/xfce_wallpaper_manager.c
@@ -17,23 +17,12 @@
  *  02110-1301, USA.
  */
 
-#include <config.h>
-
 #include <glib.h>
 #include <gdk/gdkx.h>
-#include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <xfconf/xfconf.h>
 #include <libxfce4ui/libxfce4ui.h>
-#include <libxfce4util/libxfce4util.h>
-#include <gio/gio.h>
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gdk-pixdata.h>
-
-#include <libexif/exif-data.h>
 
-#include "util.h"
 #include "file.h"
 #include "monitor_chooser.h"
 #include "xfce_wallpaper_manager.h"
diff --git a/src/xfce_wallpaper_manager.h b/src/xfce_wallpaper_manager.h
index 52b70746e7a808aee6040d4686cf3fba9f757a4d..00ea204522f5d07be53b411ec52620d38fb45a28 100644
--- a/src/xfce_wallpaper_manager.h
+++ b/src/xfce_wallpaper_manager.h
@@ -34,19 +34,11 @@ G_BEGIN_DECLS
                 RSTTO_TYPE_XFCE_WALLPAPER_MANAGER, \
                 RsttoXfceWallpaperManager))
 
-#define RSTTO_IS_XFCE_WALLPAPER_MANAGER(obj)( \
-        G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-                RSTTO_TYPE_XFCE_WALLPAPER_MANAGER))
-
 #define RSTTO_XFCE_WALLPAPER_MANAGER_CLASS(klass)( \
         G_TYPE_CHECK_CLASS_CAST ((klass), \
                 RSTTO_TYPE_XFCE_WALLPAPER_MANAGER, \
                 RsttoXfceWallpaperManagerClass))
 
-#define RSTTO_IS_XFCE_WALLPAPER_MANAGER_CLASS(klass)( \
-        G_TYPE_CHECK_CLASS_TYPE ((klass), \
-                RSTTO_TYPE_XFCE_WALLPAPER_MANAGER()))
-
 
 typedef struct _RsttoXfceWallpaperManager RsttoXfceWallpaperManager;
 typedef struct _RsttoXfceWallpaperManagerPriv RsttoXfceWallpaperManagerPriv;