diff --git a/src/dialogs/commondialog.c b/src/dialogs/commondialog.c
index 3ed29f0..9ea9886 100644
--- a/src/dialogs/commondialog.c
+++ b/src/dialogs/commondialog.c
@@ -132,9 +132,9 @@ LIB3270_EXPORT GtkWidget * v3270_dialog_new(GtkWidget *widget, const gchar *titl
 	return dialog;
 }
 
+#if GTK_CHECK_VERSION(3,12,0)
 GtkHeaderBar * v3270_dialog_get_header_bar(GtkWidget * widget)
 {
-#if GTK_CHECK_VERSION(3,12,0)
 
 	gboolean use_header = FALSE;
 
@@ -143,7 +143,7 @@ GtkHeaderBar * v3270_dialog_get_header_bar(GtkWidget * widget)
 	if(use_header)
 		return GTK_HEADER_BAR(gtk_dialog_get_header_bar(GTK_DIALOG(widget)));
 
-#endif // GTK 3.12
-
 	return NULL;
 }
+#endif // GTK 3.12
+
diff --git a/src/dialogs/settingsdialog.c b/src/dialogs/settingsdialog.c
index 670a6d0..1112ed5 100644
--- a/src/dialogs/settingsdialog.c
+++ b/src/dialogs/settingsdialog.c
@@ -273,6 +273,7 @@ static void V3270FTSettingsDialog_init(V3270FTSettingsDialog *widget)
 	g_signal_connect(G_OBJECT(widget->settings),"validity",G_CALLBACK(validity_changed),widget);
 	g_signal_connect(G_OBJECT(widget->settings),"has-activity",G_CALLBACK(has_activity_changed),widget);
 
+#if GTK_CHECK_VERSION(3,12,0)
 	// Does the dialog have header bar?
 	GtkHeaderBar * header = v3270_dialog_get_header_bar(GTK_WIDGET(widget));
 
@@ -280,6 +281,9 @@ static void V3270FTSettingsDialog_init(V3270FTSettingsDialog *widget)
 		gtk_header_bar_set_title(header,_( "3270 File transfer"));
 	else
 		gtk_window_set_title(GTK_WINDOW(widget),_( "3270 File transfer"));
+#else
+	gtk_window_set_title(GTK_WINDOW(widget),_( "3270 File transfer"));
+#endif // GTK 3.12
 
 	// https://developer.gnome.org/hig/stable/visual-layout.html.en
 	gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(widget))),18);
diff --git a/src/include/internals.h b/src/include/internals.h
index ba7db42..f077518 100644
--- a/src/include/internals.h
+++ b/src/include/internals.h
@@ -54,11 +54,9 @@
  G_GNUC_INTERNAL GtkWidget		* v3270_dialog_create_grid(GtkAlign align);
  G_GNUC_INTERNAL GtkWidget		* v3270_dialog_create_frame(GtkWidget * child, const gchar *title);
 
-#if ! GTK_CHECK_VERSION(3,12,0)
- #define GtkHeaderBar GtkWidget
-#endif // ! GTK 3.12
-
+#if GTK_CHECK_VERSION(3,12,0)
  G_GNUC_INTERNAL GtkHeaderBar	* v3270_dialog_get_header_bar(GtkWidget * widget);
+#endif // ! GTK 3.12
 
  // Activity list widget.
  #define GTK_TYPE_V3270_FT_ACTIVITY_LIST				(V3270FTActivityList_get_type ())
--
libgit2 0.21.2