10 files changed, 9 insertions, 34 deletions
diff --git a/libcaja-private/caja-directory-private.h b/libcaja-private/caja-directory-private.h
index 5e7b7d68..bff30b6b 100644
--- a/libcaja-private/caja-directory-private.h
+++ b/libcaja-private/caja-directory-private.h
@@ -222,8 +222,6 @@ FileMonitors * caja_directory_remove_file_monitors (CajaDirectory
 void caja_directory_add_file_monitors (CajaDirectory *directory,
 CajaFile *file,
 FileMonitors *monitors);
-void caja_directory_add_file (CajaDirectory *directory,
- CajaFile *file);
 GList * caja_directory_begin_file_name_change (CajaDirectory *directory,
 CajaFile *file);
 void caja_directory_end_file_name_change (CajaDirectory *directory,
diff --git a/libcaja-private/caja-directory.c b/libcaja-private/caja-directory.c
index 00e03499..8b315e00 100644
--- a/libcaja-private/caja-directory.c
+++ b/libcaja-private/caja-directory.c
@@ -55,8 +55,6 @@ static guint signals[LAST_SIGNAL] = { 0 };
 static GHashTable *directories;
 
 static void caja_directory_finalize (GObject *object);
-static void caja_directory_init (CajaDirectory *directory);
-static void caja_directory_class_init (CajaDirectoryClass *klass);
 static CajaDirectory *caja_directory_new (GFile *location);
 static char * real_get_name_for_self_as_new_file (CajaDirectory *directory);
 static GList * real_get_file_list (CajaDirectory *directory);
diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c
index dbb7050a..5de4ac39 100644
--- a/libcaja-private/caja-icon-container.c
+++ b/libcaja-private/caja-icon-container.c
@@ -9990,6 +9990,14 @@ caja_icon_container_accessible_finalize (GObject *object)
 G_OBJECT_CLASS (accessible_parent_class)->finalize (object);
 }
 
+G_DEFINE_TYPE_WITH_CODE (CajaIconContainerAccessible,
+ caja_icon_container_accessible,
+ eel_canvas_accessible_get_type (),
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION,
+ caja_icon_container_accessible_action_interface_init)
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION,
+ caja_icon_container_accessible_selection_interface_init));
+
 static void
 caja_icon_container_accessible_init (CajaIconContainerAccessible *accessible)
 {
@@ -10012,14 +10020,6 @@ caja_icon_container_accessible_class_init (CajaIconContainerAccessibleClass *kla
 accessible_private_data_quark = g_quark_from_static_string ("icon-container-accessible-private-data");
 }
 
-G_DEFINE_TYPE_WITH_CODE (CajaIconContainerAccessible,
- caja_icon_container_accessible,
- eel_canvas_accessible_get_type (),
- G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION,
- caja_icon_container_accessible_action_interface_init)
- G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION,
- caja_icon_container_accessible_selection_interface_init));
-
 #if ! defined (CAJA_OMIT_SELF_CHECK)
 
 static char *
diff --git a/libcaja-private/caja-keep-last-vertical-box.c b/libcaja-private/caja-keep-last-vertical-box.c
index 65b6541d..91107c69 100644
--- a/libcaja-private/caja-keep-last-vertical-box.c
+++ b/libcaja-private/caja-keep-last-vertical-box.c
@@ -26,8 +26,6 @@
 #include <config.h>
 #include "caja-keep-last-vertical-box.h"
 
-static void caja_keep_last_vertical_box_class_init (CajaKeepLastVerticalBoxClass *class);
-static void caja_keep_last_vertical_box_init (CajaKeepLastVerticalBox *box);
 static void caja_keep_last_vertical_box_size_allocate (GtkWidget *widget,
 GtkAllocation *allocation);
 
diff --git a/libcaja-private/caja-query.c b/libcaja-private/caja-query.c
index 1064fd16..70782c8e 100644
--- a/libcaja-private/caja-query.c
+++ b/libcaja-private/caja-query.c
@@ -42,9 +42,6 @@ struct CajaQueryDetails
 char *contained_text;
 };
 
-static void caja_query_class_init (CajaQueryClass *class);
-static void caja_query_init (CajaQuery *query);
-
 G_DEFINE_TYPE (CajaQuery,
 caja_query,
 G_TYPE_OBJECT);
diff --git a/libcaja-private/caja-search-engine-beagle.c b/libcaja-private/caja-search-engine-beagle.c
index a07fa75d..c01b6539 100644
--- a/libcaja-private/caja-search-engine-beagle.c
+++ b/libcaja-private/caja-search-engine-beagle.c
@@ -166,9 +166,6 @@ beagle_client_new (const char *client_name)
 return NULL;
 }
 
-static void caja_search_engine_beagle_class_init (CajaSearchEngineBeagleClass *class);
-static void caja_search_engine_beagle_init (CajaSearchEngineBeagle *engine);
-
 G_DEFINE_TYPE (CajaSearchEngineBeagle,
 caja_search_engine_beagle,
 CAJA_TYPE_SEARCH_ENGINE);
diff --git a/libcaja-private/caja-search-engine-simple.c b/libcaja-private/caja-search-engine-simple.c
index f9c6498d..b7a985d4 100644
--- a/libcaja-private/caja-search-engine-simple.c
+++ b/libcaja-private/caja-search-engine-simple.c
@@ -64,10 +64,6 @@ struct CajaSearchEngineSimpleDetails
 gboolean query_finished;
 };
 
-
-static void caja_search_engine_simple_class_init (CajaSearchEngineSimpleClass *class);
-static void caja_search_engine_simple_init (CajaSearchEngineSimple *engine);
-
 G_DEFINE_TYPE (CajaSearchEngineSimple,
 caja_search_engine_simple,
 CAJA_TYPE_SEARCH_ENGINE);
diff --git a/libcaja-private/caja-search-engine-tracker.c b/libcaja-private/caja-search-engine-tracker.c
index 33ac6d9a..102ca060 100644
--- a/libcaja-private/caja-search-engine-tracker.c
+++ b/libcaja-private/caja-search-engine-tracker.c
@@ -187,10 +187,6 @@ struct CajaSearchEngineTrackerDetails
 TrackerVersion version;
 };
 
-
-static void caja_search_engine_tracker_class_init (CajaSearchEngineTrackerClass *class);
-static void caja_search_engine_tracker_init (CajaSearchEngineTracker *engine);
-
 G_DEFINE_TYPE (CajaSearchEngineTracker,
 caja_search_engine_tracker,
 CAJA_TYPE_SEARCH_ENGINE);
diff --git a/libcaja-private/caja-search-engine.c b/libcaja-private/caja-search-engine.c
index 74782aa6..20a54190 100644
--- a/libcaja-private/caja-search-engine.c
+++ b/libcaja-private/caja-search-engine.c
@@ -46,9 +46,6 @@ enum
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
-static void caja_search_engine_class_init (CajaSearchEngineClass *class);
-static void caja_search_engine_init (CajaSearchEngine *engine);
-
 G_DEFINE_ABSTRACT_TYPE (CajaSearchEngine,
 caja_search_engine,
 G_TYPE_OBJECT);
diff --git a/libcaja-private/caja-tree-view-drag-dest.c b/libcaja-private/caja-tree-view-drag-dest.c
index 041e26a5..19aaae63 100644
--- a/libcaja-private/caja-tree-view-drag-dest.c
+++ b/libcaja-private/caja-tree-view-drag-dest.c
@@ -78,13 +78,11 @@ enum
 LAST_SIGNAL
 };
 
-static void caja_tree_view_drag_dest_init (CajaTreeViewDragDest *dest);
-static void caja_tree_view_drag_dest_class_init (CajaTreeViewDragDestClass *class);
-
 static guint signals[LAST_SIGNAL] = { 0 };
 
 G_DEFINE_TYPE (CajaTreeViewDragDest, caja_tree_view_drag_dest,
 G_TYPE_OBJECT);
+
 #define parent_class caja_tree_view_drag_dest_parent_class
 
 static const GtkTargetEntry drag_types [] =