17 files changed, 20 insertions, 25 deletions
diff --git a/gtk/gtkcustompaperunixdialog.c b/gtk/gtkcustompaperunixdialog.c
index a2d4cf6469..a607d417c8 100644
--- a/gtk/gtkcustompaperunixdialog.c
+++ b/gtk/gtkcustompaperunixdialog.c
@@ -35,7 +35,7 @@
 #include "gtkspinbutton.h"
 
 #include "gtkcustompaperunixdialog.h"
-#include "gtkprintbackend.h"
+#include "gtkprintbackendprivate.h"
 #include "gtkprintutils.h"
 #include "gtkdialogprivate.h"
 
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 4dce1cd7e7..2006c0d862 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -129,7 +129,7 @@
 #include "gtkwidgetprivate.h"
 #include "gtkwindowprivate.h"
 #include "gtkwindowgroup.h"
-#include "gtkprintbackend.h"
+#include "gtkprintbackendprivate.h"
 #include "gtkimmodule.h"
 #include "gtkroot.h"
 
diff --git a/gtk/gtkpagesetupunixdialog.c b/gtk/gtkpagesetupunixdialog.c
index 7c5655c7c7..030b5a9b4b 100644
--- a/gtk/gtkpagesetupunixdialog.c
+++ b/gtk/gtkpagesetupunixdialog.c
@@ -40,7 +40,7 @@
 
 #include "gtkpagesetupunixdialog.h"
 #include "gtkcustompaperunixdialog.h"
-#include "gtkprintbackend.h"
+#include "gtkprintbackendprivate.h"
 #include "gtkpapersize.h"
 #include "gtkprintutils.h"
 #include "gtkdialogprivate.h"
diff --git a/gtk/gtkprintbackend.c b/gtk/gtkprintbackend.c
index 33c419228a..94efc688b4 100644
--- a/gtk/gtkprintbackend.c
+++ b/gtk/gtkprintbackend.c
@@ -1,5 +1,5 @@
 /* GTK - The GIMP Toolkit
- * gtkprintbackend.h: Abstract printer backend interfaces
+ * gtkprintbackendprivate.h: Abstract printer backend interfaces
  * Copyright (C) 2003, Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -26,7 +26,7 @@
 #include "gtkmodulesprivate.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
-#include "gtkprintbackend.h"
+#include "gtkprintbackendprivate.h"
 
 
 static void gtk_print_backend_dispose      (GObject      *object);
diff --git a/gtk/gtkprintbackend.h b/gtk/gtkprintbackendprivate.h
index 2b4718e98c..1c6b91e228 100644
--- a/gtk/gtkprintbackend.h
+++ b/gtk/gtkprintbackendprivate.h
@@ -16,8 +16,8 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GTK_PRINT_BACKEND_H__
-#define __GTK_PRINT_BACKEND_H__
+#ifndef __GTK_PRINT_BACKEND_PRIVATE_H__
+#define __GTK_PRINT_BACKEND_PRIVATE_H__
 
 /* This is a "semi-private" header; it is meant only for
  * alternate GtkPrintDialog backend modules; no stability guarantees
@@ -139,11 +139,6 @@ struct _GtkPrintBackendClass
 								    gdouble       *bottom,
 								    gdouble       *left,
 								    gdouble       *right);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
 };
 
 #define GTK_PRINT_BACKEND_EXTENSION_POINT_NAME "gtk-print-backend"
@@ -235,4 +230,4 @@ void        gtk_print_backends_init (void);
 
 G_END_DECLS
 
-#endif /* __GTK_PRINT_BACKEND_H__ */
+#endif /* __GTK_PRINT_BACKEND_PRIVATE_H__ */
diff --git a/gtk/gtkprinter.c b/gtk/gtkprinter.c
index d7008062af..25c189265a 100644
--- a/gtk/gtkprinter.c
+++ b/gtk/gtkprinter.c
@@ -25,7 +25,7 @@
 
 #include "gtkprinter.h"
 #include "gtkprinterprivate.h"
-#include "gtkprintbackend.h"
+#include "gtkprintbackendprivate.h"
 #include "gtkprintjob.h"
 
 /**
diff --git a/gtk/gtkprinteroptionset.c b/gtk/gtkprinteroptionset.c
index 5748565c7f..4e6dbee4c9 100644
--- a/gtk/gtkprinteroptionset.c
+++ b/gtk/gtkprinteroptionset.c
@@ -1,5 +1,5 @@
 /* GTK - The GIMP Toolkit
- * gtkprintbackend.h: Abstract printer backend interfaces
+ * gtkprintbackendprivate.h: Abstract printer backend interfaces
  * Copyright (C) 2006, Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkprintjob.c b/gtk/gtkprintjob.c
index fd5b9de4a6..80b833b0ee 100644
--- a/gtk/gtkprintjob.c
+++ b/gtk/gtkprintjob.c
@@ -50,7 +50,7 @@
 #include "gtkprintjob.h"
 #include "gtkprinter.h"
 #include "gtkprinterprivate.h"
-#include "gtkprintbackend.h"
+#include "gtkprintbackendprivate.h"
 
 #ifndef O_BINARY
 #define O_BINARY 0
diff --git a/gtk/gtkprintoperation-portal.c b/gtk/gtkprintoperation-portal.c
index fa4a058efd..93cb8724e2 100644
--- a/gtk/gtkprintoperation-portal.c
+++ b/gtk/gtkprintoperation-portal.c
@@ -33,7 +33,7 @@
 #include "gtkprintoperation-portal.h"
 #include "gtkprintsettings.h"
 #include "gtkpagesetup.h"
-#include "gtkprintbackend.h"
+#include "gtkprintbackendprivate.h"
 #include "gtkshow.h"
 #include "gtkintl.h"
 #include "gtkwindowprivate.h"
diff --git a/gtk/gtkprintoperation-unix.c b/gtk/gtkprintoperation-unix.c
index 8e15763b67..16ca75cf1b 100644
--- a/gtk/gtkprintoperation-unix.c
+++ b/gtk/gtkprintoperation-unix.c
@@ -38,7 +38,7 @@
 #include "gtkprivate.h"
 #include "gtkprintunixdialog.h"
 #include "gtkpagesetupunixdialog.h"
-#include "gtkprintbackend.h"
+#include "gtkprintbackendprivate.h"
 #include "gtkprinter.h"
 #include "gtkprintjob.h"
 #include "gtklabel.h"
diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index 440c9555d4..519668665a 100644
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -28,7 +28,7 @@
 #include "gtkprintunixdialog.h"
 
 #include "gtkcustompaperunixdialog.h"
-#include "gtkprintbackend.h"
+#include "gtkprintbackendprivate.h"
 #include "gtkprinterprivate.h"
 #include "gtkprinteroptionwidget.h"
 #include "gtkprintutils.h"
diff --git a/modules/printbackends/gtkprintbackendcloudprint.c b/modules/printbackends/gtkprintbackendcloudprint.c
index 964fc75045..6a5d7755af 100644
--- a/modules/printbackends/gtkprintbackendcloudprint.c
+++ b/modules/printbackends/gtkprintbackendcloudprint.c
@@ -32,7 +32,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <gtk/gtkprintbackend.h>
+#include <gtk/gtkprintbackendprivate.h>
 #include <gtk/gtkunixprint.h>
 #include <gtk/gtkprinterprivate.h>
 
diff --git a/modules/printbackends/gtkprintbackendcloudprint.h b/modules/printbackends/gtkprintbackendcloudprint.h
index 044ad4b32b..ca7f5e0005 100644
--- a/modules/printbackends/gtkprintbackendcloudprint.h
+++ b/modules/printbackends/gtkprintbackendcloudprint.h
@@ -20,7 +20,7 @@
 #define __GTK_PRINT_BACKEND_CLOUDPRINT_H__
 
 #include <glib-object.h>
-#include "gtkprintbackend.h"
+#include "gtkprintbackendprivate.h"
 
 G_BEGIN_DECLS
 
diff --git a/modules/printbackends/gtkprintbackendcups.c b/modules/printbackends/gtkprintbackendcups.c
index 739318821a..87cf6d3ce3 100644
--- a/modules/printbackends/gtkprintbackendcups.c
+++ b/modules/printbackends/gtkprintbackendcups.c
@@ -45,7 +45,7 @@
 #include <gmodule.h>
 
 #include <gtk/gtk.h>
-#include <gtk/gtkprintbackend.h>
+#include <gtk/gtkprintbackendprivate.h>
 #include <gtk/gtkunixprint.h>
 #include <gtk/gtkprinterprivate.h>
 
diff --git a/modules/printbackends/gtkprintbackendcups.h b/modules/printbackends/gtkprintbackendcups.h
index d4e35ddf23..a37a571a35 100644
--- a/modules/printbackends/gtkprintbackendcups.h
+++ b/modules/printbackends/gtkprintbackendcups.h
@@ -20,7 +20,7 @@
 #define __GTK_PRINT_BACKEND_CUPS_H__
 
 #include <glib-object.h>
-#include "gtkprintbackend.h"
+#include "gtkprintbackendprivate.h"
 
 G_BEGIN_DECLS
 
diff --git a/modules/printbackends/gtkprintbackendfile.h b/modules/printbackends/gtkprintbackendfile.h
index b4ae41a15c..0ca051b5ff 100644
--- a/modules/printbackends/gtkprintbackendfile.h
+++ b/modules/printbackends/gtkprintbackendfile.h
@@ -21,7 +21,7 @@
 #define __GTK_PRINT_BACKEND_FILE_H__
 
 #include <glib-object.h>
-#include "gtkprintbackend.h"
+#include "gtkprintbackendprivate.h"
 
 G_BEGIN_DECLS
 
diff --git a/modules/printbackends/gtkprintbackendlpr.h b/modules/printbackends/gtkprintbackendlpr.h
index 0ba195bebd..ea8c849521 100644
--- a/modules/printbackends/gtkprintbackendlpr.h
+++ b/modules/printbackends/gtkprintbackendlpr.h
@@ -21,7 +21,7 @@
 #define __GTK_PRINT_BACKEND_LPR_H__
 
 #include <glib-object.h>
-#include "gtkprintbackend.h"
+#include "gtkprintbackendprivate.h"
 
 G_BEGIN_DECLS