diff --git a/manifest b/manifest
index 2fd043f352..be8887dde6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\sstray\sCR\sfrom\send\sof\sline\sin\sa\ssource\sfile.
-D 2023-05-12T12:57:44.642
+C Ensure\sthe\s_O_U16TEXT\sis\sdefined\sfor\sWindows\sbuilds\sof\sthe\sCLI.\n[forum:/forumpost/c80aa942dc6bf2|Forum\spost\sc80aa942dc6bf2].
+D 2023-05-12T13:20:57.273
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -636,7 +636,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 3e53e02ce87c9582bd7e7d22f13f4094a271678d9dc72820fa257a2abb5e4032
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 12aa3168be4ff175702fe0ebeaf544312be22d275d378a28e7b2fad32d552d36
-F src/shell.c.in 8cfc51a5711df05ea0e8a4fbbe20117eb629233f0e92ebea21c2e7dc717ec3d9
+F src/shell.c.in f2878df634b9d13ef7944f0d2d516d0b1abaf69302c26b4a8f1878b8be9f8411
 F src/sqlite.h.in 27ca1d4b2eda8feee468af5735182390e8fe4696522751eec0136d17323201ad
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
@@ -2068,8 +2068,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 607c3efbe0293d7c11a955a9f21e24fb9f7f1bb758e13e60f4ba0cc0ac8b900c
-R 3bfe30c59997b7ecaaf967f6c65fb515
+P 48139fb904de4b7b383e7f8c29bed83ad878eb22b1dd773c366a0aee74613d23
+R 48448dc19b809c692b0d7c49b41acf2c
 U drh
-Z 4dfb7243a06de6c1bb7faa74afa633d4
+Z 99702f4eff9217b484a47a30f0a1c45c
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 4535d4e338..6425bb986f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-48139fb904de4b7b383e7f8c29bed83ad878eb22b1dd773c366a0aee74613d23
\ No newline at end of file
+504effa89b48c0dc6cd12b3eaf6017be3f32017c601af17759a3cc185346d868
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index 2c5c59f231..b29e402913 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -605,6 +605,10 @@ static struct ConsoleState {
   DWORD consoleMode; /* Console mode upon shell start */
 } conState = { 0, 0, 0, 0, INVALID_HANDLE_VALUE, 0 };
 
+#ifndef _O_U16TEXT /* For build environments lacking this constant: */
+# define _O_U16TEXT 0x20000
+#endif
+
 /*
 ** Prepare console, (if known to be a WIN32 console), for UTF-8
 ** input (from either typing or suitable paste operations) and for