From 7f30e926b8b4c9132acbe23482e061ee876e5ac8 Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Fri, 8 Jul 2016 14:03:31 +0900
Subject: [PATCH] Bug 1260651 part.60 editor/libeditor should export some
 headers which are required by other modules and other modules shouldn't use
 local include for them r=mccr8

MozReview-Commit-ID: FZSExwkHH2B
---
 dom/html/moz.build                                  | 1 -
 dom/ipc/moz.build                                   | 1 -
 editor/libeditor/CSSEditUtils.cpp                   | 4 ++--
 editor/libeditor/CSSEditUtils.h                     | 8 ++++----
 editor/libeditor/ChangeAttributeTransaction.h       | 2 +-
 editor/libeditor/ChangeStyleTransaction.cpp         | 2 +-
 editor/libeditor/ChangeStyleTransaction.h           | 8 ++++----
 editor/libeditor/CompositionTransaction.h           | 2 +-
 editor/libeditor/CreateElementTransaction.h         | 2 +-
 editor/libeditor/DeleteNodeTransaction.h            | 2 +-
 editor/libeditor/DeleteTextTransaction.h            | 2 +-
 editor/libeditor/EditAggregateTransaction.h         | 2 +-
 editor/libeditor/EditTransactionBase.cpp            | 2 +-
 editor/libeditor/EditTransactionBase.h              | 6 +++---
 editor/libeditor/EditorBase.cpp                     | 4 ++--
 editor/libeditor/EditorUtils.cpp                    | 2 +-
 editor/libeditor/EditorUtils.h                      | 6 +++---
 editor/libeditor/HTMLAbsPositionEditor.cpp          | 2 +-
 editor/libeditor/HTMLEditRules.cpp                  | 4 ++--
 editor/libeditor/HTMLEditor.cpp                     | 2 +-
 editor/libeditor/HTMLEditor.h                       | 3 +--
 editor/libeditor/HTMLEditorDataTransfer.cpp         | 2 +-
 editor/libeditor/HTMLEditorObjectResizer.cpp        | 2 +-
 editor/libeditor/HTMLStyleEditor.cpp                | 2 +-
 editor/libeditor/HTMLTableEditor.cpp                | 2 +-
 editor/libeditor/InsertNodeTransaction.h            | 2 +-
 editor/libeditor/InsertTextTransaction.h            | 2 +-
 editor/libeditor/JoinNodeTransaction.h              | 2 +-
 editor/libeditor/PlaceholderTransaction.h           | 2 +-
 editor/libeditor/SelectionState.cpp                 | 2 +-
 editor/libeditor/SetDocumentTitleTransaction.h      | 2 +-
 editor/libeditor/SplitNodeTransaction.h             | 2 +-
 editor/libeditor/StyleSheetTransactions.h           | 2 +-
 editor/libeditor/TextEditRules.cpp                  | 2 +-
 editor/libeditor/TextEditor.cpp                     | 2 +-
 editor/libeditor/TextEditorDataTransfer.cpp         | 2 +-
 editor/libeditor/WSRunObject.cpp                    | 2 +-
 editor/libeditor/moz.build                          | 4 ++++
 extensions/spellcheck/hunspell/glue/moz.build       | 1 -
 extensions/spellcheck/src/moz.build                 | 1 -
 extensions/spellcheck/src/mozInlineSpellChecker.cpp | 2 +-
 layout/build/moz.build                              | 1 -
 layout/forms/moz.build                              | 1 -
 layout/generic/moz.build                            | 1 -
 44 files changed, 53 insertions(+), 57 deletions(-)

diff --git a/dom/html/moz.build b/dom/html/moz.build
index 3389e5abb12f..73c3ba55dfd8 100644
--- a/dom/html/moz.build
+++ b/dom/html/moz.build
@@ -232,7 +232,6 @@ LOCAL_INCLUDES += [
     '/dom/media/',
     '/dom/xbl',
     '/dom/xul',
-    '/editor/libeditor',
     '/editor/txmgr',
     '/image',
     '/layout/forms',
diff --git a/dom/ipc/moz.build b/dom/ipc/moz.build
index 6aa6dc5bd231..b245a149b7e7 100644
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -140,7 +140,6 @@ LOCAL_INCLUDES += [
     '/dom/security',
     '/dom/storage',
     '/dom/workers',
-    '/editor/libeditor',
     '/embedding/components/printingui/ipc',
     '/extensions/cookie',
     '/extensions/spellcheck/src',
diff --git a/editor/libeditor/CSSEditUtils.cpp b/editor/libeditor/CSSEditUtils.cpp
index fdbea2a7f9fc..cd81bf164a4e 100644
--- a/editor/libeditor/CSSEditUtils.cpp
+++ b/editor/libeditor/CSSEditUtils.cpp
@@ -3,10 +3,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "CSSEditUtils.h"
+#include "mozilla/CSSEditUtils.h"
 
-#include "ChangeStyleTransaction.h"
 #include "mozilla/Assertions.h"
+#include "mozilla/ChangeStyleTransaction.h"
 #include "mozilla/HTMLEditor.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/css/Declaration.h"
diff --git a/editor/libeditor/CSSEditUtils.h b/editor/libeditor/CSSEditUtils.h
index b594cf2812cf..0b9a12952743 100644
--- a/editor/libeditor/CSSEditUtils.h
+++ b/editor/libeditor/CSSEditUtils.h
@@ -3,10 +3,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef CSSEditUtils_h
-#define CSSEditUtils_h
+#ifndef mozilla_CSSEditUtils_h
+#define mozilla_CSSEditUtils_h
 
-#include "ChangeStyleTransaction.h" // for ChangeStyleTransaction::EChangeType
+#include "mozilla/ChangeStyleTransaction.h" // for ChangeStyleTransaction
 #include "nsCOMPtr.h"               // for already_AddRefed
 #include "nsTArray.h"               // for nsTArray
 #include "nscore.h"                 // for nsAString, nsresult, nullptr
@@ -470,4 +470,4 @@ private:
 
 } // namespace mozilla
 
-#endif // #ifndef CSSEditUtils_h
+#endif // #ifndef mozilla_CSSEditUtils_h
diff --git a/editor/libeditor/ChangeAttributeTransaction.h b/editor/libeditor/ChangeAttributeTransaction.h
index 82e8c72e1018..bb0c26c38ca6 100644
--- a/editor/libeditor/ChangeAttributeTransaction.h
+++ b/editor/libeditor/ChangeAttributeTransaction.h
@@ -6,8 +6,8 @@
 #ifndef ChangeAttributeTransaction_h
 #define ChangeAttributeTransaction_h
 
-#include "EditTransactionBase.h"          // base class
 #include "mozilla/Attributes.h"           // override
+#include "mozilla/EditTransactionBase.h"  // base class
 #include "nsCOMPtr.h"                     // nsCOMPtr members
 #include "nsCycleCollectionParticipant.h" // NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED
 #include "nsISupportsImpl.h"              // NS_DECL_ISUPPORTS_INHERITED
diff --git a/editor/libeditor/ChangeStyleTransaction.cpp b/editor/libeditor/ChangeStyleTransaction.cpp
index 2f86288ed1c7..e0b36a9afda7 100644
--- a/editor/libeditor/ChangeStyleTransaction.cpp
+++ b/editor/libeditor/ChangeStyleTransaction.cpp
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "ChangeStyleTransaction.h"
+#include "mozilla/ChangeStyleTransaction.h"
 
 #include "mozilla/dom/Element.h"        // for Element
 #include "nsAString.h"                  // for nsAString_internal::Append, etc
diff --git a/editor/libeditor/ChangeStyleTransaction.h b/editor/libeditor/ChangeStyleTransaction.h
index 3aef66083938..14c2cdcb5827 100644
--- a/editor/libeditor/ChangeStyleTransaction.h
+++ b/editor/libeditor/ChangeStyleTransaction.h
@@ -3,10 +3,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef ChangeStyleTransaction_h
-#define ChangeStyleTransaction_h
+#ifndef mozilla_ChangeStyleTransaction_h
+#define mozilla_ChangeStyleTransaction_h
 
-#include "EditTransactionBase.h"          // base class
+#include "mozilla/EditTransactionBase.h"  // base class
 #include "nsCOMPtr.h"                     // nsCOMPtr members
 #include "nsCycleCollectionParticipant.h" // various macros
 #include "nsString.h"                     // nsString members
@@ -120,4 +120,4 @@ private:
 
 } // namespace mozilla
 
-#endif // #ifndef ChangeStyleTransaction_h
+#endif // #ifndef mozilla_ChangeStyleTransaction_h
diff --git a/editor/libeditor/CompositionTransaction.h b/editor/libeditor/CompositionTransaction.h
index 7b1f013c3c66..69b0a00429bb 100644
--- a/editor/libeditor/CompositionTransaction.h
+++ b/editor/libeditor/CompositionTransaction.h
@@ -6,7 +6,7 @@
 #ifndef CompositionTransaction_h
 #define CompositionTransaction_h
 
-#include "EditTransactionBase.h"          // base class
+#include "mozilla/EditTransactionBase.h"  // base class
 #include "nsCycleCollectionParticipant.h" // various macros
 #include "nsString.h"                     // mStringToInsert
 
diff --git a/editor/libeditor/CreateElementTransaction.h b/editor/libeditor/CreateElementTransaction.h
index b50227e2f3f4..70fecceaef01 100644
--- a/editor/libeditor/CreateElementTransaction.h
+++ b/editor/libeditor/CreateElementTransaction.h
@@ -6,7 +6,7 @@
 #ifndef CreateElementTransaction_h
 #define CreateElementTransaction_h
 
-#include "EditTransactionBase.h"
+#include "mozilla/EditTransactionBase.h"
 #include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsISupportsImpl.h"
diff --git a/editor/libeditor/DeleteNodeTransaction.h b/editor/libeditor/DeleteNodeTransaction.h
index 3def7767e1a6..d0bc0dd46142 100644
--- a/editor/libeditor/DeleteNodeTransaction.h
+++ b/editor/libeditor/DeleteNodeTransaction.h
@@ -6,7 +6,7 @@
 #ifndef DeleteNodeTransaction_h
 #define DeleteNodeTransaction_h
 
-#include "EditTransactionBase.h"
+#include "mozilla/EditTransactionBase.h"
 #include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsIContent.h"
diff --git a/editor/libeditor/DeleteTextTransaction.h b/editor/libeditor/DeleteTextTransaction.h
index 8df7b9c9230e..855d1434960a 100644
--- a/editor/libeditor/DeleteTextTransaction.h
+++ b/editor/libeditor/DeleteTextTransaction.h
@@ -6,7 +6,7 @@
 #ifndef DeleteTextTransaction_h
 #define DeleteTextTransaction_h
 
-#include "EditTransactionBase.h"
+#include "mozilla/EditTransactionBase.h"
 #include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsGenericDOMDataNode.h"
diff --git a/editor/libeditor/EditAggregateTransaction.h b/editor/libeditor/EditAggregateTransaction.h
index 2bdf0fdc094b..6ba27a01fdfc 100644
--- a/editor/libeditor/EditAggregateTransaction.h
+++ b/editor/libeditor/EditAggregateTransaction.h
@@ -6,7 +6,7 @@
 #ifndef EditAggregateTransaction_h
 #define EditAggregateTransaction_h
 
-#include "EditTransactionBase.h"
+#include "mozilla/EditTransactionBase.h"
 #include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsIAtom.h"
diff --git a/editor/libeditor/EditTransactionBase.cpp b/editor/libeditor/EditTransactionBase.cpp
index 3b7ff8b3c140..2905baa8c0d1 100644
--- a/editor/libeditor/EditTransactionBase.cpp
+++ b/editor/libeditor/EditTransactionBase.cpp
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "EditTransactionBase.h"
+#include "mozilla/EditTransactionBase.h"
 #include "nsError.h"
 #include "nsISupportsBase.h"
 
diff --git a/editor/libeditor/EditTransactionBase.h b/editor/libeditor/EditTransactionBase.h
index b07c7747d306..f09449f07377 100644
--- a/editor/libeditor/EditTransactionBase.h
+++ b/editor/libeditor/EditTransactionBase.h
@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef EditTransactionBase_h
-#define EditTransactionBase_h
+#ifndef mozilla_EditTransactionBase_h
+#define mozilla_EditTransactionBase_h
 
 #include "nsCycleCollectionParticipant.h"
 #include "nsISupportsImpl.h"
@@ -41,4 +41,4 @@ protected:
   NS_IMETHOD UndoTransaction() override; \
   NS_IMETHOD GetTxnDescription(nsAString& aTransactionDescription) override;
 
-#endif // #ifndef EditTransactionBase_h
+#endif // #ifndef mozilla_EditTransactionBase_h
diff --git a/editor/libeditor/EditorBase.cpp b/editor/libeditor/EditorBase.cpp
index 0e10726e3d95..c9a2fffb7ee7 100644
--- a/editor/libeditor/EditorBase.cpp
+++ b/editor/libeditor/EditorBase.cpp
@@ -18,8 +18,6 @@
 #include "DeleteTextTransaction.h"      // for DeleteTextTransaction
 #include "EditAggregateTransaction.h"   // for EditAggregateTransaction
 #include "EditorEventListener.h"        // for EditorEventListener
-#include "EditorUtils.h"                // for AutoRules, etc
-#include "EditTransactionBase.h"        // for EditTransactionBase
 #include "InsertNodeTransaction.h"      // for InsertNodeTransaction
 #include "InsertTextTransaction.h"      // for InsertTextTransaction
 #include "JoinNodeTransaction.h"        // for JoinNodeTransaction
@@ -30,6 +28,8 @@
 #include "mozFlushType.h"               // for mozFlushType::Flush_Frames
 #include "mozInlineSpellChecker.h"      // for mozInlineSpellChecker
 #include "mozilla/CheckedInt.h"         // for CheckedInt
+#include "mozilla/EditorUtils.h"        // for AutoRules, etc
+#include "mozilla/EditTransactionBase.h" // for EditTransactionBase
 #include "mozilla/IMEStateManager.h"    // for IMEStateManager
 #include "mozilla/Preferences.h"        // for Preferences
 #include "mozilla/dom/Selection.h"      // for Selection, etc
diff --git a/editor/libeditor/EditorUtils.cpp b/editor/libeditor/EditorUtils.cpp
index f24c97a73e2f..a3273072aeb9 100644
--- a/editor/libeditor/EditorUtils.cpp
+++ b/editor/libeditor/EditorUtils.cpp
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "EditorUtils.h"
+#include "mozilla/EditorUtils.h"
 
 #include "mozilla/OwningNonNull.h"
 #include "mozilla/dom/Selection.h"
diff --git a/editor/libeditor/EditorUtils.h b/editor/libeditor/EditorUtils.h
index 0a4ca6b49eba..34286da8a908 100644
--- a/editor/libeditor/EditorUtils.h
+++ b/editor/libeditor/EditorUtils.h
@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 
-#ifndef EditorUtils_h
-#define EditorUtils_h
+#ifndef mozilla_EditorUtils_h
+#define mozilla_EditorUtils_h
 
 #include "mozilla/EditorBase.h"
 #include "mozilla/GuardObjects.h"
@@ -312,4 +312,4 @@ private:
 
 } // namespace mozilla
 
-#endif // #ifndef EditorUtils_h
+#endif // #ifndef mozilla_EditorUtils_h
diff --git a/editor/libeditor/HTMLAbsPositionEditor.cpp b/editor/libeditor/HTMLAbsPositionEditor.cpp
index 7c29f03f8d7b..bab501c1207e 100644
--- a/editor/libeditor/HTMLAbsPositionEditor.cpp
+++ b/editor/libeditor/HTMLAbsPositionEditor.cpp
@@ -6,11 +6,11 @@
 
 #include <math.h>
 
-#include "EditorUtils.h"
 #include "HTMLEditorObjectResizerUtils.h"
 #include "HTMLEditRules.h"
 #include "HTMLEditUtils.h"
 #include "TextEditUtils.h"
+#include "mozilla/EditorUtils.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/dom/Selection.h"
 #include "mozilla/dom/Element.h"
diff --git a/editor/libeditor/HTMLEditRules.cpp b/editor/libeditor/HTMLEditRules.cpp
index 33acd38c4dba..cb899c981786 100644
--- a/editor/libeditor/HTMLEditRules.cpp
+++ b/editor/libeditor/HTMLEditRules.cpp
@@ -8,12 +8,12 @@
 
 #include <stdlib.h>
 
-#include "CSSEditUtils.h"
-#include "EditorUtils.h"
 #include "HTMLEditUtils.h"
 #include "TextEditUtils.h"
 #include "WSRunObject.h"
 #include "mozilla/Assertions.h"
+#include "mozilla/CSSEditUtils.h"
+#include "mozilla/EditorUtils.h"
 #include "mozilla/HTMLEditor.h"
 #include "mozilla/MathAlgorithms.h"
 #include "mozilla/Preferences.h"
diff --git a/editor/libeditor/HTMLEditor.cpp b/editor/libeditor/HTMLEditor.cpp
index d19206e205f3..7a4b61dfdd07 100644
--- a/editor/libeditor/HTMLEditor.cpp
+++ b/editor/libeditor/HTMLEditor.cpp
@@ -55,7 +55,7 @@
 #include "nsNetUtil.h"
 
 // Misc
-#include "EditorUtils.h"
+#include "mozilla/EditorUtils.h"
 #include "HTMLEditorObjectResizerUtils.h"
 #include "TextEditorTest.h"
 #include "WSRunObject.h"
diff --git a/editor/libeditor/HTMLEditor.h b/editor/libeditor/HTMLEditor.h
index c4f3fa498d9f..bb3e21572775 100644
--- a/editor/libeditor/HTMLEditor.h
+++ b/editor/libeditor/HTMLEditor.h
@@ -6,9 +6,8 @@
 #ifndef mozilla_HTMLEditor_h
 #define mozilla_HTMLEditor_h
 
-#include "CSSEditUtils.h"
-
 #include "mozilla/Attributes.h"
+#include "mozilla/CSSEditUtils.h"
 #include "mozilla/StyleSheetHandle.h"
 #include "mozilla/TextEditor.h"
 #include "mozilla/dom/Element.h"
diff --git a/editor/libeditor/HTMLEditorDataTransfer.cpp b/editor/libeditor/HTMLEditorDataTransfer.cpp
index 004fb84573b7..d5f67b628fa5 100644
--- a/editor/libeditor/HTMLEditorDataTransfer.cpp
+++ b/editor/libeditor/HTMLEditorDataTransfer.cpp
@@ -8,7 +8,6 @@
 
 #include <string.h>
 
-#include "EditorUtils.h"
 #include "HTMLEditUtils.h"
 #include "TextEditUtils.h"
 #include "WSRunObject.h"
@@ -19,6 +18,7 @@
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Base64.h"
 #include "mozilla/BasicEvents.h"
+#include "mozilla/EditorUtils.h"
 #include "mozilla/OwningNonNull.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/SelectionState.h"
diff --git a/editor/libeditor/HTMLEditorObjectResizer.cpp b/editor/libeditor/HTMLEditorObjectResizer.cpp
index 779904c56835..3bbb73da055f 100644
--- a/editor/libeditor/HTMLEditorObjectResizer.cpp
+++ b/editor/libeditor/HTMLEditorObjectResizer.cpp
@@ -6,9 +6,9 @@
 #include "mozilla/HTMLEditor.h"
 #include "HTMLEditorObjectResizerUtils.h"
 
-#include "EditorUtils.h"
 #include "HTMLEditUtils.h"
 #include "mozilla/DebugOnly.h"
+#include "mozilla/EditorUtils.h"
 #include "mozilla/LookAndFeel.h"
 #include "mozilla/MathAlgorithms.h"
 #include "mozilla/Preferences.h"
diff --git a/editor/libeditor/HTMLStyleEditor.cpp b/editor/libeditor/HTMLStyleEditor.cpp
index 6b7a6377545c..2e14caba5c5d 100644
--- a/editor/libeditor/HTMLStyleEditor.cpp
+++ b/editor/libeditor/HTMLStyleEditor.cpp
@@ -5,11 +5,11 @@
 
 #include "mozilla/HTMLEditor.h"
 
-#include "EditorUtils.h"
 #include "HTMLEditUtils.h"
 #include "TextEditUtils.h"
 #include "TypeInState.h"
 #include "mozilla/Assertions.h"
+#include "mozilla/EditorUtils.h"
 #include "mozilla/SelectionState.h"
 #include "mozilla/dom/Selection.h"
 #include "mozilla/dom/Element.h"
diff --git a/editor/libeditor/HTMLTableEditor.cpp b/editor/libeditor/HTMLTableEditor.cpp
index 8f8c9741c00b..ce880da2f540 100644
--- a/editor/libeditor/HTMLTableEditor.cpp
+++ b/editor/libeditor/HTMLTableEditor.cpp
@@ -7,9 +7,9 @@
 
 #include "mozilla/HTMLEditor.h"
 
-#include "EditorUtils.h"
 #include "HTMLEditUtils.h"
 #include "mozilla/Assertions.h"
+#include "mozilla/EditorUtils.h"
 #include "mozilla/dom/Selection.h"
 #include "mozilla/dom/Element.h"
 #include "nsAString.h"
diff --git a/editor/libeditor/InsertNodeTransaction.h b/editor/libeditor/InsertNodeTransaction.h
index 1d675b59a901..7aa8cb4555f7 100644
--- a/editor/libeditor/InsertNodeTransaction.h
+++ b/editor/libeditor/InsertNodeTransaction.h
@@ -6,7 +6,7 @@
 #ifndef InsertNodeTransaction_h
 #define InsertNodeTransaction_h
 
-#include "EditTransactionBase.h"        // for EditTransactionBase, etc
+#include "mozilla/EditTransactionBase.h" // for EditTransactionBase, etc
 #include "nsCOMPtr.h"                   // for nsCOMPtr
 #include "nsCycleCollectionParticipant.h"
 #include "nsIContent.h"                 // for nsIContent
diff --git a/editor/libeditor/InsertTextTransaction.h b/editor/libeditor/InsertTextTransaction.h
index 51a9f349ec17..defc2d3cf21b 100644
--- a/editor/libeditor/InsertTextTransaction.h
+++ b/editor/libeditor/InsertTextTransaction.h
@@ -6,7 +6,7 @@
 #ifndef InsertTextTransaction_h
 #define InsertTextTransaction_h
 
-#include "EditTransactionBase.h"        // base class
+#include "mozilla/EditTransactionBase.h"  // base class
 #include "nsCycleCollectionParticipant.h" // various macros
 #include "nsID.h"                       // NS_DECLARE_STATIC_IID_ACCESSOR
 #include "nsISupportsImpl.h"            // NS_DECL_ISUPPORTS_INHERITED
diff --git a/editor/libeditor/JoinNodeTransaction.h b/editor/libeditor/JoinNodeTransaction.h
index 2007f77214c0..6a2d112585ad 100644
--- a/editor/libeditor/JoinNodeTransaction.h
+++ b/editor/libeditor/JoinNodeTransaction.h
@@ -6,7 +6,7 @@
 #ifndef JoinNodeTransaction_h
 #define JoinNodeTransaction_h
 
-#include "EditTransactionBase.h"        // for EditTransactionBase, etc
+#include "mozilla/EditTransactionBase.h" // for EditTransactionBase, etc
 #include "nsCOMPtr.h"                   // for nsCOMPtr
 #include "nsCycleCollectionParticipant.h"
 #include "nsID.h"                       // for REFNSIID
diff --git a/editor/libeditor/PlaceholderTransaction.h b/editor/libeditor/PlaceholderTransaction.h
index 7476d840715e..867a82ce31a8 100644
--- a/editor/libeditor/PlaceholderTransaction.h
+++ b/editor/libeditor/PlaceholderTransaction.h
@@ -7,7 +7,7 @@
 #define PlaceholderTransaction_h
 
 #include "EditAggregateTransaction.h"
-#include "EditorUtils.h"
+#include "mozilla/EditorUtils.h"
 #include "nsIAbsorbingTransaction.h"
 #include "nsIDOMNode.h"
 #include "nsCOMPtr.h"
diff --git a/editor/libeditor/SelectionState.cpp b/editor/libeditor/SelectionState.cpp
index 8eb55a71fa0c..8d000e79ac91 100644
--- a/editor/libeditor/SelectionState.cpp
+++ b/editor/libeditor/SelectionState.cpp
@@ -5,8 +5,8 @@
 
 #include "mozilla/SelectionState.h"
 
-#include "EditorUtils.h"                // for EditorUtils
 #include "mozilla/Assertions.h"         // for MOZ_ASSERT, etc
+#include "mozilla/EditorUtils.h"        // for EditorUtils
 #include "mozilla/dom/Selection.h"      // for Selection
 #include "nsAString.h"                  // for nsAString_internal::Length
 #include "nsCycleCollectionParticipant.h"
diff --git a/editor/libeditor/SetDocumentTitleTransaction.h b/editor/libeditor/SetDocumentTitleTransaction.h
index 59c2407e4962..d0cf06c99c12 100644
--- a/editor/libeditor/SetDocumentTitleTransaction.h
+++ b/editor/libeditor/SetDocumentTitleTransaction.h
@@ -6,7 +6,7 @@
 #ifndef SetDocumentTitleTransaction_h
 #define SetDocumentTitleTransaction_h
 
-#include "EditTransactionBase.h"        // for EditTransactionBase, etc
+#include "mozilla/EditTransactionBase.h" // for EditTransactionBase, etc
 #include "nsString.h"                   // for nsString
 #include "nscore.h"                     // for NS_IMETHOD, nsAString, etc
 
diff --git a/editor/libeditor/SplitNodeTransaction.h b/editor/libeditor/SplitNodeTransaction.h
index 1b0ee9239c36..b26332cd49a4 100644
--- a/editor/libeditor/SplitNodeTransaction.h
+++ b/editor/libeditor/SplitNodeTransaction.h
@@ -6,7 +6,7 @@
 #ifndef SplitNodeTransaction_h
 #define SplitNodeTransaction_h
 
-#include "EditTransactionBase.h"        // for EditTxn, etc
+#include "mozilla/EditTransactionBase.h" // for EditTxn, etc
 #include "nsCOMPtr.h"                   // for nsCOMPtr
 #include "nsCycleCollectionParticipant.h"
 #include "nsISupportsImpl.h"            // for NS_DECL_ISUPPORTS_INHERITED
diff --git a/editor/libeditor/StyleSheetTransactions.h b/editor/libeditor/StyleSheetTransactions.h
index 4606d61e1756..4d88092a33ec 100644
--- a/editor/libeditor/StyleSheetTransactions.h
+++ b/editor/libeditor/StyleSheetTransactions.h
@@ -6,7 +6,7 @@
 #ifndef StylesheetTransactions_h
 #define StylesheetTransactions_h
 
-#include "EditTransactionBase.h"        // for EditTransactionBase, etc
+#include "mozilla/EditTransactionBase.h" // for EditTransactionBase, etc
 #include "mozilla/StyleSheetHandle.h"   // for mozilla::StyleSheetHandle
 #include "nsCycleCollectionParticipant.h"
 #include "nsID.h"                       // for REFNSIID
diff --git a/editor/libeditor/TextEditRules.cpp b/editor/libeditor/TextEditRules.cpp
index 5b8f5d8536ba..57ada753b93d 100644
--- a/editor/libeditor/TextEditRules.cpp
+++ b/editor/libeditor/TextEditRules.cpp
@@ -5,9 +5,9 @@
 
 #include "mozilla/TextEditRules.h"
 
-#include "EditorUtils.h"
 #include "TextEditUtils.h"
 #include "mozilla/Assertions.h"
+#include "mozilla/EditorUtils.h"
 #include "mozilla/LookAndFeel.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/TextComposition.h"
diff --git a/editor/libeditor/TextEditor.cpp b/editor/libeditor/TextEditor.cpp
index c403bd6849e2..93a1c3617a33 100644
--- a/editor/libeditor/TextEditor.cpp
+++ b/editor/libeditor/TextEditor.cpp
@@ -5,11 +5,11 @@
 
 #include "mozilla/TextEditor.h"
 
-#include "EditorUtils.h"  // AutoEditBatch, AutoRules
 #include "InternetCiter.h"
 #include "TextEditUtils.h"
 #include "gfxFontUtils.h"
 #include "mozilla/Assertions.h"
+#include "mozilla/EditorUtils.h" // AutoEditBatch, AutoRules
 #include "mozilla/mozalloc.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/TextEditRules.h"
diff --git a/editor/libeditor/TextEditorDataTransfer.cpp b/editor/libeditor/TextEditorDataTransfer.cpp
index 745ed423904d..4d79483aba69 100644
--- a/editor/libeditor/TextEditorDataTransfer.cpp
+++ b/editor/libeditor/TextEditorDataTransfer.cpp
@@ -5,8 +5,8 @@
 
 #include "mozilla/TextEditor.h"
 
-#include "EditorUtils.h"
 #include "mozilla/ArrayUtils.h"
+#include "mozilla/EditorUtils.h"
 #include "mozilla/MouseEvents.h"
 #include "mozilla/SelectionState.h"
 #include "mozilla/dom/Selection.h"
diff --git a/editor/libeditor/WSRunObject.cpp b/editor/libeditor/WSRunObject.cpp
index 0e957651e2cd..cc7a6dd05de1 100644
--- a/editor/libeditor/WSRunObject.cpp
+++ b/editor/libeditor/WSRunObject.cpp
@@ -5,11 +5,11 @@
 
 #include "WSRunObject.h"
 
-#include "EditorUtils.h"
 #include "TextEditUtils.h"
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Casting.h"
+#include "mozilla/EditorUtils.h"
 #include "mozilla/HTMLEditor.h"
 #include "mozilla/mozalloc.h"
 #include "mozilla/OwningNonNull.h"
diff --git a/editor/libeditor/moz.build b/editor/libeditor/moz.build
index d01efe0dd965..89bb4fd4f3d3 100644
--- a/editor/libeditor/moz.build
+++ b/editor/libeditor/moz.build
@@ -18,8 +18,12 @@ EXPORTS += [
 ]
 
 EXPORTS.mozilla += [
+    'ChangeStyleTransaction.h',
+    'CSSEditUtils.h',
     'EditorBase.h',
     'EditorController.h',
+    'EditorUtils.h',
+    'EditTransactionBase.h',
     'HTMLEditor.h',
     'SelectionState.h',
     'TextEditor.h',
diff --git a/extensions/spellcheck/hunspell/glue/moz.build b/extensions/spellcheck/hunspell/glue/moz.build
index 447115b0e6a6..5a2626d35b23 100644
--- a/extensions/spellcheck/hunspell/glue/moz.build
+++ b/extensions/spellcheck/hunspell/glue/moz.build
@@ -18,7 +18,6 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../src',
     '/dom/base',
-    '/editor/libeditor',
     '/extensions/spellcheck/src',
 ]
 
diff --git a/extensions/spellcheck/src/moz.build b/extensions/spellcheck/src/moz.build
index b866aa7821ae..162f1b415aae 100644
--- a/extensions/spellcheck/src/moz.build
+++ b/extensions/spellcheck/src/moz.build
@@ -21,7 +21,6 @@ LOCAL_INCLUDES += [
     '../hunspell/glue',
     '../hunspell/src',
     '/dom/base',
-    '/editor/libeditor',
 ]
 EXPORTS.mozilla += [
      'mozSpellChecker.h',
diff --git a/extensions/spellcheck/src/mozInlineSpellChecker.cpp b/extensions/spellcheck/src/mozInlineSpellChecker.cpp
index 8196354aedd7..babd8ab4b927 100644
--- a/extensions/spellcheck/src/mozInlineSpellChecker.cpp
+++ b/extensions/spellcheck/src/mozInlineSpellChecker.cpp
@@ -32,8 +32,8 @@
  * when we know that we are checking as a result of navigation.
  */
 
-#include "EditorUtils.h"
 #include "mozilla/EditorBase.h"
+#include "mozilla/EditorUtils.h"
 #include "mozilla/Services.h"
 #include "mozilla/dom/Selection.h"
 #include "mozInlineSpellChecker.h"
diff --git a/layout/build/moz.build b/layout/build/moz.build
index dcc91d5b4ed0..a39c82faa0bd 100644
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -57,7 +57,6 @@ LOCAL_INCLUDES += [
     '/dom/xul',
     '/dom/xul/templates',
     '/editor/composer',
-    '/editor/libeditor',
     '/editor/txmgr',
     '/editor/txtsvc',
     '/extensions/cookie',
diff --git a/layout/forms/moz.build b/layout/forms/moz.build
index f86b68305a39..aadf4d62a3d9 100644
--- a/layout/forms/moz.build
+++ b/layout/forms/moz.build
@@ -43,7 +43,6 @@ UNIFIED_SOURCES += [
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../../editor/libeditor',
     '../../editor/txmgr',
     '../base',
     '../generic',
diff --git a/layout/generic/moz.build b/layout/generic/moz.build
index 689941a0b146..1391a32bbec1 100644
--- a/layout/generic/moz.build
+++ b/layout/generic/moz.build
@@ -196,7 +196,6 @@ LOCAL_INCLUDES += [
     '/dom/base',
     '/dom/html',
     '/dom/xul',
-    '/editor/libeditor'
 ]
 
 JAR_MANIFESTS += ['jar.mn']