diff --git a/mozilla/accessible/src/xul/nsXULFormControlAccessible.cpp b/mozilla/accessible/src/xul/nsXULFormControlAccessible.cpp
index b6d2432c64c..e91a2337f3b 100644
--- a/mozilla/accessible/src/xul/nsXULFormControlAccessible.cpp
+++ b/mozilla/accessible/src/xul/nsXULFormControlAccessible.cpp
@@ -39,11 +39,13 @@
 
 // NOTE: alphabetically ordered
 #include "nsXULFormControlAccessible.h"
+#include "nsHTMLFormControlAccessible.h"
 #include "nsIDOMHTMLInputElement.h"
 #include "nsIDOMXULButtonElement.h"
 #include "nsIDOMXULCheckboxElement.h"
 #include "nsIDOMXULMenuListElement.h"
 #include "nsIDOMXULSelectCntrlItemEl.h"
+#include "nsIDOMXULTextboxElement.h"
 #include "nsAccessibleTreeWalker.h"
 
 /**
@@ -632,7 +634,7 @@ NS_IMETHODIMP nsXULToolbarSeparatorAccessible::GetState(PRUint32 *_retval)
   */
 
 nsXULTextFieldAccessible::nsXULTextFieldAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell) :
- nsHTMLTextFieldAccessibleWrap(aNode, aShell)
+ nsLeafAccessible(aNode, aShell)
 {
 }
 
diff --git a/mozilla/accessible/src/xul/nsXULFormControlAccessible.h b/mozilla/accessible/src/xul/nsXULFormControlAccessible.h
index 10345373df5..3d553a02f18 100644
--- a/mozilla/accessible/src/xul/nsXULFormControlAccessible.h
+++ b/mozilla/accessible/src/xul/nsXULFormControlAccessible.h
@@ -42,12 +42,7 @@
 
 // NOTE: alphabetically ordered
 #include "nsAccessibleWrap.h"
-#include "nsIDOMXULTextboxElement.h"
-#ifdef MOZ_ACCESSIBILITY_ATK
-#include "nsHTMLFormControlAccessibleWrap.h"
-#else
-#include "nsHTMLFormControlAccessible.h"
-#endif
+#include "nsFormControlAccessible.h"
 
 class nsXULButtonAccessible : public nsAccessibleWrap
 // Don't inherit from nsFormControlAccessible - it doesn't allow children and a button can have a dropmarker child
@@ -152,13 +147,14 @@ public:
   NS_IMETHOD GetState(PRUint32 *_retval); 
 };
 
-class nsXULTextFieldAccessible : public nsHTMLTextFieldAccessibleWrap
+class nsXULTextFieldAccessible : public nsLeafAccessible
 {
 public:
   nsXULTextFieldAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
   NS_IMETHOD GetName(nsAString& aName) { return GetXULName(aName); }
   NS_IMETHOD GetValue(nsAString& aValue);
   NS_IMETHOD GetState(PRUint32 *aState);
+  NS_IMETHOD GetRole(PRUint32 *aRole) { *aRole = ROLE_TEXT; return NS_OK; }
 };