2 files changed, 7 insertions, 3 deletions
diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h
index 3f4d20093..5be17c773 100644
--- a/cocoa/ScintillaCocoa.h
+++ b/cocoa/ScintillaCocoa.h
@@ -21,12 +21,11 @@
 
 #include <vector>
 
+#include "ILexer.h"
+
 #ifdef SCI_LEXER
 #include "SciLexer.h"
-#include "PropSet.h"
 #include "PropSetSimple.h"
-#include "Accessor.h"
-#include "KeyWords.h"
 #endif
 
 #include "SVector.h"
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index 318c364e5..f91183aa2 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -219,6 +219,11 @@ ScintillaCocoa::~ScintillaCocoa()
  */
 void ScintillaCocoa::Initialise() 
 {
+  static bool initedLexers = false;
+  if (!initedLexers) {
+    initedLexers = true;
+    Scintilla_LinkLexers();
+  }
   notifyObj = NULL;
   notifyProc = NULL;