gdk: Remove gdkinternals.h

gdk/gdk.c

@@ -26,18 +26,13 @@
 
 #include "gdkversionmacros.h"
 
-#include "gdkinternals.h"
-#include "gdkintl.h"
-
 #include "gdkresources.h"
 
-#include "gdk-private.h"
-
 #include "gdkconstructor.h"
-
-#ifndef HAVE_XCONVERTCASE
-#include "gdkkeysyms.h"
-#endif
+#include "gdkdebug.h"
+#include "gdkdisplay.h"
+#include "gdkintl.h"
+#include "gdk-private.h"
 
 #include <string.h>
 #include <stdlib.h>

gdk/gdkcairo.c

@@ -17,9 +17,7 @@
 
 #include "config.h"
 
-#include "gdkcairo.h"
-
-#include "gdkinternals.h"
+#include "gdkcairoprivate.h"
 
 #include <math.h>
 

gdk/gdkcairocontext.c

@@ -25,7 +25,6 @@
 #include "gdkcairocontextprivate.h"
 
 #include "gdkcairo.h"
-#include "gdkinternals.h"
 
 /**
  * GdkCairoContext:

gdk/gdkcairoprivate.h

@@ -18,6 +18,8 @@
 #ifndef __GDK_CAIRO_PRIVATE_H__
 #define __GDK_CAIRO_PRIVATE_H__
 
+#include "gdkcairo.h"
+
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <cairo.h>
 

gdk/gdkcursor.c

@@ -31,7 +31,6 @@
 #include "gdkcursorprivate.h"
 #include "gdktexture.h"
 #include "gdkintl.h"
-#include "gdkinternals.h"
 
 #include <math.h>
 #include <errno.h>

gdk/gdkdevice.c

@@ -22,7 +22,6 @@
 #include "gdkdeviceprivate.h"
 #include "gdkdevicetool.h"
 #include "gdkdisplayprivate.h"
-#include "gdkinternals.h"
 #include "gdkintl.h"
 #include "gdkkeysprivate.h"
 

gdk/gdkdevicetool.c

@@ -20,7 +20,7 @@
 #include <math.h>
 
 #include "gdkdevicetoolprivate.h"
-#include "gdkinternals.h"
+#include "gdkenumtypes.h"
 #include "gdkintl.h"
 
 /**

gdk/gdkdisplay.c

@@ -31,13 +31,12 @@
 #include "gdkclipboardprivate.h"
 #include "gdkdeviceprivate.h"
 #include "gdkdisplaymanagerprivate.h"
-#include "gdkevents.h"
-#include "gdkinternals.h"
-#include "gdkmonitorprivate.h"
 #include "gdkframeclockidleprivate.h"
+#include "gdkeventsprivate.h"
+#include "gdkglcontextprivate.h"
+#include "gdkmonitorprivate.h"
 
 #include <math.h>
-#include <glib.h>
 
 /**
  * GdkDisplay:

gdk/gdkdisplaymanager.c

@@ -27,7 +27,6 @@
 #include "gdkconfig.h"
 #include "gdkdisplaymanagerprivate.h"
 #include "gdkdisplayprivate.h"
-#include "gdkinternals.h"
 #include "gdkkeysprivate.h"
 #include "gdkintl.h"
 

gdk/gdkdrawcontext.c

@@ -22,9 +22,9 @@
 
 #include "gdkdrawcontextprivate.h"
 
-#include "gdkinternals.h"
 #include "gdkintl.h"
 #include "gdkprofilerprivate.h"
+#include "gdksurfaceprivate.h"
 
 /**
  * GdkDrawContext:

gdk/gdkdrop.c

@@ -46,9 +46,9 @@
 #include "gdkcontentserializer.h"
 #include "gdkcursor.h"
 #include "gdkdisplay.h"
+#include "gdkdragprivate.h"
 #include "gdkenumtypes.h"
 #include "gdkeventsprivate.h"
-#include "gdkinternals.h"
 #include "gdkintl.h"
 #include "gdkpipeiostreamprivate.h"
 #include "gdksurface.h"

gdk/gdkevents.c

@@ -28,7 +28,6 @@
 #include "gdkdragprivate.h"
 #include "gdkdropprivate.h"
 #include "gdkeventsprivate.h"
-#include "gdkinternals.h"
 #include "gdkintl.h"
 #include "gdkkeysprivate.h"
 #include "gdkkeysyms.h"

gdk/gdkframeclock.c

@@ -25,7 +25,6 @@
 #include "config.h"
 
 #include "gdkframeclockprivate.h"
-#include "gdkinternals.h"
 
 /**
  * GdkFrameClock:

gdk/gdkframeclockidle.c

@@ -26,7 +26,7 @@
 
 #include "gdkframeclockidleprivate.h"
 
-#include "gdkinternals.h"
+#include "gdkdebug.h"
 #include "gdkframeclockprivate.h"
 #include "gdk-private.h"
 #include "gdkprofilerprivate.h"

gdk/gdkgl.c

@@ -18,9 +18,9 @@
 #include "config.h"
 
 #include "gdkcairo.h"
-#include "gdkglcontextprivate.h"
 
-#include "gdkinternals.h"
+#include "gdkglcontextprivate.h"
+#include "gdksurfaceprivate.h"
 
 #include <epoxy/gl.h>
 #include <math.h>

gdk/gdkglcontext.c

@@ -78,7 +78,6 @@
 
 #include "gdkdebug.h"
 #include "gdkdisplayprivate.h"
-#include "gdkinternals.h"
 #include "gdkintl.h"
 #include "gdkmemorytextureprivate.h"
 

gdk/gdkglobals.c

@@ -25,7 +25,6 @@
 #include "config.h"
 
 #include "gdktypes.h"
-#include "gdkinternals.h"
 
 #include <stdio.h>
 

gdk/gdkinternals.h

@@ -1,43 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * 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/>.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-/* Uninstalled header defining types and functions internal to GDK */
-
-#ifndef __GDK_INTERNALS_H__
-#define __GDK_INTERNALS_H__
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include "gdkenumtypes.h"
-#include "gdkeventsprivate.h"
-#include "gdksurfaceprivate.h"
-#include "gdkdragprivate.h"
-#include "gdkkeysprivate.h"
-#include "gdkdeviceprivate.h"
-#include "gdkseatprivate.h"
-#include "gdkdisplayprivate.h"
-#include "gdkcairoprivate.h"
-#include "gdkglcontextprivate.h"
-#include "gdkdebug.h"
-
-#endif /* __GDK_INTERNALS_H__ */

gdk/gdkkeynames.c

@@ -25,7 +25,6 @@
 #include "config.h"
 
 #include "gdkkeysyms.h"
-#include "gdkinternals.h"
 
 /* Key handling not part of the keymap */
 

gdk/gdkpixbuf-drawable.c

@@ -25,7 +25,6 @@
 #include "gdkpixbuf.h"
 
 #include "gdksurface.h"
-#include "gdkinternals.h"
 #include "gdktextureprivate.h"
 
 #include <gdk-pixbuf/gdk-pixbuf.h>

gdk/gdkseat.c

@@ -26,7 +26,6 @@
 #include "gdkseatprivate.h"
 #include "gdkdeviceprivate.h"
 #include "gdkintl.h"
-#include "gdkinternals.h"
 
 /**
  * GdkSeat:

gdk/gdkseatdefault.c

@@ -19,7 +19,6 @@
 
 #include "gdkseatdefaultprivate.h"
 #include "gdkdevicetoolprivate.h"
-#include "gdkinternals.h"
 
 typedef struct _GdkSeatDefaultPrivate GdkSeatDefaultPrivate;
 

gdk/gdksurface.c

@@ -30,27 +30,24 @@
 #include "gdksurface.h"
 
 #include "gdk-private.h"
+#include "gdkcontentprovider.h"
 #include "gdkdeviceprivate.h"
 #include "gdkdisplayprivate.h"
 #include "gdkdragsurfaceprivate.h"
 #include "gdkeventsprivate.h"
 #include "gdkframeclockidleprivate.h"
 #include "gdkglcontextprivate.h"
-#include "gdkinternals.h"
 #include "gdkintl.h"
 #include "gdkmarshalers.h"
 #include "gdkpopupprivate.h"
 #include "gdkrectangle.h"
 #include "gdktoplevelprivate.h"
+#include "gdkvulkancontext.h"
 
 #include <math.h>
 
 #include <epoxy/gl.h>
 
-#ifdef GDK_WINDOWING_WAYLAND
-#include "wayland/gdkwayland.h"
-#endif
-
 /**
  * GdkSurface:
  *

gdk/gdktexture.c

@@ -40,7 +40,6 @@
 
 #include "gdktextureprivate.h"
 
-#include "gdkinternals.h"
 #include "gdkintl.h"
 #include "gdkmemorytextureprivate.h"
 #include "gdkpaintable.h"

gdk/gdkvulkancontext.c

@@ -25,7 +25,6 @@
 #include "gdkvulkancontextprivate.h"
 
 #include "gdkdisplayprivate.h"
-#include "gdkinternals.h"
 #include "gdkintl.h"
 
 /**

gdk/gdkvulkancontextprivate.h

@@ -23,8 +23,8 @@
 
 #include "gdkvulkancontext.h"
 
+#include "gdkdebug.h"
 #include "gdkdrawcontextprivate.h"
-#include "gdkinternals.h"
 
 #ifdef GDK_RENDERING_VULKAN
 #include <vulkan/vulkan.h>

gtk/inspector/logs.c

@@ -36,12 +36,12 @@
 #include "gtkprivate.h"
 #include "gtkroot.h"
 #include "gtkdebug.h"
-#include "gdkinternals.h"
 #include "gtknative.h"
 #include "gskdebugprivate.h"
 #include "gskrendererprivate.h"
 #include "gtkboxlayout.h"
 
+#include "gdk/gdkdebug.h"
 
 struct _GtkInspectorLogs
 {