[nautilus/wip/ernestask/gtk4-continued: 21/50] general: Fix header inclusions

[Ernestas Kulik <ernestask src gnome org>]

commit 13d37b38f84d4d19f9a0f95570154f6acad7615e
Author: Ernestas Kulik <ernestask gnome org>
Date:   Mon Jul 30 17:34:42 2018 +0300

    general: Fix header inclusions

 src/nautilus-canvas-container.c | 1 +
 src/nautilus-canvas-dnd.c       | 2 ++
 src/nautilus-canvas-dnd.h       | 2 +-
 src/nautilus-canvas-private.h   | 2 +-
 src/nautilus-dnd.c              | 1 +
 src/nautilus-types.h            | 2 ++
 6 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/src/nautilus-canvas-container.c b/src/nautilus-canvas-container.c
index 22a18e1e3..2d478f925 100644
--- a/src/nautilus-canvas-container.c
+++ b/src/nautilus-canvas-container.c
@@ -41,6 +41,7 @@
 #define DEBUG_FLAG NAUTILUS_DEBUG_CANVAS_CONTAINER
 #include "nautilus-debug.h"
 
+#include "nautilus-canvas-dnd.h"
 #include "nautilus-canvas-item.h"
 #include "nautilus-canvas-private.h"
 #include "nautilus-global-preferences.h"
diff --git a/src/nautilus-canvas-dnd.c b/src/nautilus-canvas-dnd.c
index a73aecedf..6b5776ec6 100644
--- a/src/nautilus-canvas-dnd.c
+++ b/src/nautilus-canvas-dnd.c
@@ -34,6 +34,8 @@
 
 #include "nautilus-canvas-dnd.h"
 
+#include "nautilus-canvas-container.h"
+#include "nautilus-canvas-item.h"
 #include "nautilus-canvas-private.h"
 #include "nautilus-global-preferences.h"
 #include "nautilus-metadata.h"
diff --git a/src/nautilus-canvas-dnd.h b/src/nautilus-canvas-dnd.h
index a094068d0..dbc65d44f 100644
--- a/src/nautilus-canvas-dnd.h
+++ b/src/nautilus-canvas-dnd.h
@@ -25,8 +25,8 @@
 
 #pragma once
 
-#include "nautilus-canvas-container.h"
 #include "nautilus-dnd.h"
+#include "nautilus-types.h"
 
 /* DnD-related information. */
 typedef struct {
diff --git a/src/nautilus-canvas-private.h b/src/nautilus-canvas-private.h
index c27906d29..06f84e372 100644
--- a/src/nautilus-canvas-private.h
+++ b/src/nautilus-canvas-private.h
@@ -24,7 +24,7 @@
 
 #include <eel/eel-glib-extensions.h>
 
-#include "nautilus-types.h"
+#include "nautilus-canvas-dnd.h"
 
 /* An Icon. */
 
diff --git a/src/nautilus-dnd.c b/src/nautilus-dnd.c
index 24f1ecacf..e0077d3fe 100644
--- a/src/nautilus-dnd.c
+++ b/src/nautilus-dnd.c
@@ -31,6 +31,7 @@
 #include <eel/eel-vfs-extensions.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
+#include "nautilus-canvas-container.h"
 #include "nautilus-file-utilities.h"
 #include "nautilus-canvas-dnd.h"
 #include "nautilus-list-view-dnd.h"
diff --git a/src/nautilus-types.h b/src/nautilus-types.h
index 56d51405d..a6f9cb8ed 100644
--- a/src/nautilus-types.h
+++ b/src/nautilus-types.h
@@ -32,6 +32,8 @@
 
 /* Keep sorted alphabetically. */
 
+typedef struct _EelCanvas                     EelCanvas;
+typedef struct _EelCanvasItem                 EelCanvasItem;
 typedef struct _NautilusBookmark              NautilusBookmark;
 typedef struct _NautilusBookmarkList          NautilusBookmarkList;
 typedef struct _NautilusCanvasContainer       NautilusCanvasContainer;