Fold LIBC_UNICODE into LIBC_STR

third_party/argon2/argon2.mk

@@ -26,7 +26,6 @@ THIRD_PARTY_ARGON2_A_DIRECTDEPS =				\
 	LIBC_RUNTIME						\
 	LIBC_SYSV_CALLS						\
 	LIBC_STR						\
-	LIBC_UNICODE						\
 	LIBC_STUBS
 
 THIRD_PARTY_ARGON2_A_DEPS :=					\

third_party/chibicc/chibicc.h

@@ -23,7 +23,7 @@
 #include "libc/str/str.h"
 #include "libc/time/struct/tm.h"
 #include "libc/time/time.h"
-#include "libc/unicode/unicode.h"
+#include "libc/str/unicode.h"
 #include "libc/x/x.h"
 #include "third_party/gdtoa/gdtoa.h"
 #include "tool/build/lib/javadown.h"

third_party/chibicc/chibicc.mk

@@ -56,7 +56,6 @@ THIRD_PARTY_CHIBICC_A_DIRECTDEPS =					\
 	LIBC_STUBS							\
 	LIBC_SYSV							\
 	LIBC_TIME							\
-	LIBC_UNICODE							\
 	LIBC_X								\
 	THIRD_PARTY_COMPILER_RT						\
 	THIRD_PARTY_DLMALLOC						\

third_party/chibicc/test/test.mk

@@ -44,7 +44,6 @@ THIRD_PARTY_CHIBICC_TEST_DIRECTDEPS =						\
 	LIBC_STR								\
 	LIBC_STUBS								\
 	LIBC_TINYMATH								\
-	LIBC_UNICODE								\
 	LIBC_X									\
 	THIRD_PARTY_CHIBICC							\
 	THIRD_PARTY_COMPILER_RT

third_party/double-conversion/double-conversion.mk

@@ -73,7 +73,6 @@ THIRD_PARTY_DOUBLECONVERSION_A_DIRECTDEPS =					\
 	LIBC_SYSV								\
 	LIBC_STR								\
 	LIBC_STUBS								\
-	LIBC_UNICODE								\
 	LIBC_TINYMATH								\
 	THIRD_PARTY_GDTOA							\
 	THIRD_PARTY_LIBCXX

third_party/finger/finger.mk

@@ -26,7 +26,6 @@ THIRD_PARTY_FINGER_A_DIRECTDEPS =			\
 	LIBC_DNS					\
 	LIBC_SOCK					\
 	LIBC_TIME					\
-	LIBC_UNICODE					\
 	THIRD_PARTY_MUSL				\
 	THIRD_PARTY_GETOPT
 

third_party/gdtoa/strtod_l.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/unicode/locale.h"
+#include "libc/str/locale.h"
 #include "third_party/gdtoa/gdtoa.h"
 
 double strtod_l(const char *s, char **endptr, locale_t l) {

third_party/gdtoa/strtof_l.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/unicode/locale.h"
+#include "libc/str/locale.h"
 #include "third_party/gdtoa/gdtoa.h"
 
 float strtof_l(const char *s, char **sp, locale_t l) {

third_party/gdtoa/strtold_l.c

@@ -29,7 +29,7 @@
 │  THIS SOFTWARE.                                                              │
 │                                                                              │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/unicode/locale.h"
+#include "libc/str/locale.h"
 #include "third_party/gdtoa/gdtoa.h"
 
 /**

third_party/gdtoa/wcstod.c

@@ -19,7 +19,7 @@
 #include "libc/assert.h"
 #include "libc/fmt/conv.h"
 #include "libc/runtime/runtime.h"
-#include "libc/unicode/locale.h"
+#include "libc/str/locale.h"
 
 double wcstod(const wchar_t *nptr, wchar_t **endptr) {
   assert(!"not implemented");

third_party/gdtoa/wcstof.c

@@ -19,7 +19,7 @@
 #include "libc/assert.h"
 #include "libc/fmt/conv.h"
 #include "libc/runtime/runtime.h"
-#include "libc/unicode/locale.h"
+#include "libc/str/locale.h"
 #include "third_party/gdtoa/gdtoa.h"
 
 float wcstof(const wchar_t *nptr, wchar_t **endptr) {

third_party/gdtoa/wcstold.c

@@ -19,7 +19,7 @@
 #include "libc/assert.h"
 #include "libc/fmt/conv.h"
 #include "libc/runtime/runtime.h"
-#include "libc/unicode/locale.h"
+#include "libc/str/locale.h"
 #include "third_party/gdtoa/gdtoa.h"
 
 long double wcstold(const wchar_t *nptr, wchar_t **endptr) {

third_party/gdtoa/wcstold_l.c

@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/conv.h"
-#include "libc/unicode/locale.h"
+#include "libc/str/locale.h"
 #include "third_party/gdtoa/gdtoa.h"
 
 long double wcstold_l(const wchar_t *nptr, wchar_t **endptr, locale_t l) {

third_party/getopt/getopt.mk

@@ -31,7 +31,6 @@ THIRD_PARTY_GETOPT_A_DIRECTDEPS =				\
 	LIBC_NEXGEN32E						\
 	LIBC_STDIO						\
 	LIBC_STR						\
-	LIBC_UNICODE						\
 	LIBC_STUBS
 
 THIRD_PARTY_GETOPT_A_DEPS :=					\

third_party/libcxx/__bsd_locale_fallbacks.h

@@ -15,7 +15,7 @@
 
 #include "third_party/libcxx/stdlib.h"
 #include "libc/mem/fmt.h"
-#include "libc/unicode/unicode.h"
+#include "libc/str/unicode.h"
 #include "third_party/libcxx/memory"
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)

third_party/libcxx/clocale

@@ -36,7 +36,7 @@ lconv* localeconv();
 */
 
 #include "third_party/libcxx/__config"
-#include "libc/unicode/locale.h"
+#include "libc/str/locale.h"
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header

third_party/libcxx/libcxx.mk

@@ -163,7 +163,6 @@ THIRD_PARTY_LIBCXX_A_DIRECTDEPS =				\
 	LIBC_SYSV						\
 	LIBC_TIME						\
 	LIBC_TINYMATH						\
-	LIBC_UNICODE						\
 	THIRD_PARTY_GDTOA
 
 THIRD_PARTY_LIBCXX_A_DEPS :=					\

third_party/libcxx/locale

@@ -25,7 +25,7 @@
 #include "third_party/libcxx/ctime"
 #include "third_party/libcxx/cstdio"
 #ifdef _LIBCPP_HAS_CATOPEN
-# include "libc/unicode/locale.h"
+# include "libc/str/locale.h"
 # include "third_party/libcxx/nl_types.h"
 #endif
 

third_party/libcxx/locale.cc

@@ -27,7 +27,7 @@
 #include "third_party/libcxx/cwctype"
 #include "third_party/libcxx/__sso_allocator"
 #include "third_party/libcxx/include/atomic_support.hh"
-#include "libc/unicode/locale.h"
+#include "libc/str/locale.h"
 #include "third_party/libcxx/__undef_macros"
 
 // On Linux, wint_t and wchar_t have different signed-ness, and this causes

third_party/linenoise/linenoise.c

@@ -164,7 +164,7 @@
 #include "libc/sysv/consts/sig.h"
 #include "libc/sysv/consts/termios.h"
 #include "libc/sysv/errfuns.h"
-#include "libc/unicode/unicode.h"
+#include "libc/str/unicode.h"
 #include "net/http/escape.h"
 #include "third_party/linenoise/linenoise.h"
 #include "tool/build/lib/case.h"

third_party/linenoise/linenoise.mk

@@ -28,7 +28,6 @@ THIRD_PARTY_LINENOISE_A_DIRECTDEPS =				\
 	LIBC_LOG						\
 	LIBC_SYSV_CALLS						\
 	LIBC_STR						\
-	LIBC_UNICODE						\
 	LIBC_STUBS						\
 	NET_HTTP
 

third_party/lua/loslib.c

@@ -36,7 +36,7 @@
 #include "libc/sysv/consts/exit.h"
 #include "libc/time/struct/tm.h"
 #include "libc/time/time.h"
-#include "libc/unicode/locale.h"
+#include "libc/str/locale.h"
 #include "third_party/lua/lauxlib.h"
 #include "third_party/lua/lprefix.h"
 #include "third_party/lua/lua.h"

third_party/lua/lua.mk

@@ -129,7 +129,6 @@ THIRD_PARTY_LUA_A_DIRECTDEPS =						\
 	LIBC_TIME							\
 	LIBC_X								\
 	LIBC_TINYMATH							\
-	LIBC_UNICODE							\
 	NET_HTTP							\
 	THIRD_PARTY_LINENOISE						\
 	THIRD_PARTY_DOUBLECONVERSION					\
@@ -260,7 +259,6 @@ THIRD_PARTY_LUA_LUAC_DIRECTDEPS =					\
 	LIBC_STDIO							\
 	LIBC_STR							\
 	LIBC_SYSV							\
-	LIBC_UNICODE							\
 	THIRD_PARTY_LUA							\
 	TOOL_ARGS
 

third_party/lua/luaconf.h

@@ -4,7 +4,7 @@
 #include "libc/dce.h"
 #include "libc/fmt/fmt.h"
 #include "libc/limits.h"
-#include "libc/unicode/unicode.h"
+#include "libc/str/unicode.h"
 #include "third_party/gdtoa/gdtoa.h"
 
 #define LUA_USE_POSIX

third_party/lz4cli/lz4cli.mk

@@ -42,8 +42,7 @@ THIRD_PARTY_LZ4CLI_DIRECTDEPS =				\
 	LIBC_INTRIN					\
 	LIBC_STDIO					\
 	LIBC_LOG					\
-	LIBC_TIME					\
-	LIBC_UNICODE
+	LIBC_TIME
 
 THIRD_PARTY_LZ4CLI_DEPS :=				\
 	$(call uniq,$(foreach x,$(THIRD_PARTY_LZ4CLI_DIRECTDEPS),$($(x))))

third_party/make/make.mk

@@ -124,7 +124,6 @@ THIRD_PARTY_MAKE_DIRECTDEPS =				\
 	LIBC_SYSV_CALLS					\
 	LIBC_TIME					\
 	LIBC_TINYMATH					\
-	LIBC_UNICODE					\
 	LIBC_X						\
 	THIRD_PARTY_COMPILER_RT				\
 	THIRD_PARTY_MUSL				\

third_party/make/makeint.inc

@@ -50,7 +50,7 @@ this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "libc/sysv/consts/w.h"
 #include "libc/time/struct/tm.h"
 #include "libc/time/time.h"
-#include "libc/unicode/locale.h"
+#include "libc/str/locale.h"
 #include "libc/x/x.h"
 #include "third_party/gdtoa/gdtoa.h"
 #include "third_party/musl/glob.h"

third_party/maxmind/maxmind.mk

@@ -27,8 +27,7 @@ THIRD_PARTY_MAXMIND_A_DIRECTDEPS =					\
 	LIBC_STDIO							\
 	LIBC_STR							\
 	LIBC_STUBS							\
-	LIBC_SYSV							\
-	LIBC_UNICODE
+	LIBC_SYSV
 
 THIRD_PARTY_MAXMIND_A_DEPS :=						\
 	$(call uniq,$(foreach x,$(THIRD_PARTY_MAXMIND_A_DIRECTDEPS),$($(x))))

third_party/mbedtls/mbedtls.mk

@@ -29,7 +29,6 @@ THIRD_PARTY_MBEDTLS_A_DIRECTDEPS =					\
 	LIBC_STR							\
 	LIBC_SYSV							\
 	LIBC_TIME							\
-	LIBC_UNICODE							\
 	NET_HTTP							\
 	THIRD_PARTY_COMPILER_RT						\
 	THIRD_PARTY_GDTOA						\

third_party/mbedtls/test/test.mk

@@ -107,7 +107,6 @@ THIRD_PARTY_MBEDTLS_TEST_DIRECTDEPS =										\
 	LIBC_SYSV												\
 	LIBC_TIME												\
 	LIBC_TESTLIB												\
-	LIBC_UNICODE												\
 	LIBC_X													\
 	LIBC_ZIPOS												\
 	THIRD_PARTY_COMPILER_RT											\

third_party/python/Modules/_decimal/libmpdec/io.c

@@ -29,8 +29,8 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/errno.h"
 #include "libc/fmt/fmt.h"
-#include "libc/unicode/locale.h"
-#include "libc/unicode/unicode.h"
+#include "libc/str/locale.h"
+#include "libc/str/unicode.h"
 #include "third_party/python/Modules/_decimal/libmpdec/bits.h"
 #include "third_party/python/Modules/_decimal/libmpdec/constants.h"
 #include "third_party/python/Modules/_decimal/libmpdec/io.h"

third_party/python/Modules/_localemodule.c

@@ -5,9 +5,9 @@
 │ https://docs.python.org/3/license.html                                       │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #define PY_SSIZE_T_CLEAN
-#include "libc/unicode/langinfo.h"
-#include "libc/unicode/locale.h"
-#include "libc/unicode/unicode.h"
+#include "libc/str/langinfo.h"
+#include "libc/str/locale.h"
+#include "libc/str/unicode.h"
 #include "third_party/python/Include/dictobject.h"
 #include "third_party/python/Include/fileutils.h"
 #include "third_party/python/Include/import.h"

third_party/python/Modules/main.c

@@ -9,7 +9,7 @@
 #include "libc/errno.h"
 #include "libc/stdio/stdio.h"
 #include "libc/sysv/consts/s.h"
-#include "libc/unicode/locale.h"
+#include "libc/str/locale.h"
 #include "third_party/python/Include/abstract.h"
 #include "third_party/python/Include/bytesobject.h"
 #include "third_party/python/Include/ceval.h"

third_party/python/Python/fileutils.c

@@ -14,8 +14,8 @@
 #include "libc/sysv/consts/fd.h"
 #include "libc/sysv/consts/fio.h"
 #include "libc/sysv/consts/o.h"
-#include "libc/unicode/locale.h"
-#include "libc/unicode/unicode.h"
+#include "libc/str/locale.h"
+#include "libc/str/unicode.h"
 #include "third_party/python/Include/bytesobject.h"
 #include "third_party/python/Include/ceval.h"
 #include "third_party/python/Include/fileutils.h"

third_party/python/Python/formatter_unicode.c

@@ -5,7 +5,7 @@
 │ https://docs.python.org/3/license.html                                       │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/math.h"
-#include "libc/unicode/locale.h"
+#include "libc/str/locale.h"
 #include "third_party/python/Include/abstract.h"
 #include "third_party/python/Include/complexobject.h"
 #include "third_party/python/Include/fileutils.h"

third_party/python/Python/frozenmain.c

@@ -6,7 +6,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/stdio/stdio.h"
-#include "libc/unicode/locale.h"
+#include "libc/str/locale.h"
 #include "third_party/python/Include/fileutils.h"
 #include "third_party/python/Include/import.h"
 #include "third_party/python/Include/pydebug.h"

third_party/python/Python/initimport.c

@@ -5,7 +5,7 @@
 │ https://docs.python.org/3/license.html                                       │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/unicode/locale.h"
+#include "libc/str/locale.h"
 #include "third_party/python/Include/abstract.h"
 #include "third_party/python/Include/boolobject.h"
 #include "third_party/python/Include/codecs.h"

third_party/python/Python/initstdio.c

@@ -5,7 +5,7 @@
 │ https://docs.python.org/3/license.html                                       │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/unicode/locale.h"
+#include "libc/str/locale.h"
 #include "third_party/python/Include/abstract.h"
 #include "third_party/python/Include/boolobject.h"
 #include "third_party/python/Include/codecs.h"

third_party/python/Python/pylifecycle.c

@@ -14,7 +14,7 @@
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/stdio.h"
 #include "libc/sysv/consts/sig.h"
-#include "libc/unicode/locale.h"
+#include "libc/str/locale.h"
 #include "third_party/python/Include/Python-ast.h"
 #include "third_party/python/Include/abstract.h"
 #include "third_party/python/Include/ast.h"

third_party/python/Python/pystrtod.c

@@ -7,7 +7,7 @@
 #include "libc/assert.h"
 #include "libc/errno.h"
 #include "libc/fmt/fmt.h"
-#include "libc/unicode/locale.h"
+#include "libc/str/locale.h"
 #include "third_party/python/Include/dtoa.h"
 #include "third_party/python/Include/object.h"
 #include "third_party/python/Include/pyctype.h"

third_party/python/Python/pythonrun.c

@@ -5,7 +5,7 @@
 │ https://docs.python.org/3/license.html                                       │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/stdio/stdio.h"
-#include "libc/unicode/locale.h"
+#include "libc/str/locale.h"
 #include "third_party/python/Include/Python-ast.h"
 #include "third_party/python/Include/abstract.h"
 #include "third_party/python/Include/ast.h"

third_party/python/Python/sysmodule.c

@@ -14,7 +14,7 @@
 #include "libc/stdio/stdio.h"
 #include "libc/sysv/consts/exit.h"
 #include "libc/sysv/consts/s.h"
-#include "libc/unicode/locale.h"
+#include "libc/str/locale.h"
 #include "libc/x/x.h"
 #include "third_party/python/Include/abstract.h"
 #include "third_party/python/Include/boolobject.h"

third_party/python/python.mk

@@ -456,7 +456,6 @@ THIRD_PARTY_PYTHON_STAGE1_A_DIRECTDEPS =				\
 	LIBC_SYSV_CALLS							\
 	LIBC_TIME							\
 	LIBC_TINYMATH							\
-	LIBC_UNICODE							\
 	LIBC_X								\
 	TOOL_BUILD_LIB							\
 	THIRD_PARTY_DLMALLOC						\
@@ -1136,7 +1135,6 @@ THIRD_PARTY_PYTHON_STAGE2_A_DIRECTDEPS =				\
 	LIBC_SYSV_CALLS							\
 	LIBC_TIME							\
 	LIBC_TINYMATH							\
-	LIBC_UNICODE							\
 	LIBC_X								\
 	LIBC_ZIPOS							\
 	NET_HTTPS							\
@@ -2056,7 +2054,6 @@ THIRD_PARTY_PYTHON_PYTEST_PYMAINS_DIRECTDEPS =				\
 	LIBC_INTRIN							\
 	LIBC_X								\
 	LIBC_STR							\
-	LIBC_UNICODE							\
 	LIBC_STDIO							\
 	LIBC_CALLS							\
 	LIBC_RUNTIME							\
@@ -4288,7 +4285,6 @@ THIRD_PARTY_PYTHON_PYTHON_DIRECTDEPS =					\
 	LIBC_STUBS							\
 	LIBC_LOG							\
 	LIBC_SYSV							\
-	LIBC_UNICODE							\
 	LIBC_X								\
 	LIBC_ZIPOS							\
 	THIRD_PARTY_GETOPT						\
@@ -4330,7 +4326,6 @@ THIRD_PARTY_PYTHON_FREEZE_DIRECTDEPS =					\
 	LIBC_STR							\
 	LIBC_STUBS							\
 	LIBC_SYSV							\
-	LIBC_UNICODE							\
 	LIBC_X								\
 	THIRD_PARTY_GETOPT						\
 	THIRD_PARTY_XED							\
@@ -4370,7 +4365,7 @@ o/$(MODE)/third_party/python/chibicc.inc:				\
 		libc/runtime/symbolic.h					\
 		libc/stdio/stdio.h					\
 		libc/str/str.h						\
-		libc/unicode/unicode.h					\
+		libc/str/unicode.h					\
 		third_party/python/Include/Python.h			\
 		third_party/python/Include/abstract.h			\
 		third_party/python/Include/bltinmodule.h		\

third_party/python/runpythonmodule.c

@@ -29,7 +29,7 @@
 #include "libc/sysv/consts/prot.h"
 #include "libc/sysv/consts/sig.h"
 #include "libc/time/time.h"
-#include "libc/unicode/locale.h"
+#include "libc/str/locale.h"
 #include "libc/x/x.h"
 #include "third_party/linenoise/linenoise.h"
 #include "third_party/python/Include/abstract.h"

third_party/quickjs/quickjs.mk

@@ -85,7 +85,6 @@ THIRD_PARTY_QUICKJS_A_DIRECTDEPS =						\
 	LIBC_SYSV_CALLS								\
 	LIBC_TIME								\
 	LIBC_TINYMATH								\
-	LIBC_UNICODE								\
 	LIBC_X									\
 	THIRD_PARTY_COMPILER_RT							\
 	THIRD_PARTY_GDTOA							\

third_party/regex/regex.mk

@@ -21,7 +21,6 @@ THIRD_PARTY_REGEX_A_DIRECTDEPS =			\
 	LIBC_NEXGEN32E					\
 	LIBC_RUNTIME					\
 	LIBC_STR					\
-	LIBC_UNICODE					\
 	LIBC_STUBS
 
 THIRD_PARTY_REGEX_A_DEPS :=				\

third_party/smallz4/smallz4.mk

@@ -34,7 +34,6 @@ THIRD_PARTY_SMALLZ4_A_DIRECTDEPS =				\
 	LIBC_NEXGEN32E						\
 	LIBC_RUNTIME						\
 	LIBC_CALLS						\
-	LIBC_UNICODE						\
 	LIBC_STDIO						\
 	LIBC_STR						\
 	LIBC_STUBS						\

third_party/sqlite3/fts3_icu.c

@@ -18,7 +18,7 @@
 
 #include "libc/assert.h"
 #include "libc/str/str.h"
-#include "libc/unicode/unicode.h"
+#include "libc/str/unicode.h"
 #include "third_party/sqlite3/fts3_tokenizer.inc"
 
 typedef struct IcuTokenizer IcuTokenizer;

third_party/sqlite3/icu.c

@@ -34,7 +34,7 @@
 
 /* Include ICU headers */
 #include "libc/assert.h"
-#include "libc/unicode/unicode.h"
+#include "libc/str/unicode.h"
 
 #ifndef SQLITE_CORE
 #include "third_party/sqlite3/sqlite3ext.h"

third_party/sqlite3/sqlite3.mk

@@ -56,7 +56,6 @@ THIRD_PARTY_SQLITE3_A_DIRECTDEPS =					\
 	LIBC_SYSV_CALLS							\
 	LIBC_TIME							\
 	LIBC_TINYMATH							\
-	LIBC_UNICODE							\
 	THIRD_PARTY_GDTOA						\
 	THIRD_PARTY_LINENOISE						\
 	THIRD_PARTY_MUSL						\

third_party/tidy/tidy.mk

@@ -24,7 +24,6 @@ THIRD_PARTY_TIDY_A_DIRECTDEPS =							\
 	LIBC_NEXGEN32E								\
 	LIBC_RUNTIME								\
 	LIBC_CALLS								\
-	LIBC_UNICODE								\
 	LIBC_STDIO								\
 	LIBC_SYSV								\
 	LIBC_STR								\

third_party/unzip/unzip.mk

@@ -25,7 +25,6 @@ THIRD_PARTY_UNZIP_A_DIRECTDEPS =						\
 	LIBC_STUBS								\
 	LIBC_SYSV								\
 	LIBC_TIME								\
-	LIBC_UNICODE								\
 	LIBC_ZIPOS								\
 	THIRD_PARTY_BZIP2
 

third_party/unzip/unzpriv.h

@@ -26,7 +26,7 @@
 #include "libc/sysv/consts/s.h"
 #include "libc/calls/calls.h"
 #include "libc/str/str.h"
-#include "libc/unicode/locale.h"
+#include "libc/str/locale.h"
 #include "libc/errno.h"
 #include "third_party/unzip/unzpriv.h"
 #include "libc/calls/calls.h"

third_party/zip/tailor.h

@@ -259,7 +259,7 @@ IZ_IMP char *mktemp();
  */
 #ifdef UNICODE_SUPPORT
 # if defined( UNIX) || defined( VMS)
-#include "libc/unicode/locale.h"
+#include "libc/str/locale.h"
 # endif /* defined( UNIX) || defined( VMS) */
 #include "libc/str/str.h"
 #endif /* def UNICODE_SUPPORT */

third_party/zip/zip.mk

@@ -91,7 +91,6 @@ THIRD_PARTY_ZIP_DIRECTDEPS =			\
 	LIBC_STUBS				\
 	LIBC_SYSV				\
 	LIBC_TIME				\
-	LIBC_UNICODE				\
 	LIBC_X					\
 	THIRD_PARTY_BZIP2