diff --git a/dom/base/FragmentOrElement.cpp b/dom/base/FragmentOrElement.cpp
index a7350e266acd..38d9c12516fa 100644
--- a/dom/base/FragmentOrElement.cpp
+++ b/dom/base/FragmentOrElement.cpp
@@ -182,7 +182,7 @@ nsIContent::GetAssignedSlotByMode() const
 nsIContent::IMEState
 nsIContent::GetDesiredIMEState()
 {
-  if (!IsEditableInternal()) {
+  if (!IsEditable()) {
     // Check for the special case where we're dealing with elements which don't
     // have the editable flag set, but are readwrite (such as text controls).
     if (!IsElement() ||
@@ -227,7 +227,7 @@ dom::Element*
 nsIContent::GetEditingHost()
 {
   // If this isn't editable, return nullptr.
-  if (!IsEditableInternal()) {
+  if (!IsEditable()) {
     return nullptr;
   }
 
diff --git a/dom/base/nsINode.cpp b/dom/base/nsINode.cpp
index 570922708071..da9402aa3070 100644
--- a/dom/base/nsINode.cpp
+++ b/dom/base/nsINode.cpp
@@ -205,7 +205,7 @@ nsINode::CreateSlots()
 }
 
 bool
-nsINode::IsEditableInternal() const
+nsINode::IsEditable() const
 {
   if (HasFlag(NODE_IS_EDITABLE)) {
     // The node is in an editable contentEditable subtree.
diff --git a/dom/base/nsINode.h b/dom/base/nsINode.h
index bbfea7759c23..e6fa58754a4b 100644
--- a/dom/base/nsINode.h
+++ b/dom/base/nsINode.h
@@ -1217,14 +1217,7 @@ public:
     }
   }
 
-  bool IsEditable() const
-  {
-#ifdef MOZILLA_INTERNAL_API
-    return IsEditableInternal();
-#else
-    return IsEditableExternal();
-#endif
-  }
+  bool IsEditable() const;
 
   /**
    * Returns true if |this| is native anonymous (i.e. created by
@@ -1298,7 +1291,7 @@ public:
    */
   nsIContent* GetSelectionRootContent(nsIPresShell* aPresShell);
 
-  virtual nsINodeList* ChildNodes();
+  nsINodeList* ChildNodes();
   nsIContent* GetFirstChild() const { return mFirstChild; }
   nsIContent* GetLastChild() const
   {
@@ -1349,14 +1342,6 @@ public:
    */
   virtual bool IsNodeApzAwareInternal() const;
 
-  // HTML elements named <shadow> may or may not be HTMLShadowElement.  This is
-  // a way to ask an element whether it's an HTMLShadowElement.
-  virtual bool IsHTMLShadowElement() const { return false; }
-
-  // Elements named <content> may or may not be HTMLContentElement.  This is a
-  // way to ask an element whether it's an HTMLContentElement.
-  virtual bool IsHTMLContentElement() const { return false; }
-
   void GetTextContent(nsAString& aTextContent,
                       mozilla::OOMReporter& aError)
   {
@@ -1961,12 +1946,6 @@ protected:
    */
   void InvalidateChildNodes();
 
-  bool IsEditableInternal() const;
-  virtual bool IsEditableExternal() const
-  {
-    return IsEditableInternal();
-  }
-
   virtual void GetTextContentInternal(nsAString& aTextContent,
                                       mozilla::OOMReporter& aError);
   virtual void SetTextContentInternal(const nsAString& aTextContent,