diff --git a/widget/src/gtk/gtklayout.c b/widget/src/gtk/gtklayout.c
index df1c49a6c08b..d5c753349356 100644
--- a/widget/src/gtk/gtklayout.c
+++ b/widget/src/gtk/gtklayout.c
@@ -7,6 +7,8 @@
  * The coding style should be that of the the GTK core.
  */
 
+#ifndef GTK_HAVE_FEATURES_1_1_6
+
 #include "gtklayout.h"
 #include <gtk/gtksignal.h>
 #include <gdk/gdkx.h>
@@ -1137,3 +1139,6 @@ gtk_layout_gravity_works (void)
   
   return  (y == -20);
 }
+
+#endif
+/* end #ifndef GTK_HAVE_FEATURES_1_1_6 */
diff --git a/widget/src/gtk/nsButton.cpp b/widget/src/gtk/nsButton.cpp
index e0f1226dd281..58870324c5ef 100644
--- a/widget/src/gtk/nsButton.cpp
+++ b/widget/src/gtk/nsButton.cpp
@@ -17,7 +17,6 @@
  */
 
 #include <gtk/gtk.h>
-#include "gtklayout.h"
 
 #include "nsButton.h"
 #include "nsToolkit.h"
diff --git a/widget/src/gtk/nsLabel.cpp b/widget/src/gtk/nsLabel.cpp
index 3cf50474a189..a7df7396d5d6 100644
--- a/widget/src/gtk/nsLabel.cpp
+++ b/widget/src/gtk/nsLabel.cpp
@@ -17,7 +17,6 @@
  */
 
 #include <gtk/gtk.h>
-#include "gtklayout.h"
 
 #include "nsLabel.h"
 #include "nsToolkit.h"
diff --git a/widget/src/gtk/nsListBox.cpp b/widget/src/gtk/nsListBox.cpp
index f4d03a145c19..db709f26eb45 100644
--- a/widget/src/gtk/nsListBox.cpp
+++ b/widget/src/gtk/nsListBox.cpp
@@ -17,7 +17,6 @@
  */
 
 #include <gtk/gtk.h>
-#include "gtklayout.h"
 
 #include "nsListBox.h"
 #include "nsColor.h"
diff --git a/widget/src/gtk/nsMenuBar.cpp b/widget/src/gtk/nsMenuBar.cpp
index 711c264f23e5..cb2e7311d4a4 100644
--- a/widget/src/gtk/nsMenuBar.cpp
+++ b/widget/src/gtk/nsMenuBar.cpp
@@ -17,7 +17,6 @@
  */
 
 #include <gtk/gtk.h>
-#include "gtklayout.h"
 
 #include "nsMenuBar.h"
 #include "nsIMenu.h"
diff --git a/widget/src/gtk/nsWidget.h b/widget/src/gtk/nsWidget.h
index d52c42258f67..8adb61fc8645 100644
--- a/widget/src/gtk/nsWidget.h
+++ b/widget/src/gtk/nsWidget.h
@@ -27,8 +27,9 @@
 #include "nsIEventListener.h"
 
 #include <gtk/gtk.h>
+#ifndef GTK_HAVE_FEATURES_1_1_6
 #include "gtklayout.h"
-
+#endif
 /**
  * Base of all GTK native widgets.
  */