diff --git a/scintilla/src/CallTip.h b/scintilla/src/CallTip.h
index 79f5f58193..648c64329e 100644
--- a/scintilla/src/CallTip.h
+++ b/scintilla/src/CallTip.h
@@ -39,9 +39,9 @@ class CallTip {
 	int NextTabPos(int x) const noexcept;
 
 public:
+	bool inCallTipMode;
 	Window wCallTip;
 	Window wDraw;
-	bool inCallTipMode;
 	Sci::Position posStartCallTip;
 	ColourRGBA colourBG;
 	ColourRGBA colourUnSel;
diff --git a/scintilla/src/EditModel.cxx b/scintilla/src/EditModel.cxx
index 027e3ccf7b..51e95d181d 100644
--- a/scintilla/src/EditModel.cxx
+++ b/scintilla/src/EditModel.cxx
@@ -61,14 +61,14 @@ Caret::Caret() noexcept :
 EditModel::EditModel() : durationWrapOneUnit(0.01 / 64), durationWrapOneThread(0.01 / 16) {
 	inOverstrike = false;
 	trackLineWidth = false;
+	hasFocus = false;
+	primarySelection = true;
 	xOffset = 0;
 	posDrag = SelectionPosition(Sci::invalidPosition);
 	braces[0] = Sci::invalidPosition;
 	braces[1] = Sci::invalidPosition;
 	bracesMatchStyle = StyleBraceBad;
 	highlightGuideColumn = 0;
-	hasFocus = false;
-	primarySelection = true;
 	imeInteraction = IMEInteraction::Windowed;
 	bidirectional = Bidirectional::Disabled;
 	foldFlags = FoldFlag::None;
diff --git a/scintilla/src/EditModel.h b/scintilla/src/EditModel.h
index 44ba4d061c..1f44fbc3bd 100644
--- a/scintilla/src/EditModel.h
+++ b/scintilla/src/EditModel.h
@@ -24,6 +24,8 @@ class EditModel {
 	Document *pdoc;
 	bool inOverstrike;
 	bool trackLineWidth;
+	bool hasFocus;
+	bool primarySelection;
 	int xOffset;		///< Horizontal scrolled amount in pixels
 
 	SpecialRepresentations reprs;
@@ -32,8 +34,6 @@ class EditModel {
 	Sci::Position braces[2];
 	int bracesMatchStyle;
 	int highlightGuideColumn;
-	bool hasFocus;
-	bool primarySelection;
 	Selection sel;
 
 	Scintilla::IMEInteraction imeInteraction;
diff --git a/scintilla/src/EditView.h b/scintilla/src/EditView.h
index 3c11dd2327..b6bafb0f6e 100644
--- a/scintilla/src/EditView.h
+++ b/scintilla/src/EditView.h
@@ -72,7 +72,6 @@ class LineTabstops;
 */
 class EditView final {
 public:
-	PrintParameters printParameters;
 	std::unique_ptr<LineTabstops> ldTabstops;
 	int tabWidthMinimumPixels;
 
@@ -101,6 +100,7 @@ class EditView final {
 
 	LineLayoutCache llc;
 	PositionCache posCache;
+	PrintParameters printParameters;
 
 	int tabArrowHeight; // draw arrow heads this many pixels above/below line midpoint
 	/** Some platforms, notably PLAT_CURSES, do not support Scintilla's native
diff --git a/scintilla/src/XPM.cxx b/scintilla/src/XPM.cxx
index 118b997916..11a47bdd4a 100644
--- a/scintilla/src/XPM.cxx
+++ b/scintilla/src/XPM.cxx
@@ -134,7 +134,7 @@ void XPM::Init(const char *const *linesForm) {
 
 	for (int c = 0; c < nColours; c++) {
 		const char *colourDef = linesForm[c + 1];
-		const char code = colourDef[0];
+		const unsigned char code = colourDef[0];
 		colourDef += 4;
 		ColourRGBA colour(0, 0, 0);
 		if (*colourDef == '#') {
@@ -142,7 +142,7 @@ void XPM::Init(const char *const *linesForm) {
 		} else {
 			codeTransparent = code;
 		}
-		colourCodeTable[static_cast<unsigned char>(code)] = colour;
+		colourCodeTable[code] = colour;
 	}
 
 	for (int y = 0; y < height; y++) {
diff --git a/scintilla/src/XPM.h b/scintilla/src/XPM.h
index 2fa67530ab..489a487081 100644
--- a/scintilla/src/XPM.h
+++ b/scintilla/src/XPM.h
@@ -15,9 +15,9 @@ class XPM final {
 	int height = 1;
 	int width = 1;
 	int nColours = 1;
+	int codeTransparent = ' ';
 	std::vector<unsigned char> pixels;
 	ColourRGBA colourCodeTable[256];
-	char codeTransparent = ' ';
 	ColourRGBA ColourFromCode(int ch) const noexcept;
 	void FillRun(Surface *surface, int code, int startX, int y, int x) const;
 public: