diff --git a/content/html/content/public/nsIFormControl.h b/content/html/content/public/nsIFormControl.h
index 61fdc290b4e5..d0694e9d0362 100644
--- a/content/html/content/public/nsIFormControl.h
+++ b/content/html/content/public/nsIFormControl.h
@@ -48,8 +48,6 @@ class nsFormSubmission;
enum FormControlsTypes {
NS_FORM_FIELDSET = 1,
NS_FORM_LABEL,
- NS_FORM_OPTION,
- NS_FORM_OPTGROUP,
NS_FORM_OUTPUT,
NS_FORM_LEGEND,
NS_FORM_SELECT,
diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp
index af5706ff45a7..47f983f30ccd 100644
--- a/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/content/html/content/src/nsGenericHTMLElement.cpp
@@ -2694,8 +2694,6 @@ nsGenericHTMLFormElement::IsLabelableControl() const
PRInt32 type = GetType();
return type != NS_FORM_FIELDSET &&
type != NS_FORM_LABEL &&
- type != NS_FORM_OPTION &&
- type != NS_FORM_OPTGROUP &&
type != NS_FORM_OBJECT &&
type != NS_FORM_LEGEND;
}
diff --git a/content/html/content/src/nsHTMLFormElement.cpp b/content/html/content/src/nsHTMLFormElement.cpp
index 2426ccee0b81..aeccab9382dc 100644
--- a/content/html/content/src/nsHTMLFormElement.cpp
+++ b/content/html/content/src/nsHTMLFormElement.cpp
@@ -202,8 +202,6 @@ ShouldBeInElements(nsIFormControl* aFormControl)
//
// NS_FORM_INPUT_IMAGE
// NS_FORM_LABEL
- // NS_FORM_OPTION
- // NS_FORM_OPTGROUP
// NS_FORM_LEGEND
return PR_FALSE;
diff --git a/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp b/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp
index 0a9791d1738f..e2fa2e6742c8 100644
--- a/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp
+++ b/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp
@@ -224,10 +224,6 @@ EmbedContextMenuInfo::SetFormControlType(nsIDOMEventTarget *originalTarget)
break;
case NS_FORM_LABEL:
break;
- case NS_FORM_OPTION:
- break;
- case NS_FORM_OPTGROUP:
- break;
case NS_FORM_LEGEND:
break;
case NS_FORM_SELECT: