For new lexer design change includes to add new files and remove unused files.

Normalise order of includes.
Minor fixes for compatibility with new lexer design.

1 files changed, 10 insertions, 6 deletions

diff --git a/lexers/LexR.cxx b/lexers/LexR.cxx
index cabbf5788..9947c7235 100644
--- a/lexers/LexR.cxx
+++ b/lexers/LexR.cxx
@@ -8,18 +8,22 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 #include <stdio.h>
 #include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
 
-#include "Platform.h"
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
 
-#include "PropSet.h"
+#include "PropSetSimple.h"
+#include "WordList.h"
+#include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
 
 #ifdef SCI_NAMESPACE
 using namespace Scintilla;