diff --git a/src/stc/scintilla/include/Platform.h b/src/stc/scintilla/include/Platform.h
index b5e2109b4d..8fabaf90f8 100644
--- a/src/stc/scintilla/include/Platform.h
+++ b/src/stc/scintilla/include/Platform.h
@@ -319,7 +319,7 @@ public:
 	Font() noexcept;
 	// Deleted so Font objects can not be copied
 	Font(const Font &) = delete;
-	Font(Font &&) = delete;
+	Font(Font &&) = default;
 	Font &operator=(const Font &) = delete;
 	Font &operator=(Font &&) = delete;
 	virtual ~Font();
diff --git a/src/stc/scintilla/lexlib/LexAccessor.h b/src/stc/scintilla/lexlib/LexAccessor.h
index 81f5a16aea..2bac5b0059 100644
--- a/src/stc/scintilla/lexlib/LexAccessor.h
+++ b/src/stc/scintilla/lexlib/LexAccessor.h
@@ -25,7 +25,7 @@ private:
 	Sci_Position startPos;
 	Sci_Position endPos;
 	int codePage;
-	enum EncodingType encodingType;
+	EncodingType encodingType;
 	Sci_Position lenDoc;
 	char styleBuf[bufferSize];
 	Sci_Position validLen;
diff --git a/src/stc/scintilla/lexlib/SparseState.h b/src/stc/scintilla/lexlib/SparseState.h
index 6286c76afb..880f8276f2 100644
--- a/src/stc/scintilla/lexlib/SparseState.h
+++ b/src/stc/scintilla/lexlib/SparseState.h
@@ -17,7 +17,7 @@ class SparseState {
 	struct State {
 		Sci_Position position;
 		T value;
-		constexpr State(Sci_Position position_, T value_) noexcept : position(position_), value(value_) {
+		State(Sci_Position position_, T value_) noexcept : position(position_), value(value_) {
 		}
 		inline bool operator<(const State &other) const noexcept {
 			return position < other.position;
diff --git a/src/stc/scintilla/src/CallTip.cxx b/src/stc/scintilla/src/CallTip.cxx
index 96b54224c9..83616333d8 100644
--- a/src/stc/scintilla/src/CallTip.cxx
+++ b/src/stc/scintilla/src/CallTip.cxx
@@ -165,12 +165,12 @@ int CallTip::DrawChunk(Surface *surface, int x, const char *s, size_t len,
 			xEnd = NextTabPos(x);
 		} else {
 			const char *segText = s + startSeg;
-			xEnd = x + static_cast<int>(Sci::lround(surface->WidthText(font, segText, endSeg - startSeg)));
+			xEnd = x + static_cast<int>(Sci::lround(surface->WidthText(font, segText, (int)(endSeg - startSeg))));
 			if (draw) {
 				rcClient.left = static_cast<XYPOSITION>(x);
 				rcClient.right = static_cast<XYPOSITION>(xEnd);
 				surface->DrawTextTransparent(rcClient, font, static_cast<XYPOSITION>(ytext),
-									segText, endSeg - startSeg,
+									segText, (int)(endSeg - startSeg),
 				                             asHighlight ? colourSel : colourUnSel);
 			}
 		}
diff --git a/src/stc/scintilla/src/EditView.cxx b/src/stc/scintilla/src/EditView.cxx
index cae02ef5c9..540f48fdfc 100644
--- a/src/stc/scintilla/src/EditView.cxx
+++ b/src/stc/scintilla/src/EditView.cxx
@@ -1208,7 +1208,7 @@ void EditView::DrawEOLAnnotationText(Surface *surface, const EditModel &model, c
 
 	PRectangle rcSegment = rcLine;
 	FontAlias fontText = vsDraw.styles[style].font;
-	const int widthEOLAnnotationText = static_cast<int>(surface->WidthText(fontText, stEOLAnnotation.text, stEOLAnnotation.length));
+	const int widthEOLAnnotationText = static_cast<int>(surface->WidthText(fontText, stEOLAnnotation.text, (int)stEOLAnnotation.length));
 
 	const XYPOSITION spaceWidth = vsDraw.styles[ll->EndLineStyle()].spaceWidth;
 	const XYPOSITION virtualSpace = model.sel.VirtualSpaceFor(
@@ -1250,11 +1250,11 @@ void EditView::DrawEOLAnnotationText(Surface *surface, const EditModel &model, c
 	if (phase & drawText) {
 		if (phasesDraw != phasesOne) {
 			surface->DrawTextTransparent(rcSegment, fontText,
-			rcSegment.top + vsDraw.maxAscent, stEOLAnnotation.text, stEOLAnnotation.length,
+			rcSegment.top + vsDraw.maxAscent, stEOLAnnotation.text, (int)stEOLAnnotation.length,
 			textFore);
 		} else {
 			surface->DrawTextNoClip(rcSegment, fontText,
-			rcSegment.top + vsDraw.maxAscent, stEOLAnnotation.text, stEOLAnnotation.length,
+			rcSegment.top + vsDraw.maxAscent, stEOLAnnotation.text, (int)stEOLAnnotation.length,
 			textFore, textBack);
 		}
 	}
diff --git a/src/stc/scintilla/src/Style.h b/src/stc/scintilla/src/Style.h
index 95ec3fa22f..3c923fc4f9 100644
--- a/src/stc/scintilla/src/Style.h
+++ b/src/stc/scintilla/src/Style.h
@@ -35,7 +35,7 @@ public:
 	FontAlias() noexcept;
 	// FontAlias objects can not be assigned except for initialization
 	FontAlias(const FontAlias &) noexcept;
-	FontAlias(FontAlias &&)  = delete;
+	FontAlias(FontAlias &&)  = default;
 	FontAlias &operator=(const FontAlias &) = delete;
 	FontAlias &operator=(FontAlias &&) = delete;
 	~FontAlias() override;