diff --git a/src/icons.c b/src/icons.c
index e190bd834..63ac413d3 100644
--- a/src/icons.c
+++ b/src/icons.c
@@ -1,3 +1,4 @@
+#include "view.h"
 #include "icons.h"
 #include "debug.h"
 #include "globals.h"
diff --git a/src/icons.h b/src/icons.h
index 85e599367..023fe7490 100644
--- a/src/icons.h
+++ b/src/icons.h
@@ -14,11 +14,6 @@ typedef struct _E_Icon    E_Icon;
 typedef struct _E_View    E_View;
 #endif
 
-#ifndef E_DND_TYPEDEF
-#define E_DND_TYPEDEF
-typedef enum _E_dnd_enum  E_dnd_enum;
-#endif
-
 struct _E_Icon
 {
    E_Object o;
diff --git a/src/view.c b/src/view.c
index cce82957f..182c276f5 100644
--- a/src/view.c
+++ b/src/view.c
@@ -11,6 +11,7 @@
 #include "file.h"
 #include "util.h"
 #include "globals.h"
+#include "icons.h"
 
 static Ecore_Event *current_ev = NULL;
 
@@ -2685,7 +2686,6 @@ e_dnd_data_request(Ecore_Event * ev)
 		       ic = ll->data;
 		       if (ic->state.selected)
 			 {
-			    int ic_size;
 			    char buf[PATH_MAX];
 			    
 			    if (first)
diff --git a/src/view.h b/src/view.h
index 666ad59c1..161564f62 100644
--- a/src/view.h
+++ b/src/view.h
@@ -7,7 +7,6 @@
 #include "fs.h"
 #include "iconbar.h"
 #include "object.h"
-#include "icons.h"
 
 #ifndef E_VIEW_TYPEDEF
 #define E_VIEW_TYPEDEF
@@ -24,12 +23,7 @@ typedef struct _E_Icon    E_Icon;
 typedef struct _E_Iconbar E_Iconbar;
 #endif
 
-#ifndef E_DND_TYPEDEF
-#define E_DND_TYPEDEF
-typedef enum _E_dnd_enum  E_dnd_enum;
-#endif
-
-enum _E_dnd_enum {
+typedef enum {
   E_DND_NONE,
   E_DND_COPY,
   E_DND_MOVE,
@@ -37,7 +31,7 @@ enum _E_dnd_enum {
   E_DND_ASK,
   E_DND_DELETED,
   E_DND_COPIED
-} ;
+} E_dnd_enum ;
 
 struct _E_View
 {