diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 9e8b2a8ac1..7fd739bcc0 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -425,6 +425,7 @@ gtk_private_h_sources =		\
 	gtkcsswidgetnodeprivate.h	\
 	gtkcustompaperunixdialog.h \
 	gtkdialogprivate.h 	\
+	gtkdndprivate.h		\
 	gtkentryprivate.h	\
 	gtkeventcontrollerprivate.h	\
 	gtkfilechooserembed.h	\
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 9efbee030c..94cc3f2725 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -44,6 +44,7 @@
 #endif
 
 #include "gtkdnd.h"
+#include "gtkdndprivate.h"
 #include "gtkiconhelperprivate.h"
 #include "gtkicontheme.h"
 #include "gtkmain.h"
diff --git a/gtk/gtkdnd.h b/gtk/gtkdnd.h
index 5f7c4eb442..d15fdb9f7f 100644
--- a/gtk/gtkdnd.h
+++ b/gtk/gtkdnd.h
@@ -247,11 +247,6 @@ gboolean gtk_drag_check_threshold (GtkWidget *widget,
 				   gint       current_x,
 				   gint       current_y);
 
-/* Internal functions */
-void _gtk_drag_source_handle_event (GtkWidget *widget,
-				    GdkEvent  *event);
-void _gtk_drag_dest_handle_event (GtkWidget *toplevel,
-				  GdkEvent  *event);
 
 G_END_DECLS
 
diff --git a/gtk/gtkdndprivate.h b/gtk/gtkdndprivate.h
new file mode 100644
index 0000000000..f3eee94034
--- /dev/null
+++ b/gtk/gtkdndprivate.h
@@ -0,0 +1,36 @@
+/* -*- Mode: C; c-file-style: "gnu"; tab-width: 8 -*- */
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2015 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GTK_DND_PRIVATE_H__
+#define __GTK_DND_PRIVATE_H__
+
+
+#include <gtk/gtkwidget.h>
+#include <gtk/gtkselection.h>
+
+
+G_BEGIN_DECLS
+
+void _gtk_drag_source_handle_event (GtkWidget *widget,
+				    GdkEvent  *event);
+void _gtk_drag_dest_handle_event   (GtkWidget *toplevel,
+				    GdkEvent  *event);
+
+G_END_DECLS
+
+#endif /* __GTK_DND_PRIVATE_H__ */
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index f50025e3c9..2907db7383 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -115,7 +115,7 @@
 #include "gtkbox.h"
 #include "gtkclipboard.h"
 #include "gtkdebug.h"
-#include "gtkdnd.h"
+#include "gtkdndprivate.h"
 #include "gtkmain.h"
 #include "gtkmenu.h"
 #include "gtkmodules.h"