diff --git a/gtk/deprecated/gtkaction.c b/gtk/deprecated/gtkaction.c
index 1aaddf0351..af8bb1e285 100644
--- a/gtk/deprecated/gtkaction.c
+++ b/gtk/deprecated/gtkaction.c
@@ -86,7 +86,7 @@
 #include "gtkmarshalers.h"
 #include "gtkmenuitem.h"
 #include "gtkstock.h"
-#include "deprecated/gtktearoffmenuitem.h"
+#include "gtktearoffmenuitem.h"
 #include "gtktoolbutton.h"
 #include "gtktoolbar.h"
 #include "gtkprivate.h"
diff --git a/gtk/deprecated/gtkactivatable.c b/gtk/deprecated/gtkactivatable.c
index 6539792768..072b2cc530 100644
--- a/gtk/deprecated/gtkactivatable.c
+++ b/gtk/deprecated/gtkactivatable.c
@@ -259,7 +259,9 @@
  */
 
 #include "config.h"
+
 #define GDK_DISABLE_DEPRECATION_WARNINGS
+
 #include "gtkactivatable.h"
 #include "gtkactiongroup.h"
 #include "gtkprivate.h"
diff --git a/gtk/deprecated/gtkcolorseldialog.c b/gtk/deprecated/gtkcolorseldialog.c
index 7710c33f6e..87408f7745 100644
--- a/gtk/deprecated/gtkcolorseldialog.c
+++ b/gtk/deprecated/gtkcolorseldialog.c
@@ -25,7 +25,6 @@
 
 #define GDK_DISABLE_DEPRECATION_WARNINGS
 
-
 #include <string.h>
 #include <glib.h>
 #include "gtkcolorseldialog.h"
diff --git a/gtk/deprecated/gtkfontsel.c b/gtk/deprecated/gtkfontsel.c
index 9badb423c8..9440c422ce 100644
--- a/gtk/deprecated/gtkfontsel.c
+++ b/gtk/deprecated/gtkfontsel.c
@@ -53,9 +53,6 @@
 #include "gtkbuildable.h"
 #include "gtkorientable.h"
 #include "gtkprivate.h"
-
-#define GDK_DISABLE_DEPRECATION_WARNINGS
-
 #include "gtkfontsel.h"
 
 /**
diff --git a/gtk/deprecated/gtkgradient.c b/gtk/deprecated/gtkgradient.c
index 9a0dd64d3c..11cde72368 100644
--- a/gtk/deprecated/gtkgradient.c
+++ b/gtk/deprecated/gtkgradient.c
@@ -20,7 +20,6 @@
 #define GDK_DISABLE_DEPRECATION_WARNINGS
 
 #include "gtkgradientprivate.h"
-
 #include "gtkcsscolorvalueprivate.h"
 #include "gtkcssrgbavalueprivate.h"
 #include "gtkstylecontextprivate.h"
diff --git a/gtk/deprecated/gtkiconfactory.c b/gtk/deprecated/gtkiconfactory.c
index eb3a20591b..a3427ae5b4 100644
--- a/gtk/deprecated/gtkiconfactory.c
+++ b/gtk/deprecated/gtkiconfactory.c
@@ -41,7 +41,7 @@
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
 #include "gtktypebuiltins.h"
-#include "deprecated/gtkstyle.h"
+#include "gtkstyle.h"
 
 /**
  * SECTION:gtkiconfactory
diff --git a/gtk/deprecated/gtkuimanager.c b/gtk/deprecated/gtkuimanager.c
index 37e4ef7a89..df845103d7 100644
--- a/gtk/deprecated/gtkuimanager.c
+++ b/gtk/deprecated/gtkuimanager.c
@@ -48,7 +48,7 @@
 #include "gtkprivate.h"
 
 #include "gtkuimanager.h"
-#include "deprecated/gtktearoffmenuitem.h"
+#include "gtktearoffmenuitem.h"
 
 /**
  * SECTION:gtkuimanager