18 files changed, 39 insertions, 0 deletions
diff --git a/src/AutoComplete.cxx b/src/AutoComplete.cxx
index c55c909bb..3f3570283 100644
--- a/src/AutoComplete.cxx
+++ b/src/AutoComplete.cxx
@@ -19,6 +19,7 @@
 
 #include "Scintilla.h"
 #include "CharacterSet.h"
+#include "Position.h"
 #include "AutoComplete.h"
 
 #ifdef SCI_NAMESPACE
diff --git a/src/CallTip.cxx b/src/CallTip.cxx
index 3f8363bd4..541f4c683 100644
--- a/src/CallTip.cxx
+++ b/src/CallTip.cxx
@@ -17,6 +17,7 @@
 #include "Scintilla.h"
 
 #include "StringCopy.h"
+#include "Position.h"
 #include "CallTip.h"
 
 #ifdef SCI_NAMESPACE
diff --git a/src/CellBuffer.cxx b/src/CellBuffer.cxx
index dfa1350c0..f43a0c302 100644
--- a/src/CellBuffer.cxx
+++ b/src/CellBuffer.cxx
@@ -16,6 +16,7 @@
 #include "Platform.h"
 
 #include "Scintilla.h"
+#include "Position.h"
 #include "SplitVector.h"
 #include "Partitioning.h"
 #include "CellBuffer.h"
diff --git a/src/ContractionState.cxx b/src/ContractionState.cxx
index 16ca3c531..80f79de29 100644
--- a/src/ContractionState.cxx
+++ b/src/ContractionState.cxx
@@ -12,6 +12,7 @@
 
 #include "Platform.h"
 
+#include "Position.h"
 #include "SplitVector.h"
 #include "Partitioning.h"
 #include "RunStyles.h"
diff --git a/src/Decoration.cxx b/src/Decoration.cxx
index 042ffcacb..389db5029 100644
--- a/src/Decoration.cxx
+++ b/src/Decoration.cxx
@@ -15,6 +15,7 @@
 #include "Platform.h"
 
 #include "Scintilla.h"
+#include "Position.h"
 #include "SplitVector.h"
 #include "Partitioning.h"
 #include "RunStyles.h"
diff --git a/src/Document.cxx b/src/Document.cxx
index f21477276..102e42383 100644
--- a/src/Document.cxx
+++ b/src/Document.cxx
@@ -26,6 +26,7 @@
 #include "Scintilla.h"
 
 #include "CharacterSet.h"
+#include "Position.h"
 #include "SplitVector.h"
 #include "Partitioning.h"
 #include "RunStyles.h"
diff --git a/src/EditModel.cxx b/src/EditModel.cxx
index b50ade258..35903c6b8 100644
--- a/src/EditModel.cxx
+++ b/src/EditModel.cxx
@@ -25,6 +25,7 @@
 #include "Scintilla.h"
 
 #include "StringCopy.h"
+#include "Position.h"
 #include "SplitVector.h"
 #include "Partitioning.h"
 #include "RunStyles.h"
diff --git a/src/EditView.cxx b/src/EditView.cxx
index 43c3f842b..f8912a991 100644
--- a/src/EditView.cxx
+++ b/src/EditView.cxx
@@ -25,6 +25,7 @@
 #include "Scintilla.h"
 
 #include "StringCopy.h"
+#include "Position.h"
 #include "SplitVector.h"
 #include "Partitioning.h"
 #include "RunStyles.h"
diff --git a/src/Editor.cxx b/src/Editor.cxx
index 29186365e..ca87b1319 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -25,6 +25,7 @@
 #include "Scintilla.h"
 
 #include "StringCopy.h"
+#include "Position.h"
 #include "SplitVector.h"
 #include "Partitioning.h"
 #include "RunStyles.h"
diff --git a/src/MarginView.cxx b/src/MarginView.cxx
index a6fc1f40b..f164a7cb1 100644
--- a/src/MarginView.cxx
+++ b/src/MarginView.cxx
@@ -25,6 +25,7 @@
 #include "Scintilla.h"
 
 #include "StringCopy.h"
+#include "Position.h"
 #include "SplitVector.h"
 #include "Partitioning.h"
 #include "RunStyles.h"
diff --git a/src/PerLine.cxx b/src/PerLine.cxx
index 76328b54c..7d574177d 100644
--- a/src/PerLine.cxx
+++ b/src/PerLine.cxx
@@ -14,6 +14,7 @@
 #include "Platform.h"
 
 #include "Scintilla.h"
+#include "Position.h"
 #include "SplitVector.h"
 #include "Partitioning.h"
 #include "CellBuffer.h"
diff --git a/src/Position.h b/src/Position.h
new file mode 100644
index 000000000..4ef655263
--- /dev/null
+++ b/src/Position.h
@@ -0,0 +1,22 @@
+// Scintilla source code edit control
+/** @file Position.h
+ ** Will define global type name Position in the Sci internal namespace.
+ **/
+// Copyright 2015 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef POSITION_H
+#define POSITION_H
+
+namespace Sci {
+
+// After 3.6.0:
+// typedef int Position;
+
+// A later version (4.x) of this file may:
+//#if defined(SCI_LARGE_FILE_SUPPORT)
+//typedef ptrdiff_t Position;
+
+}
+
+#endif
diff --git a/src/PositionCache.cxx b/src/PositionCache.cxx
index 860a780d9..997a4bfae 100644
--- a/src/PositionCache.cxx
+++ b/src/PositionCache.cxx
@@ -21,6 +21,7 @@
 #include "ILexer.h"
 #include "Scintilla.h"
 
+#include "Position.h"
 #include "SplitVector.h"
 #include "Partitioning.h"
 #include "RunStyles.h"
diff --git a/src/RESearch.cxx b/src/RESearch.cxx
index 6c14a0313..f8d9c6226 100644
--- a/src/RESearch.cxx
+++ b/src/RESearch.cxx
@@ -206,6 +206,7 @@
 #include <string>
 #include <algorithm>
 
+#include "Position.h"
 #include "CharClassify.h"
 #include "RESearch.h"
 
diff --git a/src/RunStyles.cxx b/src/RunStyles.cxx
index ad8d977d6..a136f022a 100644
--- a/src/RunStyles.cxx
+++ b/src/RunStyles.cxx
@@ -15,6 +15,7 @@
 #include "Platform.h"
 
 #include "Scintilla.h"
+#include "Position.h"
 #include "SplitVector.h"
 #include "Partitioning.h"
 #include "RunStyles.h"
diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx
index 379fcc943..cb1be4214 100644
--- a/src/ScintillaBase.cxx
+++ b/src/ScintillaBase.cxx
@@ -33,6 +33,7 @@
 #include "Catalogue.h"
 #endif
 
+#include "Position.h"
 #include "SplitVector.h"
 #include "Partitioning.h"
 #include "RunStyles.h"
diff --git a/src/Selection.cxx b/src/Selection.cxx
index 5a673425f..a629c7e40 100644
--- a/src/Selection.cxx
+++ b/src/Selection.cxx
@@ -15,6 +15,7 @@
 
 #include "Scintilla.h"
 
+#include "Position.h"
 #include "Selection.h"
 
 #ifdef SCI_NAMESPACE
diff --git a/src/ViewStyle.cxx b/src/ViewStyle.cxx
index 32b3be527..7ece73b2e 100644
--- a/src/ViewStyle.cxx
+++ b/src/ViewStyle.cxx
@@ -15,6 +15,7 @@
 #include "Platform.h"
 
 #include "Scintilla.h"
+#include "Position.h"
 #include "SplitVector.h"
 #include "Partitioning.h"
 #include "RunStyles.h"