diff --git a/gtk/gtkbindings.c b/gtk/gtkbindings.c
index fae85f5ea6..3c1ab7dde1 100644
--- a/gtk/gtkbindings.c
+++ b/gtk/gtkbindings.c
@@ -138,6 +138,7 @@
 
 
 #define GTK_TYPE_IDENTIFIER (gtk_identifier_get_type ())
+_GDK_EXTERN
 GType gtk_identifier_get_type (void) G_GNUC_CONST;
 
 
diff --git a/gtk/gtkgladecatalog.c b/gtk/gtkgladecatalog.c
index 30e0e6cfef..e1925a7c42 100644
--- a/gtk/gtkgladecatalog.c
+++ b/gtk/gtkgladecatalog.c
@@ -19,6 +19,9 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+
+#include "config.h"
+
 #include "gtkpathbar.h"
 #include "gtkcolorswatchprivate.h"
 #include "gtkcolorplaneprivate.h"
@@ -35,7 +38,7 @@ GType _gtk_scale_button_scale_get_type (void);
  * and is used to ensure the private types for use in Glade while
  * editing UI files that define GTK+'s various composite widget classes.
  */
-void
+_GDK_EXTERN void
 gtk_glade_catalog_init (const gchar *catalog_name)
 {
   g_type_ensure (GTK_TYPE_PATH_BAR);
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 12d2aa1af6..bfbaab448d 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -52,13 +52,9 @@
 #include "gtkwin32themeprivate.h"
 #endif
 
-#undef GDK_DEPRECATED
-#undef GDK_DEPRECATED_FOR
-#define GDK_DEPRECATED
-#define GDK_DEPRECATED_FOR(f)
-
 #include "deprecated/gtkrc.h"
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 
 /**
  * SECTION:gtksettings
diff --git a/gtk/gtkthemingengine.c b/gtk/gtkthemingengine.c
index 282dd4c227..8e71adb1f7 100644
--- a/gtk/gtkthemingengine.c
+++ b/gtk/gtkthemingengine.c
@@ -209,6 +209,7 @@ struct GtkThemingModuleClass
 #define GTK_THEMING_MODULE(o)    (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_THEMING_MODULE, GtkThemingModule))
 #define GTK_IS_THEMING_MODULE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_THEMING_MODULE))
 
+_GDK_EXTERN
 GType gtk_theming_module_get_type (void);
 
 G_DEFINE_TYPE (GtkThemingModule, gtk_theming_module, G_TYPE_TYPE_MODULE);