diff --git a/widget/src/gtk/nsFileWidget.cpp b/widget/src/gtk/nsFileWidget.cpp
index f50b7505e858..e073f239c5d9 100644
--- a/widget/src/gtk/nsFileWidget.cpp
+++ b/widget/src/gtk/nsFileWidget.cpp
@@ -17,6 +17,7 @@
  */
 
 #include "nsFileWidget.h"
+#include "nsIToolkit.h"
 
 NS_IMPL_ISUPPORTS(nsFileWidget, nsIFileWidget::GetIID());
 
diff --git a/widget/src/gtk/nsFileWidget.h b/widget/src/gtk/nsFileWidget.h
index ebb6c3a994d8..5d70ba329ba3 100644
--- a/widget/src/gtk/nsFileWidget.h
+++ b/widget/src/gtk/nsFileWidget.h
@@ -19,12 +19,13 @@
 #ifndef nsFileWidget_h__
 #define nsFileWidget_h__
 
-#include "nsIToolkit.h"
 #include "nsIWidget.h"
 #include "nsIFileWidget.h"
 
 #include <gtk/gtk.h>
 
+class nsIToolkit;
+
 /**
  * Native GTK FileSelector wrapper
  */
diff --git a/widget/src/gtk/nsGtkEventHandler.cpp b/widget/src/gtk/nsGtkEventHandler.cpp
index 98a7dc968189..084297909035 100644
--- a/widget/src/gtk/nsGtkEventHandler.cpp
+++ b/widget/src/gtk/nsGtkEventHandler.cpp
@@ -22,7 +22,7 @@
 #include "nsWidget.h"
 #include "nsWindow.h"
 #include "nsScrollbar.h"
-#include "nsFileWidget.h"
+#include "nsIFileWidget.h"
 #include "nsGUIEvent.h"
 #include "nsIMenu.h"
 #include "nsIMenuItem.h"