Update make dependencies.

2 files changed, 125 insertions, 91 deletions

diff --git a/win32/deps.mak b/win32/deps.mak
index a9466cdf1..8580b27c0 100644
--- a/win32/deps.mak
+++ b/win32/deps.mak
@@ -7,12 +7,17 @@ ScintillaWin.o: ScintillaWin.cxx ../include/Platform.h \
  ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h \
  ../src/XPM.h ../src/LineMarker.h ../src/Style.h ../src/AutoComplete.h \
  ../src/ViewStyle.h ../src/CharClassify.h ../src/Decoration.h \
- ../src/Document.h ../src/Selection.h ../src/PositionCache.h \
- ../src/Editor.h ../src/ScintillaBase.h ../src/UniConversion.h PlatWin.h
+ ../src/CaseFolder.h ../src/Document.h ../src/Selection.h \
+ ../src/PositionCache.h ../src/Editor.h ../src/ScintillaBase.h \
+ ../src/UniConversion.h ../src/CaseConvert.h PlatWin.h
 AutoComplete.o: ../src/AutoComplete.cxx ../include/Platform.h \
  ../lexlib/CharacterSet.h ../src/AutoComplete.h ../include/Scintilla.h
 CallTip.o: ../src/CallTip.cxx ../include/Platform.h \
  ../include/Scintilla.h ../src/CallTip.h
+CaseConvert.o: ../src/CaseConvert.cxx ../src/CaseConvert.h \
+ ../src/UniConversion.h ../src/UnicodeFromUTF8.h
+CaseFolder.o: ../src/CaseFolder.cxx ../src/CaseConvert.h \
+ ../src/UniConversion.h ../src/CaseFolder.h
 Catalogue.o: ../src/Catalogue.cxx ../include/ILexer.h \
  ../include/Scintilla.h ../include/SciLexer.h ../lexlib/LexerModule.h \
  ../src/Catalogue.h
@@ -30,14 +35,16 @@ Document.o: ../src/Document.cxx ../include/Platform.h ../include/ILexer.h \
  ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \
  ../src/RunStyles.h ../src/CellBuffer.h ../src/PerLine.h \
  ../src/CharClassify.h ../lexlib/CharacterSet.h ../src/Decoration.h \
- ../src/Document.h ../src/RESearch.h ../src/UniConversion.h
+ ../src/CaseFolder.h ../src/Document.h ../src/RESearch.h \
+ ../src/UniConversion.h
 Editor.o: ../src/Editor.cxx ../include/Platform.h ../include/ILexer.h \
  ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \
  ../src/RunStyles.h ../src/ContractionState.h ../src/CellBuffer.h \
  ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \
  ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h \
- ../src/Decoration.h ../src/Document.h ../src/UniConversion.h \
- ../src/Selection.h ../src/PositionCache.h ../src/Editor.h
+ ../src/Decoration.h ../src/CaseFolder.h ../src/Document.h \
+ ../src/UniConversion.h ../src/Selection.h ../src/PositionCache.h \
+ ../src/Editor.h
 ExternalLexer.o: ../src/ExternalLexer.cxx ../include/Platform.h \
  ../include/ILexer.h ../include/Scintilla.h ../include/SciLexer.h \
  ../lexlib/LexerModule.h ../src/Catalogue.h ../src/ExternalLexer.h
@@ -55,8 +62,9 @@ PositionCache.o: ../src/PositionCache.cxx ../include/Platform.h \
  ../src/RunStyles.h ../src/ContractionState.h ../src/CellBuffer.h \
  ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \
  ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h \
- ../src/Decoration.h ../include/ILexer.h ../src/Document.h \
- ../src/Selection.h ../src/PositionCache.h
+ ../src/Decoration.h ../include/ILexer.h ../src/CaseFolder.h \
+ ../src/Document.h ../src/UniConversion.h ../src/Selection.h \
+ ../src/PositionCache.h
 RESearch.o: ../src/RESearch.cxx ../src/CharClassify.h ../src/RESearch.h
 RunStyles.o: ../src/RunStyles.cxx ../include/Platform.h \
  ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \
@@ -67,9 +75,9 @@ ScintillaBase.o: ../src/ScintillaBase.cxx ../include/Platform.h \
  ../src/ContractionState.h ../src/CellBuffer.h ../src/CallTip.h \
  ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \
  ../src/Style.h ../src/ViewStyle.h ../src/AutoComplete.h \
- ../src/CharClassify.h ../src/Decoration.h ../src/Document.h \
- ../src/Selection.h ../src/PositionCache.h ../src/Editor.h \
- ../src/ScintillaBase.h
+ ../src/CharClassify.h ../src/Decoration.h ../src/CaseFolder.h \
+ ../src/Document.h ../src/Selection.h ../src/PositionCache.h \
+ ../src/Editor.h ../src/ScintillaBase.h
 Selection.o: ../src/Selection.cxx ../include/Platform.h \
  ../include/Scintilla.h ../src/Selection.h
 Style.o: ../src/Style.cxx ../include/Platform.h ../include/Scintilla.h \
@@ -250,7 +258,8 @@ LexHaskell.o: ../lexers/LexHaskell.cxx ../include/ILexer.h \
  ../include/Scintilla.h ../include/SciLexer.h ../lexlib/PropSetSimple.h \
  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
  ../lexlib/StyleContext.h ../lexlib/CharacterSet.h \
- ../lexlib/LexerModule.h ../lexlib/OptionSet.h
+ ../lexlib/LexerModule.h ../lexlib/OptionSet.h \
+ ../lexlib/CharacterCategory.h
 LexHTML.o: ../lexers/LexHTML.cxx ../include/ILexer.h \
  ../include/Scintilla.h ../include/SciLexer.h ../lexlib/WordList.h \
  ../lexlib/LexAccessor.h ../lexlib/Accessor.h ../lexlib/StyleContext.h \
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index 13ecd43cc..9d3e4ee7b 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -87,7 +87,7 @@ SOBJS=\
 	$(DIR_O)\ViewStyle.obj \
 	$(DIR_O)\XPM.obj
 
-#++Autogenerated -- run src/LexGen.py to regenerate
+#++Autogenerated -- run scripts/LexGen.py to regenerate
 #**LEXOBJS=\\\n\(\t$(DIR_O)\\\*.obj \\\n\)
 LEXOBJS=\
 	$(DIR_O)\LexA68k.obj \
@@ -262,48 +262,56 @@ LEX_HEADERS= ..\include\ILexer.h ..\include\Scintilla.h ..\include\SciLexer.h \
  ..\lexlib\Accessor.h ..\lexlib\CharacterSet.h ..\lexlib\LexAccessor.h \
  ..\lexlib\LexerModule.h ..\lexlib\StyleContext.h
 
+$(DIR_O)\Accessor.obj: ../lexlib/Accessor.cxx ../include/ILexer.h \
+  ../include/Scintilla.h ../include/SciLexer.h ../lexlib/PropSetSimple.h \
+  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h
 $(DIR_O)\AutoComplete.obj: ../src/AutoComplete.cxx ../include/Platform.h \
-  ../src/AutoComplete.h
-$(DIR_O)\Accessor.obj: ../lexlib/Accessor.cxx ../lexlib/Accessor.h
+  ../lexlib/CharacterSet.h ../src/AutoComplete.h ../include/Scintilla.h
 $(DIR_O)\CallTip.obj: ../src/CallTip.cxx ../include/Platform.h \
   ../include/Scintilla.h ../src/CallTip.h
 $(DIR_O)\CaseConvert.obj: ../src/CaseConvert.cxx ../src/CaseConvert.h \
-  ../src/UnicodeFromUTF8.h ../src/UniConversion.h
-$(DIR_O)\CaseFolder.obj: ../src/CaseFolder.cxx ../src/CaseFolder.h \
-  ../src/CaseConvert.h ../src/UniConversion.h
+  ../src/UniConversion.h ../src/UnicodeFromUTF8.h
+$(DIR_O)\CaseFolder.obj: ../src/CaseFolder.cxx ../src/CaseConvert.h \
+  ../src/UniConversion.h ../src/CaseFolder.h
+$(DIR_O)\Catalogue.obj: ../src/Catalogue.cxx ../include/ILexer.h \
+  ../include/Scintilla.h ../include/SciLexer.h ../lexlib/LexerModule.h \
+  ../src/Catalogue.h
 $(DIR_O)\CellBuffer.obj: ../src/CellBuffer.cxx ../include/Platform.h \
-  ../include/Scintilla.h ../src/SplitVector.h \
-  ../src/Partitioning.h ../src/CellBuffer.h
+  ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \
+  ../src/CellBuffer.h ../src/UniConversion.h
 $(DIR_O)\CharacterCategory.obj: ../lexlib/CharacterCategory.cxx \
-../lexlib/CharacterCategory.h
+  ../lexlib/CharacterCategory.h
 $(DIR_O)\CharacterSet.obj: ../lexlib/CharacterSet.cxx ../lexlib/CharacterSet.h
 $(DIR_O)\CharClassify.obj: ../src/CharClassify.cxx ../src/CharClassify.h
 $(DIR_O)\ContractionState.obj: ../src/ContractionState.cxx ../include/Platform.h \
+  ../src/SplitVector.h ../src/Partitioning.h ../src/RunStyles.h \
   ../src/ContractionState.h
 $(DIR_O)\Decoration.obj: ../src/Decoration.cxx ../include/Platform.h \
   ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \
   ../src/RunStyles.h ../src/Decoration.h
-$(DIR_O)\Document.obj: ../src/Document.cxx ../include/Platform.h \
-  ../include/Scintilla.h ../src/SplitVector.h \
-  ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \
-  ../src/CharClassify.h ../src/Decoration.h ../src/Document.h \
-  ../src/RESearch.h ../src/PerLine.h ../src/CaseFolder.h
-$(DIR_O)\Editor.obj: ../src/Editor.cxx ../include/Platform.h ../include/Scintilla.h \
-  ../src/ContractionState.h ../src/SplitVector.h \
-  ../src/Partitioning.h ../src/CellBuffer.h ../src/KeyMap.h \
-  ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \
+$(DIR_O)\Document.obj: ../src/Document.cxx ../include/Platform.h ../include/ILexer.h \
+  ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \
+  ../src/RunStyles.h ../src/CellBuffer.h ../src/PerLine.h \
+  ../src/CharClassify.h ../lexlib/CharacterSet.h ../src/Decoration.h \
+  ../src/CaseFolder.h ../src/Document.h ../src/RESearch.h \
+  ../src/UniConversion.h
+$(DIR_O)\Editor.obj: ../src/Editor.cxx ../include/Platform.h ../include/ILexer.h \
+  ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \
+  ../src/RunStyles.h ../src/ContractionState.h ../src/CellBuffer.h \
+  ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \
   ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h \
-  ../src/Decoration.h ../src/Document.h ../src/Editor.h ../src/Selection.h ../src/PositionCache.h \
-  ../src/CaseFolder.h
+  ../src/Decoration.h ../src/CaseFolder.h ../src/Document.h \
+  ../src/UniConversion.h ../src/Selection.h ../src/PositionCache.h \
+  ../src/Editor.h
 $(DIR_O)\ExternalLexer.obj: ../src/ExternalLexer.cxx ../include/Platform.h \
-  ../include/Scintilla.h ../include/SciLexer.h \
-  ../lexlib/Accessor.h ../src/ExternalLexer.h
+  ../include/ILexer.h ../include/Scintilla.h ../include/SciLexer.h \
+  ../lexlib/LexerModule.h ../src/Catalogue.h ../src/ExternalLexer.h
 $(DIR_O)\Indicator.obj: ../src/Indicator.cxx ../include/Platform.h \
-  ../include/Scintilla.h ../src/Indicator.h
+  ../include/Scintilla.h ../src/XPM.h ../src/Indicator.h
 $(DIR_O)\KeyMap.obj: ../src/KeyMap.cxx ../include/Platform.h ../include/Scintilla.h \
   ../src/KeyMap.h
 
-#++Autogenerated -- run src/LexGen.py to regenerate
+#++Autogenerated -- run scripts/LexGen.py to regenerate
 #**\n\($(DIR_O)\\\*.obj: ..\\lexers\\\*.cxx $(LEX_HEADERS)\n\n\)
 
 $(DIR_O)\LexA68k.obj: ..\lexers\LexA68k.cxx $(LEX_HEADERS)
@@ -489,77 +497,94 @@ $(DIR_O)\LexYAML.obj: ..\lexers\LexYAML.cxx $(LEX_HEADERS)
 
 #--Autogenerated -- end of automatically generated section
 
-$(DIR_O)\LexerBase.obj: ../lexlib/LexerBase.cxx ../lexlib/LexerBase.h
-$(DIR_O)\LexerModule.obj: ../lexlib/LexerModule.cxx ../lexlib/LexerModule.h
-$(DIR_O)\LexerSimple.obj: ../lexlib/LexerSimple.cxx ../lexlib/LexerSimple.h
+$(DIR_O)\LexerBase.obj: ../lexlib/LexerBase.cxx ../include/ILexer.h \
+  ../include/Scintilla.h ../include/SciLexer.h ../lexlib/PropSetSimple.h \
+  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
+  ../lexlib/LexerModule.h ../lexlib/LexerBase.h
+$(DIR_O)\LexerModule.obj: ../lexlib/LexerModule.cxx ../include/ILexer.h \
+  ../include/Scintilla.h ../include/SciLexer.h ../lexlib/PropSetSimple.h \
+  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
+  ../lexlib/LexerModule.h ../lexlib/LexerBase.h ../lexlib/LexerSimple.h
+$(DIR_O)\LexerNoExceptions.obj: ../lexlib/LexerNoExceptions.cxx ../include/ILexer.h \
+  ../include/Scintilla.h ../include/SciLexer.h ../lexlib/PropSetSimple.h \
+  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
+  ../lexlib/LexerModule.h ../lexlib/LexerBase.h \
+  ../lexlib/LexerNoExceptions.h
+$(DIR_O)\LexerSimple.obj: ../lexlib/LexerSimple.cxx ../include/ILexer.h \
+  ../include/Scintilla.h ../include/SciLexer.h ../lexlib/PropSetSimple.h \
+  ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \
+  ../lexlib/LexerModule.h ../lexlib/LexerBase.h ../lexlib/LexerSimple.h
 $(DIR_O)\LineMarker.obj: ../src/LineMarker.cxx ../include/Platform.h \
   ../include/Scintilla.h ../src/XPM.h ../src/LineMarker.h
 $(DIR_O)\PerLine.obj: ../src/PerLine.cxx ../include/Platform.h \
-  ../include/Scintilla.h ../src/SplitVector.h \
-  ../src/Partitioning.h ../src/RunStyles.h ../src/PerLine.h
-$(DIR_O)\PlatWin.obj: PlatWin.cxx ../include/Platform.h \
-  ../src/UniConversion.h ../src/XPM.h
-$(DIR_O)\PositionCache.obj: ../src/PositionCache.cxx ../include/Platform.h ../include/Scintilla.h \
-  ../src/ContractionState.h ../src/SplitVector.h \
-  ../src/Partitioning.h ../src/CellBuffer.h ../src/KeyMap.h \
-  ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \
+  ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \
+  ../src/CellBuffer.h ../src/PerLine.h
+$(DIR_O)\PlatWin.obj: PlatWin.cxx ../include/Platform.h ../src/UniConversion.h \
+  ../src/XPM.h ../src/FontQuality.h
+$(DIR_O)\PositionCache.obj: ../src/PositionCache.cxx ../include/Platform.h \
+  ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \
+  ../src/RunStyles.h ../src/ContractionState.h ../src/CellBuffer.h \
+  ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \
   ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h \
-  ../src/Decoration.h ../src/Document.h ../src/Editor.h ../src/Selection.h ../src/PositionCache.h \
-  ../src/CaseFolder.h
-$(DIR_O)\PropSetSimple.obj: ../lexlib/PropSetSimple.cxx ../include/Platform.h
+  ../src/Decoration.h ../include/ILexer.h ../src/CaseFolder.h \
+  ../src/Document.h ../src/UniConversion.h ../src/Selection.h \
+  ../src/PositionCache.h
+$(DIR_O)\PropSetSimple.obj: ../lexlib/PropSetSimple.cxx ../lexlib/PropSetSimple.h
 $(DIR_O)\RESearch.obj: ../src/RESearch.cxx ../src/CharClassify.h ../src/RESearch.h
 $(DIR_O)\RunStyles.obj: ../src/RunStyles.cxx ../include/Platform.h \
   ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \
   ../src/RunStyles.h
 $(DIR_O)\ScintillaBase.obj: ../src/ScintillaBase.cxx ../include/Platform.h \
-  ../include/Scintilla.h \
-  ../src/ContractionState.h ../src/SplitVector.h \
-  ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \
-  ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \
-  ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
-  ../src/AutoComplete.h ../src/CharClassify.h ../src/Decoration.h \
-  ../src/Document.h ../src/Editor.h ../src/Selection.h ../src/ScintillaBase.h \
-  ../src/CaseFolder.h
+  ../include/ILexer.h ../include/Scintilla.h ../lexlib/PropSetSimple.h \
+  ../src/SplitVector.h ../src/Partitioning.h ../src/RunStyles.h \
+  ../src/ContractionState.h ../src/CellBuffer.h ../src/CallTip.h \
+  ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \
+  ../src/Style.h ../src/ViewStyle.h ../src/AutoComplete.h \
+  ../src/CharClassify.h ../src/Decoration.h ../src/CaseFolder.h \
+  ../src/Document.h ../src/Selection.h ../src/PositionCache.h \
+  ../src/Editor.h ../src/ScintillaBase.h
 $(DIR_O)\ScintillaBaseL.obj: ../src/ScintillaBase.cxx ../include/Platform.h \
-  ../include/Scintilla.h \
-  ../src/ContractionState.h ../src/SplitVector.h \
-  ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \
-  ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \
-  ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
-  ../src/AutoComplete.h ../src/CharClassify.h ../src/Decoration.h \
-  ../src/Document.h ../src/Editor.h ../src/Selection.h ../src/ScintillaBase.h \
-  ../src/CaseFolder.h
+  ../include/ILexer.h ../include/Scintilla.h ../lexlib/PropSetSimple.h \
+  ../src/SplitVector.h ../src/Partitioning.h ../src/RunStyles.h \
+  ../src/ContractionState.h ../src/CellBuffer.h ../src/CallTip.h \
+  ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \
+  ../src/Style.h ../src/ViewStyle.h ../src/AutoComplete.h \
+  ../src/CharClassify.h ../src/Decoration.h ../src/CaseFolder.h \
+  ../src/Document.h ../src/Selection.h ../src/PositionCache.h \
+  ../src/Editor.h ../src/ScintillaBase.h
 $(DIR_O)\ScintillaWin.obj: ScintillaWin.cxx ../include/Platform.h \
-  ../include/Scintilla.h ../src/ContractionState.h \
-  ../src/SplitVector.h ../src/Partitioning.h \
-  ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \
-  ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \
-  ../src/AutoComplete.h ../src/ViewStyle.h ../src/CharClassify.h \
-  ../src/Decoration.h ../src/Document.h ../src/Editor.h \
-  ../src/ScintillaBase.h ../src/Selection.h ../src/UniConversion.h \
-  ../src/CaseConvert.h  ../src/CaseFolder.h
+  ../include/ILexer.h ../include/Scintilla.h ../src/SplitVector.h \
+  ../src/Partitioning.h ../src/RunStyles.h ../src/ContractionState.h \
+  ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h \
+  ../src/XPM.h ../src/LineMarker.h ../src/Style.h ../src/AutoComplete.h \
+  ../src/ViewStyle.h ../src/CharClassify.h ../src/Decoration.h \
+  ../src/CaseFolder.h ../src/Document.h ../src/Selection.h \
+  ../src/PositionCache.h ../src/Editor.h ../src/ScintillaBase.h \
+  ../src/UniConversion.h ../src/CaseConvert.h PlatWin.h
 $(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx ../include/Platform.h \
-  ../include/Scintilla.h ../src/ContractionState.h \
-  ../src/SplitVector.h ../src/Partitioning.h \
-  ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \
-  ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \
-  ../src/AutoComplete.h ../src/ViewStyle.h ../src/CharClassify.h \
-  ../src/Decoration.h ../src/Document.h ../src/Editor.h \
-  ../src/ScintillaBase.h ../src/Selection.h ../src/UniConversion.h
+  ../include/ILexer.h ../include/Scintilla.h ../src/SplitVector.h \
+  ../src/Partitioning.h ../src/RunStyles.h ../src/ContractionState.h \
+  ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h \
+  ../src/XPM.h ../src/LineMarker.h ../src/Style.h ../src/AutoComplete.h \
+  ../src/ViewStyle.h ../src/CharClassify.h ../src/Decoration.h \
+  ../src/CaseFolder.h ../src/Document.h ../src/Selection.h \
+  ../src/PositionCache.h ../src/Editor.h ../src/ScintillaBase.h \
+  ../src/UniConversion.h ../src/CaseConvert.h PlatWin.h
 $(DIR_O)\ScintillaWinL.obj: ScintillaWin.cxx ../include/Platform.h \
-  ../include/Scintilla.h ../src/ContractionState.h \
-  ../src/SplitVector.h ../src/Partitioning.h \
-  ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \
-  ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \
-  ../src/AutoComplete.h ../src/ViewStyle.h ../src/CharClassify.h \
-  ../src/Decoration.h ../src/Document.h ../src/Editor.h \
-  ../src/ScintillaBase.h ../src/Selection.h ../src/UniConversion.h
-$(DIR_O)\Selection.obj: ../src/Selection.cxx ../include/Platform.h ../include/Scintilla.h \
-  ../src/Selection.h
+  ../include/ILexer.h ../include/Scintilla.h ../src/SplitVector.h \
+  ../src/Partitioning.h ../src/RunStyles.h ../src/ContractionState.h \
+  ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h \
+  ../src/XPM.h ../src/LineMarker.h ../src/Style.h ../src/AutoComplete.h \
+  ../src/ViewStyle.h ../src/CharClassify.h ../src/Decoration.h \
+  ../src/CaseFolder.h ../src/Document.h ../src/Selection.h \
+  ../src/PositionCache.h ../src/Editor.h ../src/ScintillaBase.h \
+  ../src/UniConversion.h ../src/CaseConvert.h PlatWin.h
+$(DIR_O)\Selection.obj: ../src/Selection.cxx ../include/Platform.h \
+  ../include/Scintilla.h ../src/Selection.h
 $(DIR_O)\Style.obj: ../src/Style.cxx ../include/Platform.h ../include/Scintilla.h \
   ../src/Style.h
-$(DIR_O)\StyleContext.obj: ../lexlib/StyleContext.cxx ../lexlib/Accessor.h \
-  ../lexlib/StyleContext.h
+$(DIR_O)\StyleContext.obj: ../lexlib/StyleContext.cxx ../include/ILexer.h \
+  ../lexlib/LexAccessor.h ../lexlib/Accessor.h ../lexlib/StyleContext.h
 $(DIR_O)\UniConversion.obj: ../src/UniConversion.cxx ../src/UniConversion.h
 $(DIR_O)\ViewStyle.obj: ../src/ViewStyle.cxx ../include/Platform.h \
   ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \