aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2014-05-24 15:15:49 +1000
committerNeil <nyamatongwe@gmail.com>2014-05-24 15:15:49 +1000
commitb0296d86a48642f2f381c3e0b11a022482ae25e3 (patch)
tree799c8fa56339d4bfc62ae4d0ff8ef058a228d70b
parent0e25a153a1970e5b895072f265c02bac9fd7f3fa (diff)
downloadscintilla-mirror-b0296d86a48642f2f381c3e0b11a022482ae25e3.tar.gz
Header include statements are now in a standardised order with that order
defined in scripts/HeaderOrder.txt.
-rw-r--r--cocoa/PlatCocoa.h8
-rw-r--r--cocoa/PlatCocoa.mm20
-rw-r--r--cocoa/ScintillaCocoa.h8
-rw-r--r--gtk/ScintillaGTK.cxx28
-rw-r--r--lexers/LexCPP.cxx2
-rw-r--r--lexers/LexDMIS.cxx6
-rw-r--r--lexers/LexECL.cxx2
-rw-r--r--lexers/LexEScript.cxx2
-rw-r--r--lexers/LexHaskell.cxx2
-rw-r--r--lexers/LexRust.cxx2
-rw-r--r--lexers/LexSpecman.cxx2
-rw-r--r--lexers/LexVHDL.cxx2
-rw-r--r--lexers/LexVisualProlog.cxx2
-rw-r--r--lexlib/Accessor.cxx2
-rw-r--r--lexlib/CharacterSet.cxx2
-rw-r--r--lexlib/LexerBase.cxx2
-rw-r--r--lexlib/LexerModule.cxx2
-rw-r--r--lexlib/LexerNoExceptions.cxx2
-rw-r--r--lexlib/LexerSimple.cxx2
-rw-r--r--lexlib/StyleContext.cxx2
-rw-r--r--lexlib/WordList.cxx2
-rw-r--r--scripts/HeaderOrder.txt128
-rw-r--r--src/CaseFolder.cxx2
-rw-r--r--src/Catalogue.cxx2
-rw-r--r--src/Document.cxx4
-rw-r--r--src/Editor.cxx2
-rw-r--r--src/ExternalLexer.cxx2
-rw-r--r--src/Indicator.cxx2
-rw-r--r--src/PositionCache.cxx2
-rw-r--r--src/ScintillaBase.cxx11
-rw-r--r--win32/PlatWin.cxx2
-rw-r--r--win32/ScintillaWin.cxx23
32 files changed, 210 insertions, 72 deletions
diff --git a/cocoa/PlatCocoa.h b/cocoa/PlatCocoa.h
index 06b7a1f5b..60977c92e 100644
--- a/cocoa/PlatCocoa.h
+++ b/cocoa/PlatCocoa.h
@@ -7,14 +7,14 @@
#ifndef PLATCOCOA_H
#define PLATCOCOA_H
-#include <cstring>
-#include <cstdio>
-#include <cstdlib>
-
#include <assert.h>
#include <sys/time.h>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
+
#include <Cocoa/Cocoa.h>
#include "QuartzTextLayout.h"
diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm
index a0a0e8943..2225631a6 100644
--- a/cocoa/PlatCocoa.mm
+++ b/cocoa/PlatCocoa.mm
@@ -12,25 +12,27 @@
* This file is dual licensed under LGPL v2.1 and the Scintilla license (http://www.scintilla.org/License.txt).
*/
-#import "Platform.h"
-#import "ScintillaView.h"
-#import "ScintillaCocoa.h"
-#import "PlatCocoa.h"
+#include <assert.h>
+#include <sys/time.h>
+#include <cstdlib>
#include <cstring>
#include <cstdio>
-#include <cstdlib>
-#include <assert.h>
-#include <sys/time.h>
+
#include <stdexcept>
#include <vector>
#include <map>
+#import <Foundation/NSGeometry.h>
+
+#import "Platform.h"
+#import "ScintillaView.h"
+#import "ScintillaCocoa.h"
+#import "PlatCocoa.h"
+
#include "StringCopy.h"
#include "XPM.h"
-#import <Foundation/NSGeometry.h>
-
using namespace Scintilla;
extern sptr_t scintilla_send_message(void* sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam);
diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h
index 7e4ed7214..8fa2d196b 100644
--- a/cocoa/ScintillaCocoa.h
+++ b/cocoa/ScintillaCocoa.h
@@ -14,11 +14,11 @@
*/
#include <stdlib.h>
-#include <string>
#include <stdio.h>
-#include <ctype.h>
#include <time.h>
+#include <ctype.h>
+#include <string>
#include <vector>
#include <map>
@@ -40,18 +40,18 @@
#include "XPM.h"
#include "LineMarker.h"
#include "Style.h"
-#include "AutoComplete.h"
#include "ViewStyle.h"
#include "CharClassify.h"
#include "Decoration.h"
#include "CaseFolder.h"
#include "Document.h"
+#include "CaseConvert.h"
#include "Selection.h"
#include "PositionCache.h"
#include "Editor.h"
+#include "AutoComplete.h"
#include "ScintillaBase.h"
-#include "CaseConvert.h"
extern "C" NSString* ScintillaRecPboardType;
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index 17a439952..f74971b1b 100644
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -6,9 +6,9 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <ctype.h>
#include <time.h>
#include <assert.h>
+#include <ctype.h>
#include <new>
#include <string>
@@ -16,15 +16,17 @@
#include <map>
#include <algorithm>
+#include <glib.h>
+#include <gmodule.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
-#include "Platform.h"
-
-#if PLAT_GTK_WIN32
+#if defined(__WIN32__) || defined(_MSC_VER)
#include <windows.h>
#endif
+#include "Platform.h"
+
#include "ILexer.h"
#include "Scintilla.h"
#include "ScintillaWidget.h"
@@ -32,6 +34,9 @@
#include "SciLexer.h"
#endif
#include "StringCopy.h"
+#ifdef SCI_LEXER
+#include "LexerModule.h"
+#endif
#include "SplitVector.h"
#include "Partitioning.h"
#include "RunStyles.h"
@@ -43,28 +48,25 @@
#include "XPM.h"
#include "LineMarker.h"
#include "Style.h"
-#include "AutoComplete.h"
#include "ViewStyle.h"
-#include "Decoration.h"
#include "CharClassify.h"
+#include "Decoration.h"
#include "CaseFolder.h"
#include "Document.h"
+#include "CaseConvert.h"
+#include "UniConversion.h"
#include "Selection.h"
#include "PositionCache.h"
#include "Editor.h"
+#include "AutoComplete.h"
#include "ScintillaBase.h"
-#include "UniConversion.h"
-#include "CaseConvert.h"
-
-#include "scintilla-marshal.h"
#ifdef SCI_LEXER
-#include <glib.h>
-#include <gmodule.h>
-#include "LexerModule.h"
#include "ExternalLexer.h"
#endif
+#include "scintilla-marshal.h"
+
#include "Converter.h"
#if defined(__clang__)
diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx
index e8b705b1f..b8b48aa52 100644
--- a/lexers/LexCPP.cxx
+++ b/lexers/LexCPP.cxx
@@ -8,10 +8,10 @@
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <stdio.h>
#include <stdarg.h>
#include <assert.h>
+#include <ctype.h>
#include <string>
#include <vector>
diff --git a/lexers/LexDMIS.cxx b/lexers/LexDMIS.cxx
index 7f23ba96b..a903e9da6 100644
--- a/lexers/LexDMIS.cxx
+++ b/lexers/LexDMIS.cxx
@@ -13,14 +13,14 @@
#include <cctype>
#include "ILexer.h"
-#include "SciLexer.h"
#include "Scintilla.h"
+#include "SciLexer.h"
-#include "LexerModule.h"
+#include "WordList.h"
#include "LexAccessor.h"
#include "StyleContext.h"
#include "CharacterSet.h"
-#include "WordList.h"
+#include "LexerModule.h"
#ifdef SCI_NAMESPACE
using namespace Scintilla;
diff --git a/lexers/LexECL.cxx b/lexers/LexECL.cxx
index 6a08d58c2..d8065f722 100644
--- a/lexers/LexECL.cxx
+++ b/lexers/LexECL.cxx
@@ -7,10 +7,10 @@
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <stdio.h>
#include <stdarg.h>
#include <assert.h>
+#include <ctype.h>
#ifdef _MSC_VER
#pragma warning(disable: 4786)
diff --git a/lexers/LexEScript.cxx b/lexers/LexEScript.cxx
index 9a7560e1e..28466bc8e 100644
--- a/lexers/LexEScript.cxx
+++ b/lexers/LexEScript.cxx
@@ -6,10 +6,10 @@
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <stdio.h>
#include <stdarg.h>
#include <assert.h>
+#include <ctype.h>
#include "ILexer.h"
#include "Scintilla.h"
diff --git a/lexers/LexHaskell.cxx b/lexers/LexHaskell.cxx
index e10cb8c81..24355fa4e 100644
--- a/lexers/LexHaskell.cxx
+++ b/lexers/LexHaskell.cxx
@@ -38,9 +38,9 @@
#include "Accessor.h"
#include "StyleContext.h"
#include "CharacterSet.h"
+#include "CharacterCategory.h"
#include "LexerModule.h"
#include "OptionSet.h"
-#include "CharacterCategory.h"
#ifdef SCI_NAMESPACE
using namespace Scintilla;
diff --git a/lexers/LexRust.cxx b/lexers/LexRust.cxx
index bf59933af..8a3020532 100644
--- a/lexers/LexRust.cxx
+++ b/lexers/LexRust.cxx
@@ -21,6 +21,7 @@
#include "Scintilla.h"
#include "SciLexer.h"
+#include "PropSetSimple.h"
#include "WordList.h"
#include "LexAccessor.h"
#include "Accessor.h"
@@ -28,7 +29,6 @@
#include "CharacterSet.h"
#include "LexerModule.h"
#include "OptionSet.h"
-#include "PropSetSimple.h"
#ifdef SCI_NAMESPACE
using namespace Scintilla;
diff --git a/lexers/LexSpecman.cxx b/lexers/LexSpecman.cxx
index 1b96482ea..918edaf98 100644
--- a/lexers/LexSpecman.cxx
+++ b/lexers/LexSpecman.cxx
@@ -8,10 +8,10 @@
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <stdio.h>
#include <stdarg.h>
#include <assert.h>
+#include <ctype.h>
#include "ILexer.h"
#include "Scintilla.h"
diff --git a/lexers/LexVHDL.cxx b/lexers/LexVHDL.cxx
index 88d8efb27..189416425 100644
--- a/lexers/LexVHDL.cxx
+++ b/lexers/LexVHDL.cxx
@@ -12,10 +12,10 @@
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <stdio.h>
#include <stdarg.h>
#include <assert.h>
+#include <ctype.h>
#include "ILexer.h"
#include "Scintilla.h"
diff --git a/lexers/LexVisualProlog.cxx b/lexers/LexVisualProlog.cxx
index 0acdb26a1..24e19e24e 100644
--- a/lexers/LexVisualProlog.cxx
+++ b/lexers/LexVisualProlog.cxx
@@ -13,10 +13,10 @@
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <stdio.h>
#include <stdarg.h>
#include <assert.h>
+#include <ctype.h>
#ifdef _MSC_VER
#pragma warning(disable: 4786)
diff --git a/lexlib/Accessor.cxx b/lexlib/Accessor.cxx
index 61661626f..f67737d4d 100644
--- a/lexlib/Accessor.cxx
+++ b/lexlib/Accessor.cxx
@@ -8,9 +8,9 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <ctype.h>
#include <stdarg.h>
#include <assert.h>
+#include <ctype.h>
#include "ILexer.h"
#include "Scintilla.h"
diff --git a/lexlib/CharacterSet.cxx b/lexlib/CharacterSet.cxx
index 2f41df116..0ab2cc0cc 100644
--- a/lexlib/CharacterSet.cxx
+++ b/lexlib/CharacterSet.cxx
@@ -9,8 +9,8 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <ctype.h>
#include <assert.h>
+#include <ctype.h>
#include "CharacterSet.h"
diff --git a/lexlib/LexerBase.cxx b/lexlib/LexerBase.cxx
index 0e86562bf..bbef3f159 100644
--- a/lexlib/LexerBase.cxx
+++ b/lexlib/LexerBase.cxx
@@ -8,9 +8,9 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <ctype.h>
#include <stdarg.h>
#include <assert.h>
+#include <ctype.h>
#include "ILexer.h"
#include "Scintilla.h"
diff --git a/lexlib/LexerModule.cxx b/lexlib/LexerModule.cxx
index 5b25f84ec..6cefbee77 100644
--- a/lexlib/LexerModule.cxx
+++ b/lexlib/LexerModule.cxx
@@ -8,9 +8,9 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <ctype.h>
#include <stdarg.h>
#include <assert.h>
+#include <ctype.h>
#include <string>
diff --git a/lexlib/LexerNoExceptions.cxx b/lexlib/LexerNoExceptions.cxx
index 5f31f2268..9ebae2af0 100644
--- a/lexlib/LexerNoExceptions.cxx
+++ b/lexlib/LexerNoExceptions.cxx
@@ -8,9 +8,9 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <ctype.h>
#include <stdarg.h>
#include <assert.h>
+#include <ctype.h>
#include "ILexer.h"
#include "Scintilla.h"
diff --git a/lexlib/LexerSimple.cxx b/lexlib/LexerSimple.cxx
index 5489ab886..4d0e178ca 100644
--- a/lexlib/LexerSimple.cxx
+++ b/lexlib/LexerSimple.cxx
@@ -8,9 +8,9 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <ctype.h>
#include <stdarg.h>
#include <assert.h>
+#include <ctype.h>
#include <string>
diff --git a/lexlib/StyleContext.cxx b/lexlib/StyleContext.cxx
index ec0c5047c..9429c5ba8 100644
--- a/lexlib/StyleContext.cxx
+++ b/lexlib/StyleContext.cxx
@@ -8,8 +8,8 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <ctype.h>
#include <assert.h>
+#include <ctype.h>
#include "ILexer.h"
diff --git a/lexlib/WordList.cxx b/lexlib/WordList.cxx
index 10b6fe349..68b384a95 100644
--- a/lexlib/WordList.cxx
+++ b/lexlib/WordList.cxx
@@ -8,8 +8,8 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <ctype.h>
#include <stdarg.h>
+#include <ctype.h>
#include <algorithm>
diff --git a/scripts/HeaderOrder.txt b/scripts/HeaderOrder.txt
new file mode 100644
index 000000000..96af584d3
--- /dev/null
+++ b/scripts/HeaderOrder.txt
@@ -0,0 +1,128 @@
+// Define the standard order in which to include header files
+// All platform headers should be included before Scintilla headers
+// and each of these groups are then divided into directory groups.
+
+// C standard library
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stddef.h>
+#include <stdarg.h>
+#include <time.h>
+#include <math.h>
+#include <assert.h>
+#include <ctype.h>
+#include <limits.h>
+
+// C++ wrappers of C standard library
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+#include <cctype>
+#include <cstdio>
+
+// C++ standard library
+#include <stdexcept>
+#include <new>
+#include <string>
+#include <vector>
+#include <map>
+#include <set>
+#include <algorithm>
+#include <memory>
+
+// GTK+ headers
+#include <glib.h>
+#include <gmodule.h>
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+// Windows headers
+#include <windows.h>
+#include <commctrl.h>
+#include <richedit.h>
+#include <windowsx.h>
+#include <zmouse.h>
+#include <ole2.h>
+#include <d2d1.h>
+#include <dwrite.h>
+
+// Cocoa headers
+#include <Cocoa/Cocoa.h>
+
+// Scintilla headers
+
+// Non-platform-specific headers
+
+// include
+#include "Platform.h"
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "ScintillaWidget.h"
+
+#include "SciLexer.h"
+
+// lexlib
+#include "StringCopy.h"
+#include "PropSetSimple.h"
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "CharacterCategory.h"
+#include "LexerModule.h"
+#include "OptionSet.h"
+#include "SparseState.h"
+#include "SubStyles.h"
+#include "LexerBase.h"
+#include "LexerSimple.h"
+#include "LexerNoExceptions.h"
+
+// src
+#include "Catalogue.h"
+
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
+#include "ContractionState.h"
+#include "CellBuffer.h"
+#include "CallTip.h"
+#include "KeyMap.h"
+#include "Indicator.h"
+#include "XPM.h"
+#include "LineMarker.h"
+#include "Style.h"
+#include "ViewStyle.h"
+#include "CharClassify.h"
+#include "Decoration.h"
+#include "CaseFolder.h"
+#include "Document.h"
+#include "CaseConvert.h"
+#include "UniConversion.h"
+#include "UnicodeFromUTF8.h"
+#include "Selection.h"
+#include "PositionCache.h"
+#include "FontQuality.h"
+#include "Editor.h"
+
+#include "AutoComplete.h"
+#include "ScintillaBase.h"
+
+#include "ExternalLexer.h"
+
+// Platform-specific headers
+
+// win32
+#include "PlatWin.h"
+
+// gtk
+#include "Converter.h"
+
+// cocoa
+#include "QuartzTextStyle.h"
+#include "QuartzTextStyleAttribute.h"
+#import "InfoBarCommunicator.h"
+#include "InfoBar.h"
diff --git a/src/CaseFolder.cxx b/src/CaseFolder.cxx
index 44a94da6f..200ac99b8 100644
--- a/src/CaseFolder.cxx
+++ b/src/CaseFolder.cxx
@@ -8,9 +8,9 @@
#include <vector>
#include <algorithm>
+#include "CaseFolder.h"
#include "CaseConvert.h"
#include "UniConversion.h"
-#include "CaseFolder.h"
#ifdef SCI_NAMESPACE
using namespace Scintilla;
diff --git a/src/Catalogue.cxx b/src/Catalogue.cxx
index c507296d2..ac1fc3818 100644
--- a/src/Catalogue.cxx
+++ b/src/Catalogue.cxx
@@ -8,9 +8,9 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <ctype.h>
#include <stdarg.h>
#include <assert.h>
+#include <ctype.h>
#include <vector>
diff --git a/src/Document.cxx b/src/Document.cxx
index b986a1cfd..32d5f1896 100644
--- a/src/Document.cxx
+++ b/src/Document.cxx
@@ -8,8 +8,8 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <ctype.h>
#include <assert.h>
+#include <ctype.h>
#include <string>
#include <vector>
@@ -20,13 +20,13 @@
#include "ILexer.h"
#include "Scintilla.h"
+#include "CharacterSet.h"
#include "SplitVector.h"
#include "Partitioning.h"
#include "RunStyles.h"
#include "CellBuffer.h"
#include "PerLine.h"
#include "CharClassify.h"
-#include "CharacterSet.h"
#include "Decoration.h"
#include "CaseFolder.h"
#include "Document.h"
diff --git a/src/Editor.cxx b/src/Editor.cxx
index 7fbe39c38..63d45158b 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -8,9 +8,9 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <ctype.h>
#include <math.h>
#include <assert.h>
+#include <ctype.h>
#include <string>
#include <vector>
diff --git a/src/ExternalLexer.cxx b/src/ExternalLexer.cxx
index 682320889..25d83ceb8 100644
--- a/src/ExternalLexer.cxx
+++ b/src/ExternalLexer.cxx
@@ -8,8 +8,8 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <ctype.h>
#include <assert.h>
+#include <ctype.h>
#include <string>
diff --git a/src/Indicator.cxx b/src/Indicator.cxx
index 63735d480..e51067a38 100644
--- a/src/Indicator.cxx
+++ b/src/Indicator.cxx
@@ -11,8 +11,8 @@
#include "Platform.h"
#include "Scintilla.h"
-#include "XPM.h"
#include "Indicator.h"
+#include "XPM.h"
#ifdef SCI_NAMESPACE
using namespace Scintilla;
diff --git a/src/PositionCache.cxx b/src/PositionCache.cxx
index e425ebe69..0d2033bb9 100644
--- a/src/PositionCache.cxx
+++ b/src/PositionCache.cxx
@@ -17,6 +17,7 @@
#include "Platform.h"
+#include "ILexer.h"
#include "Scintilla.h"
#include "SplitVector.h"
@@ -32,7 +33,6 @@
#include "ViewStyle.h"
#include "CharClassify.h"
#include "Decoration.h"
-#include "ILexer.h"
#include "CaseFolder.h"
#include "Document.h"
#include "UniConversion.h"
diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx
index e39b5e2a8..9430a54e0 100644
--- a/src/ScintillaBase.cxx
+++ b/src/ScintillaBase.cxx
@@ -8,8 +8,8 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <ctype.h>
#include <assert.h>
+#include <ctype.h>
#include <string>
#include <vector>
@@ -21,12 +21,17 @@
#include "ILexer.h"
#include "Scintilla.h"
-#include "PropSetSimple.h"
#ifdef SCI_LEXER
#include "SciLexer.h"
+#endif
+
+#include "PropSetSimple.h"
+
+#ifdef SCI_LEXER
#include "LexerModule.h"
#include "Catalogue.h"
#endif
+
#include "SplitVector.h"
#include "Partitioning.h"
#include "RunStyles.h"
@@ -39,7 +44,6 @@
#include "LineMarker.h"
#include "Style.h"
#include "ViewStyle.h"
-#include "AutoComplete.h"
#include "CharClassify.h"
#include "Decoration.h"
#include "CaseFolder.h"
@@ -47,6 +51,7 @@
#include "Selection.h"
#include "PositionCache.h"
#include "Editor.h"
+#include "AutoComplete.h"
#include "ScintillaBase.h"
#ifdef SCI_NAMESPACE
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx
index 082a177e6..9eb45e804 100644
--- a/win32/PlatWin.cxx
+++ b/win32/PlatWin.cxx
@@ -8,10 +8,10 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <ctype.h>
#include <stdarg.h>
#include <time.h>
#include <math.h>
+#include <ctype.h>
#include <limits.h>
#include <vector>
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 07f801a78..a83c92ef6 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -8,8 +8,8 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <ctype.h>
#include <assert.h>
+#include <ctype.h>
#include <limits.h>
#include <new>
@@ -26,6 +26,8 @@
#include <commctrl.h>
#include <richedit.h>
#include <windowsx.h>
+#include <zmouse.h>
+#include <ole2.h>
#if defined(NTDDI_WIN7) && !defined(DISABLE_D2D)
#define USE_D2D 1
@@ -43,9 +45,11 @@
#ifdef SCI_LEXER
#include "SciLexer.h"
-#include "LexerModule.h"
#endif
#include "StringCopy.h"
+#ifdef SCI_LEXER
+#include "LexerModule.h"
+#endif
#include "SplitVector.h"
#include "Partitioning.h"
#include "RunStyles.h"
@@ -57,25 +61,26 @@
#include "XPM.h"
#include "LineMarker.h"
#include "Style.h"
-#include "AutoComplete.h"
#include "ViewStyle.h"
#include "CharClassify.h"
#include "Decoration.h"
#include "CaseFolder.h"
#include "Document.h"
+#include "CaseConvert.h"
+#include "UniConversion.h"
#include "Selection.h"
#include "PositionCache.h"
#include "Editor.h"
-#include "ScintillaBase.h"
-#include "UniConversion.h"
-#include "CaseConvert.h"
-#include "PlatWin.h"
+#include "AutoComplete.h"
+#include "ScintillaBase.h"
#ifdef SCI_LEXER
#include "ExternalLexer.h"
#endif
+#include "PlatWin.h"
+
#ifndef SPI_GETWHEELSCROLLLINES
#define SPI_GETWHEELSCROLLLINES 104
#endif
@@ -88,10 +93,6 @@
#define UNICODE_NOCHAR 0xFFFF
#endif
-#include <commctrl.h>
-#include <zmouse.h>
-#include <ole2.h>
-
#ifndef MK_ALT
#define MK_ALT 32
#endif