Update dependencies.

3 files changed, 167 insertions, 183 deletions

diff --git a/gtk/deps.mak b/gtk/deps.mak
index 11ed82d2b..6a45d3805 100644
--- a/gtk/deps.mak
+++ b/gtk/deps.mak
@@ -1,10 +1,10 @@
 # Created by DepGen.py. To recreate, run DepGen.py.
 PlatGTK.o: \
 	PlatGTK.cxx \
-	../src/Debugging.h \
-	../src/Geometry.h \
 	../include/ScintillaTypes.h \
 	../include/ScintillaMessages.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
 	../src/Platform.h \
 	../include/Scintilla.h \
 	../include/Sci_Position.h \
@@ -14,15 +14,15 @@ PlatGTK.o: \
 	Converter.h
 ScintillaGTK.o: \
 	ScintillaGTK.cxx \
-	../src/Debugging.h \
-	../src/Geometry.h \
 	../include/ScintillaTypes.h \
 	../include/ScintillaMessages.h \
 	../include/ScintillaStructures.h \
-	../src/Platform.h \
 	../include/ILoader.h \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
 	../include/Scintilla.h \
 	../include/ScintillaWidget.h \
 	../src/CharacterCategoryMap.h \
@@ -59,15 +59,15 @@ ScintillaGTK.o: \
 	Converter.h
 ScintillaGTKAccessible.o: \
 	ScintillaGTKAccessible.cxx \
-	../src/Debugging.h \
-	../src/Geometry.h \
 	../include/ScintillaTypes.h \
 	../include/ScintillaMessages.h \
 	../include/ScintillaStructures.h \
-	../src/Platform.h \
 	../include/ILoader.h \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
 	../include/Scintilla.h \
 	../include/ScintillaWidget.h \
 	../src/CharacterCategoryMap.h \
@@ -102,20 +102,20 @@ ScintillaGTKAccessible.o: \
 	ScintillaGTKAccessible.h
 AutoComplete.o: \
 	../src/AutoComplete.cxx \
-	../src/Debugging.h \
-	../src/Geometry.h \
 	../include/ScintillaTypes.h \
 	../include/ScintillaMessages.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
 	../src/Platform.h \
 	../src/CharacterType.h \
 	../src/Position.h \
 	../src/AutoComplete.h
 CallTip.o: \
 	../src/CallTip.cxx \
-	../src/Debugging.h \
-	../src/Geometry.h \
 	../include/ScintillaTypes.h \
 	../include/ScintillaMessages.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
 	../src/Platform.h \
 	../src/Position.h \
 	../src/CallTip.h
@@ -129,9 +129,8 @@ CaseFolder.o: \
 	../src/CaseConvert.h
 CellBuffer.o: \
 	../src/CellBuffer.cxx \
-	../src/Debugging.h \
 	../include/ScintillaTypes.h \
-	../include/ScintillaMessages.h \
+	../src/Debugging.h \
 	../src/Position.h \
 	../src/SplitVector.h \
 	../src/Partitioning.h \
@@ -162,9 +161,8 @@ DBCS.o: \
 	../src/DBCS.h
 Decoration.o: \
 	../src/Decoration.cxx \
-	../src/Debugging.h \
 	../include/ScintillaTypes.h \
-	../include/ScintillaMessages.h \
+	../src/Debugging.h \
 	../src/Position.h \
 	../src/SplitVector.h \
 	../src/Partitioning.h \
@@ -172,12 +170,11 @@ Decoration.o: \
 	../src/Decoration.h
 Document.o: \
 	../src/Document.cxx \
-	../src/Debugging.h \
+	../include/ScintillaTypes.h \
 	../include/ILoader.h \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
-	../include/ScintillaTypes.h \
-	../include/ScintillaMessages.h \
+	../src/Debugging.h \
 	../src/CharacterType.h \
 	../src/CharacterCategoryMap.h \
 	../src/Position.h \
@@ -195,14 +192,13 @@ Document.o: \
 	../src/ElapsedPeriod.h
 EditModel.o: \
 	../src/EditModel.cxx \
-	../src/Debugging.h \
-	../src/Geometry.h \
 	../include/ScintillaTypes.h \
-	../include/ScintillaMessages.h \
-	../src/Platform.h \
 	../include/ILoader.h \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
 	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
@@ -211,7 +207,6 @@ EditModel.o: \
 	../src/RunStyles.h \
 	../src/ContractionState.h \
 	../src/CellBuffer.h \
-	../src/KeyMap.h \
 	../src/Indicator.h \
 	../src/LineMarker.h \
 	../src/Style.h \
@@ -226,15 +221,15 @@ EditModel.o: \
 	../src/EditModel.h
 Editor.o: \
 	../src/Editor.cxx \
-	../src/Debugging.h \
-	../src/Geometry.h \
 	../include/ScintillaTypes.h \
 	../include/ScintillaMessages.h \
 	../include/ScintillaStructures.h \
-	../src/Platform.h \
 	../include/ILoader.h \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
 	../src/CharacterType.h \
 	../src/CharacterCategoryMap.h \
 	../src/Position.h \
@@ -264,15 +259,15 @@ Editor.o: \
 	../src/ElapsedPeriod.h
 EditView.o: \
 	../src/EditView.cxx \
-	../src/Debugging.h \
-	../src/Geometry.h \
 	../include/ScintillaTypes.h \
 	../include/ScintillaMessages.h \
 	../include/ScintillaStructures.h \
-	../src/Platform.h \
 	../include/ILoader.h \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
 	../src/CharacterType.h \
 	../src/CharacterCategoryMap.h \
 	../src/Position.h \
@@ -304,40 +299,38 @@ Geometry.o: \
 	../src/Geometry.h
 Indicator.o: \
 	../src/Indicator.cxx \
+	../include/ScintillaTypes.h \
 	../src/Debugging.h \
 	../src/Geometry.h \
-	../include/ScintillaTypes.h \
-	../include/ScintillaMessages.h \
 	../src/Platform.h \
 	../src/Indicator.h \
 	../src/XPM.h
 KeyMap.o: \
 	../src/KeyMap.cxx \
-	../src/Debugging.h \
 	../include/ScintillaTypes.h \
 	../include/ScintillaMessages.h \
+	../src/Debugging.h \
 	../src/KeyMap.h
 LineMarker.o: \
 	../src/LineMarker.cxx \
+	../include/ScintillaTypes.h \
 	../src/Debugging.h \
 	../src/Geometry.h \
-	../include/ScintillaTypes.h \
-	../include/ScintillaMessages.h \
 	../src/Platform.h \
 	../src/XPM.h \
 	../src/LineMarker.h \
 	../src/UniConversion.h
 MarginView.o: \
 	../src/MarginView.cxx \
-	../src/Debugging.h \
-	../src/Geometry.h \
 	../include/ScintillaTypes.h \
 	../include/ScintillaMessages.h \
 	../include/ScintillaStructures.h \
-	../src/Platform.h \
 	../include/ILoader.h \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
 	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
@@ -363,10 +356,9 @@ MarginView.o: \
 	../src/EditView.h
 PerLine.o: \
 	../src/PerLine.cxx \
+	../include/ScintillaTypes.h \
 	../src/Debugging.h \
 	../src/Geometry.h \
-	../include/ScintillaTypes.h \
-	../include/ScintillaMessages.h \
 	../src/Platform.h \
 	../src/Position.h \
 	../src/SplitVector.h \
@@ -375,14 +367,14 @@ PerLine.o: \
 	../src/PerLine.h
 PositionCache.o: \
 	../src/PositionCache.cxx \
-	../src/Debugging.h \
-	../src/Geometry.h \
 	../include/ScintillaTypes.h \
 	../include/ScintillaMessages.h \
-	../src/Platform.h \
 	../include/ILoader.h \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
 	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
@@ -411,23 +403,21 @@ RESearch.o: \
 RunStyles.o: \
 	../src/RunStyles.cxx \
 	../src/Debugging.h \
-	../include/ScintillaTypes.h \
-	../include/ScintillaMessages.h \
 	../src/Position.h \
 	../src/SplitVector.h \
 	../src/Partitioning.h \
 	../src/RunStyles.h
 ScintillaBase.o: \
 	../src/ScintillaBase.cxx \
-	../src/Debugging.h \
-	../src/Geometry.h \
 	../include/ScintillaTypes.h \
 	../include/ScintillaMessages.h \
 	../include/ScintillaStructures.h \
-	../src/Platform.h \
 	../include/ILoader.h \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
 	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
@@ -457,16 +447,13 @@ ScintillaBase.o: \
 Selection.o: \
 	../src/Selection.cxx \
 	../src/Debugging.h \
-	../include/ScintillaTypes.h \
-	../include/ScintillaMessages.h \
 	../src/Position.h \
 	../src/Selection.h
 Style.o: \
 	../src/Style.cxx \
+	../include/ScintillaTypes.h \
 	../src/Debugging.h \
 	../src/Geometry.h \
-	../include/ScintillaTypes.h \
-	../include/ScintillaMessages.h \
 	../src/Platform.h \
 	../src/Style.h
 UniConversion.o: \
@@ -477,10 +464,9 @@ UniqueString.o: \
 	../src/UniqueString.h
 ViewStyle.o: \
 	../src/ViewStyle.cxx \
+	../include/ScintillaTypes.h \
 	../src/Debugging.h \
 	../src/Geometry.h \
-	../include/ScintillaTypes.h \
-	../include/ScintillaMessages.h \
 	../src/Platform.h \
 	../src/Position.h \
 	../src/UniqueString.h \
@@ -491,8 +477,8 @@ ViewStyle.o: \
 	../src/ViewStyle.h
 XPM.o: \
 	../src/XPM.cxx \
+	../include/ScintillaTypes.h \
 	../src/Debugging.h \
 	../src/Geometry.h \
-	../include/ScintillaTypes.h \
 	../src/Platform.h \
 	../src/XPM.h
diff --git a/win32/deps.mak b/win32/deps.mak
index d9f44d995..474551cc4 100644
--- a/win32/deps.mak
+++ b/win32/deps.mak
@@ -5,30 +5,29 @@ HanjaDic.o: \
 	HanjaDic.h
 PlatWin.o: \
 	PlatWin.cxx \
+	../include/ScintillaTypes.h \
 	../src/Debugging.h \
 	../src/Geometry.h \
 	../src/Platform.h \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
 	../src/XPM.h \
 	../src/UniConversion.h \
 	../src/DBCS.h \
-	../src/FontQuality.h \
 	PlatWin.h
 ScintillaDLL.o: \
 	ScintillaDLL.cxx \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
+	../include/ScintillaTypes.h \
 	ScintillaWin.h
 ScintillaWin.o: \
 	ScintillaWin.cxx \
-	../src/Debugging.h \
-	../src/Geometry.h \
-	../src/Platform.h \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ScintillaStructures.h \
 	../include/ILoader.h \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
-	../include/Scintilla.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
 	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
@@ -63,21 +62,21 @@ ScintillaWin.o: \
 	ScintillaWin.h
 AutoComplete.o: \
 	../src/AutoComplete.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
 	../src/Debugging.h \
 	../src/Geometry.h \
 	../src/Platform.h \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
 	../src/CharacterType.h \
 	../src/Position.h \
 	../src/AutoComplete.h
 CallTip.o: \
 	../src/CallTip.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
 	../src/Debugging.h \
 	../src/Geometry.h \
 	../src/Platform.h \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
 	../src/Position.h \
 	../src/CallTip.h
 CaseConvert.o: \
@@ -90,9 +89,8 @@ CaseFolder.o: \
 	../src/CaseConvert.h
 CellBuffer.o: \
 	../src/CellBuffer.cxx \
+	../include/ScintillaTypes.h \
 	../src/Debugging.h \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
 	../src/Position.h \
 	../src/SplitVector.h \
 	../src/Partitioning.h \
@@ -123,9 +121,8 @@ DBCS.o: \
 	../src/DBCS.h
 Decoration.o: \
 	../src/Decoration.cxx \
+	../include/ScintillaTypes.h \
 	../src/Debugging.h \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
 	../src/Position.h \
 	../src/SplitVector.h \
 	../src/Partitioning.h \
@@ -133,11 +130,11 @@ Decoration.o: \
 	../src/Decoration.h
 Document.o: \
 	../src/Document.cxx \
-	../src/Debugging.h \
+	../include/ScintillaTypes.h \
 	../include/ILoader.h \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
-	../include/Scintilla.h \
+	../src/Debugging.h \
 	../src/CharacterType.h \
 	../src/CharacterCategoryMap.h \
 	../src/Position.h \
@@ -155,13 +152,13 @@ Document.o: \
 	../src/ElapsedPeriod.h
 EditModel.o: \
 	../src/EditModel.cxx \
-	../src/Debugging.h \
-	../src/Geometry.h \
-	../src/Platform.h \
+	../include/ScintillaTypes.h \
 	../include/ILoader.h \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
-	../include/Scintilla.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
 	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
@@ -170,7 +167,6 @@ EditModel.o: \
 	../src/RunStyles.h \
 	../src/ContractionState.h \
 	../src/CellBuffer.h \
-	../src/KeyMap.h \
 	../src/Indicator.h \
 	../src/LineMarker.h \
 	../src/Style.h \
@@ -185,13 +181,15 @@ EditModel.o: \
 	../src/EditModel.h
 Editor.o: \
 	../src/Editor.cxx \
-	../src/Debugging.h \
-	../src/Geometry.h \
-	../src/Platform.h \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ScintillaStructures.h \
 	../include/ILoader.h \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
-	../include/Scintilla.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
 	../src/CharacterType.h \
 	../src/CharacterCategoryMap.h \
 	../src/Position.h \
@@ -221,13 +219,15 @@ Editor.o: \
 	../src/ElapsedPeriod.h
 EditView.o: \
 	../src/EditView.cxx \
-	../src/Debugging.h \
-	../src/Geometry.h \
-	../src/Platform.h \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ScintillaStructures.h \
 	../include/ILoader.h \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
-	../include/Scintilla.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
 	../src/CharacterType.h \
 	../src/CharacterCategoryMap.h \
 	../src/Position.h \
@@ -259,38 +259,38 @@ Geometry.o: \
 	../src/Geometry.h
 Indicator.o: \
 	../src/Indicator.cxx \
+	../include/ScintillaTypes.h \
 	../src/Debugging.h \
 	../src/Geometry.h \
 	../src/Platform.h \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
 	../src/Indicator.h \
 	../src/XPM.h
 KeyMap.o: \
 	../src/KeyMap.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
 	../src/Debugging.h \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
 	../src/KeyMap.h
 LineMarker.o: \
 	../src/LineMarker.cxx \
+	../include/ScintillaTypes.h \
 	../src/Debugging.h \
 	../src/Geometry.h \
 	../src/Platform.h \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
 	../src/XPM.h \
 	../src/LineMarker.h \
 	../src/UniConversion.h
 MarginView.o: \
 	../src/MarginView.cxx \
-	../src/Debugging.h \
-	../src/Geometry.h \
-	../src/Platform.h \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ScintillaStructures.h \
 	../include/ILoader.h \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
-	../include/Scintilla.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
 	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
@@ -316,11 +316,10 @@ MarginView.o: \
 	../src/EditView.h
 PerLine.o: \
 	../src/PerLine.cxx \
+	../include/ScintillaTypes.h \
 	../src/Debugging.h \
 	../src/Geometry.h \
 	../src/Platform.h \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
 	../src/Position.h \
 	../src/SplitVector.h \
 	../src/Partitioning.h \
@@ -328,13 +327,14 @@ PerLine.o: \
 	../src/PerLine.h
 PositionCache.o: \
 	../src/PositionCache.cxx \
-	../src/Debugging.h \
-	../src/Geometry.h \
-	../src/Platform.h \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
 	../include/ILoader.h \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
-	../include/Scintilla.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
 	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
@@ -363,21 +363,21 @@ RESearch.o: \
 RunStyles.o: \
 	../src/RunStyles.cxx \
 	../src/Debugging.h \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
 	../src/Position.h \
 	../src/SplitVector.h \
 	../src/Partitioning.h \
 	../src/RunStyles.h
 ScintillaBase.o: \
 	../src/ScintillaBase.cxx \
-	../src/Debugging.h \
-	../src/Geometry.h \
-	../src/Platform.h \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ScintillaStructures.h \
 	../include/ILoader.h \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
-	../include/Scintilla.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
 	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
@@ -406,13 +406,15 @@ ScintillaBase.o: \
 	../src/ScintillaBase.h
 ScintillaBaseL.o: \
 	../src/ScintillaBase.cxx \
-	../src/Debugging.h \
-	../src/Geometry.h \
-	../src/Platform.h \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ScintillaStructures.h \
 	../include/ILoader.h \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
-	../include/Scintilla.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
 	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
@@ -442,17 +444,14 @@ ScintillaBaseL.o: \
 Selection.o: \
 	../src/Selection.cxx \
 	../src/Debugging.h \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
 	../src/Position.h \
 	../src/Selection.h
 Style.o: \
 	../src/Style.cxx \
+	../include/ScintillaTypes.h \
 	../src/Debugging.h \
 	../src/Geometry.h \
 	../src/Platform.h \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
 	../src/Style.h
 UniConversion.o: \
 	../src/UniConversion.cxx \
@@ -462,11 +461,10 @@ UniqueString.o: \
 	../src/UniqueString.h
 ViewStyle.o: \
 	../src/ViewStyle.cxx \
+	../include/ScintillaTypes.h \
 	../src/Debugging.h \
 	../src/Geometry.h \
 	../src/Platform.h \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
 	../src/Position.h \
 	../src/UniqueString.h \
 	../src/Indicator.h \
@@ -476,6 +474,7 @@ ViewStyle.o: \
 	../src/ViewStyle.h
 XPM.o: \
 	../src/XPM.cxx \
+	../include/ScintillaTypes.h \
 	../src/Debugging.h \
 	../src/Geometry.h \
 	../src/Platform.h \
diff --git a/win32/nmdeps.mak b/win32/nmdeps.mak
index 0f7f0fcbb..47c5f97f8 100644
--- a/win32/nmdeps.mak
+++ b/win32/nmdeps.mak
@@ -5,30 +5,29 @@ $(DIR_O)/HanjaDic.obj: \
 	HanjaDic.h
 $(DIR_O)/PlatWin.obj: \
 	PlatWin.cxx \
+	../include/ScintillaTypes.h \
 	../src/Debugging.h \
 	../src/Geometry.h \
 	../src/Platform.h \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
 	../src/XPM.h \
 	../src/UniConversion.h \
 	../src/DBCS.h \
-	../src/FontQuality.h \
 	PlatWin.h
 $(DIR_O)/ScintillaDLL.obj: \
 	ScintillaDLL.cxx \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
+	../include/ScintillaTypes.h \
 	ScintillaWin.h
 $(DIR_O)/ScintillaWin.obj: \
 	ScintillaWin.cxx \
-	../src/Debugging.h \
-	../src/Geometry.h \
-	../src/Platform.h \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ScintillaStructures.h \
 	../include/ILoader.h \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
-	../include/Scintilla.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
 	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
@@ -63,21 +62,21 @@ $(DIR_O)/ScintillaWin.obj: \
 	ScintillaWin.h
 $(DIR_O)/AutoComplete.obj: \
 	../src/AutoComplete.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
 	../src/Debugging.h \
 	../src/Geometry.h \
 	../src/Platform.h \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
 	../src/CharacterType.h \
 	../src/Position.h \
 	../src/AutoComplete.h
 $(DIR_O)/CallTip.obj: \
 	../src/CallTip.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
 	../src/Debugging.h \
 	../src/Geometry.h \
 	../src/Platform.h \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
 	../src/Position.h \
 	../src/CallTip.h
 $(DIR_O)/CaseConvert.obj: \
@@ -90,9 +89,8 @@ $(DIR_O)/CaseFolder.obj: \
 	../src/CaseConvert.h
 $(DIR_O)/CellBuffer.obj: \
 	../src/CellBuffer.cxx \
+	../include/ScintillaTypes.h \
 	../src/Debugging.h \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
 	../src/Position.h \
 	../src/SplitVector.h \
 	../src/Partitioning.h \
@@ -123,9 +121,8 @@ $(DIR_O)/DBCS.obj: \
 	../src/DBCS.h
 $(DIR_O)/Decoration.obj: \
 	../src/Decoration.cxx \
+	../include/ScintillaTypes.h \
 	../src/Debugging.h \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
 	../src/Position.h \
 	../src/SplitVector.h \
 	../src/Partitioning.h \
@@ -133,11 +130,11 @@ $(DIR_O)/Decoration.obj: \
 	../src/Decoration.h
 $(DIR_O)/Document.obj: \
 	../src/Document.cxx \
-	../src/Debugging.h \
+	../include/ScintillaTypes.h \
 	../include/ILoader.h \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
-	../include/Scintilla.h \
+	../src/Debugging.h \
 	../src/CharacterType.h \
 	../src/CharacterCategoryMap.h \
 	../src/Position.h \
@@ -155,13 +152,13 @@ $(DIR_O)/Document.obj: \
 	../src/ElapsedPeriod.h
 $(DIR_O)/EditModel.obj: \
 	../src/EditModel.cxx \
-	../src/Debugging.h \
-	../src/Geometry.h \
-	../src/Platform.h \
+	../include/ScintillaTypes.h \
 	../include/ILoader.h \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
-	../include/Scintilla.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
 	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
@@ -170,7 +167,6 @@ $(DIR_O)/EditModel.obj: \
 	../src/RunStyles.h \
 	../src/ContractionState.h \
 	../src/CellBuffer.h \
-	../src/KeyMap.h \
 	../src/Indicator.h \
 	../src/LineMarker.h \
 	../src/Style.h \
@@ -185,13 +181,15 @@ $(DIR_O)/EditModel.obj: \
 	../src/EditModel.h
 $(DIR_O)/Editor.obj: \
 	../src/Editor.cxx \
-	../src/Debugging.h \
-	../src/Geometry.h \
-	../src/Platform.h \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ScintillaStructures.h \
 	../include/ILoader.h \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
-	../include/Scintilla.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
 	../src/CharacterType.h \
 	../src/CharacterCategoryMap.h \
 	../src/Position.h \
@@ -221,13 +219,15 @@ $(DIR_O)/Editor.obj: \
 	../src/ElapsedPeriod.h
 $(DIR_O)/EditView.obj: \
 	../src/EditView.cxx \
-	../src/Debugging.h \
-	../src/Geometry.h \
-	../src/Platform.h \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ScintillaStructures.h \
 	../include/ILoader.h \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
-	../include/Scintilla.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
 	../src/CharacterType.h \
 	../src/CharacterCategoryMap.h \
 	../src/Position.h \
@@ -259,38 +259,38 @@ $(DIR_O)/Geometry.obj: \
 	../src/Geometry.h
 $(DIR_O)/Indicator.obj: \
 	../src/Indicator.cxx \
+	../include/ScintillaTypes.h \
 	../src/Debugging.h \
 	../src/Geometry.h \
 	../src/Platform.h \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
 	../src/Indicator.h \
 	../src/XPM.h
 $(DIR_O)/KeyMap.obj: \
 	../src/KeyMap.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
 	../src/Debugging.h \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
 	../src/KeyMap.h
 $(DIR_O)/LineMarker.obj: \
 	../src/LineMarker.cxx \
+	../include/ScintillaTypes.h \
 	../src/Debugging.h \
 	../src/Geometry.h \
 	../src/Platform.h \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
 	../src/XPM.h \
 	../src/LineMarker.h \
 	../src/UniConversion.h
 $(DIR_O)/MarginView.obj: \
 	../src/MarginView.cxx \
-	../src/Debugging.h \
-	../src/Geometry.h \
-	../src/Platform.h \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ScintillaStructures.h \
 	../include/ILoader.h \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
-	../include/Scintilla.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
 	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
@@ -316,11 +316,10 @@ $(DIR_O)/MarginView.obj: \
 	../src/EditView.h
 $(DIR_O)/PerLine.obj: \
 	../src/PerLine.cxx \
+	../include/ScintillaTypes.h \
 	../src/Debugging.h \
 	../src/Geometry.h \
 	../src/Platform.h \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
 	../src/Position.h \
 	../src/SplitVector.h \
 	../src/Partitioning.h \
@@ -328,13 +327,14 @@ $(DIR_O)/PerLine.obj: \
 	../src/PerLine.h
 $(DIR_O)/PositionCache.obj: \
 	../src/PositionCache.cxx \
-	../src/Debugging.h \
-	../src/Geometry.h \
-	../src/Platform.h \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
 	../include/ILoader.h \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
-	../include/Scintilla.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
 	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
@@ -363,21 +363,21 @@ $(DIR_O)/RESearch.obj: \
 $(DIR_O)/RunStyles.obj: \
 	../src/RunStyles.cxx \
 	../src/Debugging.h \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
 	../src/Position.h \
 	../src/SplitVector.h \
 	../src/Partitioning.h \
 	../src/RunStyles.h
 $(DIR_O)/ScintillaBase.obj: \
 	../src/ScintillaBase.cxx \
-	../src/Debugging.h \
-	../src/Geometry.h \
-	../src/Platform.h \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ScintillaStructures.h \
 	../include/ILoader.h \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
-	../include/Scintilla.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
 	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
@@ -406,13 +406,15 @@ $(DIR_O)/ScintillaBase.obj: \
 	../src/ScintillaBase.h
 $(DIR_O)/ScintillaBaseL.obj: \
 	../src/ScintillaBase.cxx \
-	../src/Debugging.h \
-	../src/Geometry.h \
-	../src/Platform.h \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ScintillaStructures.h \
 	../include/ILoader.h \
 	../include/Sci_Position.h \
 	../include/ILexer.h \
-	../include/Scintilla.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
 	../src/CharacterCategoryMap.h \
 	../src/Position.h \
 	../src/UniqueString.h \
@@ -442,17 +444,14 @@ $(DIR_O)/ScintillaBaseL.obj: \
 $(DIR_O)/Selection.obj: \
 	../src/Selection.cxx \
 	../src/Debugging.h \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
 	../src/Position.h \
 	../src/Selection.h
 $(DIR_O)/Style.obj: \
 	../src/Style.cxx \
+	../include/ScintillaTypes.h \
 	../src/Debugging.h \
 	../src/Geometry.h \
 	../src/Platform.h \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
 	../src/Style.h
 $(DIR_O)/UniConversion.obj: \
 	../src/UniConversion.cxx \
@@ -462,11 +461,10 @@ $(DIR_O)/UniqueString.obj: \
 	../src/UniqueString.h
 $(DIR_O)/ViewStyle.obj: \
 	../src/ViewStyle.cxx \
+	../include/ScintillaTypes.h \
 	../src/Debugging.h \
 	../src/Geometry.h \
 	../src/Platform.h \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
 	../src/Position.h \
 	../src/UniqueString.h \
 	../src/Indicator.h \
@@ -476,6 +474,7 @@ $(DIR_O)/ViewStyle.obj: \
 	../src/ViewStyle.h
 $(DIR_O)/XPM.obj: \
 	../src/XPM.cxx \
+	../include/ScintillaTypes.h \
 	../src/Debugging.h \
 	../src/Geometry.h \
 	../src/Platform.h \