Stop abusing forward declarations.

1 files changed, 4 insertions, 7 deletions

diff --git a/e-util/e-import.h b/e-util/e-import.h
index 4474db18da..84c5061132 100644
--- a/e-util/e-import.h
+++ b/e-util/e-import.h
@@ -24,14 +24,11 @@
 #ifndef __E_IMPORT_H__
 #define __E_IMPORT_H__
 
-#include <glib-object.h>
-#include "libedataserver/e-msgport.h"
+#include <gtk/gtk.h>
+#include <libedataserver/e-msgport.h>
 
 G_BEGIN_DECLS
 
-struct _GtkWindow;
-struct _GtkWidget;
-
 /* This is an importer function */
 
 typedef struct _EImport EImport;
@@ -47,7 +44,7 @@ typedef void (*EImportStatusFunc)(EImport *ei, const gchar *what, gint pc, gpoin
 typedef void (*EImportFactoryFunc)(EImport *ei, gpointer data);
 typedef void (*EImportImporterFunc)(EImportImporter *importer, gpointer data);
 typedef gboolean (*EImportSupportedFunc)(EImport *ei, EImportTarget *, EImportImporter *im);
-typedef struct _GtkWidget *(*EImportWidgetFunc)(EImport *ei, EImportTarget *, EImportImporter *im);
+typedef GtkWidget *(*EImportWidgetFunc)(EImport *ei, EImportTarget *, EImportImporter *im);
 typedef void (*EImportImportFunc)(EImport *ei, EImportTarget *, EImportImporter *im);
 
 /* The global target types, implementors may add additional ones */
@@ -180,7 +177,7 @@ EImport *e_import_construct(EImport *, const gchar *id);
 void e_import_import(EImport *ei, EImportTarget *, EImportImporter *, EImportStatusFunc status, EImportCompleteFunc done, gpointer data);
 void e_import_cancel(EImport *, EImportTarget *, EImportImporter *);
 
-struct _GtkWidget *e_import_get_widget(EImport *ei, EImportTarget *, EImportImporter *);
+GtkWidget *e_import_get_widget(EImport *ei, EImportTarget *, EImportImporter *);
 
 void e_import_status(EImport *, EImportTarget *, const gchar *what, gint pc);
 void e_import_complete(EImport *, EImportTarget *);