Remove plenty of makefile misconfigurations

third_party/bzip2/bzip2.mk

@@ -8,6 +8,7 @@ THIRD_PARTY_BZIP2 = $(THIRD_PARTY_BZIP2_A_DEPS) $(THIRD_PARTY_BZIP2_A)
 THIRD_PARTY_BZIP2_A = o/$(MODE)/third_party/bzip2/bzip2.a
 THIRD_PARTY_BZIP2_A_FILES := $(wildcard third_party/bzip2/*)
 THIRD_PARTY_BZIP2_A_HDRS = $(filter %.h,$(THIRD_PARTY_BZIP2_A_FILES))
+THIRD_PARTY_BZIP2_A_INCS = $(filter %.inc,$(THIRD_PARTY_BZIP2_A_FILES))
 THIRD_PARTY_BZIP2_A_SRCS = $(filter %.c,$(THIRD_PARTY_BZIP2_A_FILES))
 THIRD_PARTY_BZIP2_A_OBJS = $(THIRD_PARTY_BZIP2_A_SRCS:%.c=o/$(MODE)/%.o)
 THIRD_PARTY_BZIP2_BINS = $(THIRD_PARTY_BZIP2_COMS) $(THIRD_PARTY_BZIP2_COMS:%=%.dbg)
@@ -70,6 +71,7 @@ $(THIRD_PARTY_BZIP2_A_OBJS):					\
 THIRD_PARTY_BZIP2_LIBS = $(foreach x,$(THIRD_PARTY_BZIP2_ARTIFACTS),$($(x)))
 THIRD_PARTY_BZIP2_SRCS = $(foreach x,$(THIRD_PARTY_BZIP2_ARTIFACTS),$($(x)_SRCS))
 THIRD_PARTY_BZIP2_HDRS = $(foreach x,$(THIRD_PARTY_BZIP2_ARTIFACTS),$($(x)_HDRS))
+THIRD_PARTY_BZIP2_INCS = $(foreach x,$(THIRD_PARTY_BZIP2_ARTIFACTS),$($(x)_INCS))
 THIRD_PARTY_BZIP2_BINS = $(foreach x,$(THIRD_PARTY_BZIP2_ARTIFACTS),$($(x)_BINS))
 THIRD_PARTY_BZIP2_CHECKS = $(foreach x,$(THIRD_PARTY_BZIP2_ARTIFACTS),$($(x)_CHECKS))
 THIRD_PARTY_BZIP2_OBJS = $(foreach x,$(THIRD_PARTY_BZIP2_ARTIFACTS),$($(x)_OBJS))

third_party/libcxx/__mutex_base

@@ -15,7 +15,9 @@
 #include "third_party/libcxx/system_error"
 #include "third_party/libcxx/__threading_support"
 
-#include "libc/isystem/time.h"
+#include "libc/sysv/consts/sched.h"
+#include "libc/time/struct/tm.h"
+#include "libc/time/time.h"
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header

third_party/libcxx/string.h

@@ -57,7 +57,8 @@ size_t strlen(const char* s);
 #pragma GCC system_header
 #endif
 
-#include "libc/isystem/string.h"
+#include "libc/alg/alg.h"
+#include "libc/str/str.h"
 
 // MSVCRT, GNU libc and its derivates may already have the correct prototype in
 // <string.h>. This macro can be defined by users if their C library provides

third_party/libcxx/wchar.h

@@ -9,7 +9,8 @@
 
 #ifndef _LIBCPP_WCHAR_H
 #define _LIBCPP_WCHAR_H
-#include "libc/isystem/wchar.h"
+#include "libc/str/str.h"
+#include "libc/time/time.h"
 
 /*
     wchar.h synopsis

third_party/libcxx/wctype.h

@@ -50,7 +50,8 @@ wctrans_t wctrans(const char* property);
 #pragma GCC system_header
 #endif
 
-#include "libc/isystem/wctype.h"
+#include "libc/str/str.h"
+#include "libc/time/time.h"
 
 #ifdef __cplusplus
 

third_party/lz4cli/lz4cli.mk

@@ -59,6 +59,9 @@ o/$(MODE)/third_party/lz4cli/lz4cli.com.dbg:		\
 		$(APE_NO_MODIFY_SELF)
 	@$(APELINK)
 
+o/$(MODE)/third_party/lz4cli/lz4cli.o:			\
+		third_party/lz4cli/COPYING
+
 $(THIRD_PARTY_LZ4CLI_OBJS):				\
 		$(BUILD_FILES)				\
 		third_party/lz4cli/lz4cli.mk

third_party/make/dirname.h

@@ -20,7 +20,7 @@
 
 #ifndef DIRNAME_H_
 # define DIRNAME_H_ 1
-# include "third_party/make/dosname.h"
+#include "third_party/make/dosname.h"
 
 # ifndef DIRECTORY_SEPARATOR
 #  define DIRECTORY_SEPARATOR '/'

third_party/make/error.c

@@ -28,7 +28,7 @@
 #include "third_party/make/stdio.h"
 
 #if !_LIBC && ENABLE_NLS
-# include "third_party/make/gettext.h"
+#include "third_party/make/gettext.h"
 # define _(msgid) gettext (msgid)
 #endif
 
@@ -38,11 +38,7 @@
 # define _GL_ATTRIBUTE_FORMAT_PRINTF(a, b)
 # define _GL_ARG_NONNULL(a)
 #else
-# include "getprogname.h"
-#endif
-
-#if USE_UNLOCKED_IO
-# include "unlocked-io.h"
+#include "third_party/make/getprogname.h"
 #endif
 
 #ifndef _

third_party/make/getopt.c

@@ -31,7 +31,7 @@ this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 
 #ifdef HAVE_CONFIG_H
-# include "third_party/make/config.h"
+#include "third_party/make/config.h"
 #endif
 #pragma GCC diagnostic ignored "-Wredundant-decls"
 

third_party/make/make.mk

@@ -13,6 +13,42 @@ THIRD_PARTY_MAKE_BINS =					\
 THIRD_PARTY_MAKE_A =					\
 	o/$(MODE)/third_party/make/make.a
 
+THIRD_PARTY_MAKE_HDRS =					\
+	third_party/make/filename.h			\
+	third_party/make/dirname.h			\
+	third_party/make/stddef.h			\
+	third_party/make/error.h			\
+	third_party/make/gnumake.h			\
+	third_party/make/gettext.h			\
+	third_party/make/stdlib.h			\
+	third_party/make/xalloc.h			\
+	third_party/make/xalloc-oversized.h		\
+	third_party/make/os.h				\
+	third_party/make/stdint.h			\
+	third_party/make/fd-hook.h			\
+	third_party/make/job.h				\
+	third_party/make/unistd.h			\
+	third_party/make/getprogname.h			\
+	third_party/make/dosname.h			\
+	third_party/make/config.h			\
+	third_party/make/concat-filename.h		\
+	third_party/make/findprog.h			\
+	third_party/make/intprops.h			\
+	third_party/make/exitfail.h			\
+	third_party/make/alloca.h			\
+	third_party/make/hash.h				\
+	third_party/make/rule.h				\
+	third_party/make/filedef.h			\
+	third_party/make/fcntl.h			\
+	third_party/make/stdio.h			\
+	third_party/make/variable.h			\
+	third_party/make/debug.h			\
+	third_party/make/output.h			\
+	third_party/make/getopt.h			\
+	third_party/make/dep.h				\
+	third_party/make/commands.h
+
+
 THIRD_PARTY_MAKE_INCS =					\
 	third_party/make/makeint.inc
 

third_party/mbedtls/test/lib.c

@@ -90,6 +90,7 @@ int mbedtls_test_platform_setup(void) {
   int ret = 0;
   static char mybuf[2][BUFSIZ];
   ShowCrashReports();
+  makedirs("o/tmp", 0755);
   setvbuf(stdout, mybuf[0], _IOLBF, BUFSIZ);
   setvbuf(stderr, mybuf[1], _IOLBF, BUFSIZ);
 #if defined(MBEDTLS_PLATFORM_C)

third_party/mbedtls/test/test_suite_ctr_drbg.c

@@ -15,6 +15,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+#include "libc/intrin/kprintf.h"
 #include "third_party/mbedtls/test/test.inc"
 /*
  * *** THIS FILE WAS MACHINE GENERATED ***

third_party/mbedtls/test/test_suite_ctr_drbg.datax

@@ -1088,10 +1088,10 @@ depends_on:0
 5:int:256
 
 CTR_DRBG write/update seed file [#1]
-7:char*:"/tmp/test_suite_ctr_drbg_seed":int:0
+7:char*:"o/tmp/test_suite_ctr_drbg_seed":int:0
 
 CTR_DRBG write/update seed file [#2]
-7:char*:"/tmp/test_suite_ctr_dbg_no_such_dir/file":exp:1
+7:char*:"o/tmp/test_suite_ctr_dbg_no_such_dir/file":exp:1
 
 CTR_DRBG Special Behaviours
 0

third_party/mbedtls/test/test_suite_entropy.datax

@@ -8,10 +8,10 @@ Create NV seed_file
 8
 
 Entropy write/update seed file: good
-1:char*:"/tmp/mbedtls_test_suite_entropy_seed":int:0
+1:char*:"o/tmp/mbedtls_test_suite_entropy_seed":int:0
 
 Entropy write/update seed file: nonexistent
-1:char*:"/tmp/no_such_dir/file":exp:0
+1:char*:"o/tmp/no_such_dir/file":exp:0
 
 Entropy no sources
 2

third_party/mbedtls/test/test_suite_hmac_drbg.misc.datax

@@ -20,7 +20,7 @@ depends_on:2
 
 HMAC_DRBG write/update seed file SHA-1 [#1]
 depends_on:0
-1:exp:0:char*:"/tmp/test_suite_hmac_drbg_seed":int:0
+1:exp:0:char*:"o/tmp/test_suite_hmac_drbg_seed":int:0
 
 HMAC_DRBG write/update seed file SHA-1 [#2]
 depends_on:0
@@ -28,7 +28,7 @@ depends_on:0
 
 HMAC_DRBG write/update seed file SHA-224 [#1]
 depends_on:1
-1:exp:1:char*:"/tmp/test_suite_hmac_drbg_seed":int:0
+1:exp:1:char*:"o/tmp/test_suite_hmac_drbg_seed":int:0
 
 HMAC_DRBG write/update seed file SHA-224 [#2]
 depends_on:1
@@ -36,7 +36,7 @@ depends_on:1
 
 HMAC_DRBG write/update seed file SHA-256 [#1]
 depends_on:1
-1:exp:2:char*:"/tmp/test_suite_hmac_drbg_seed":int:0
+1:exp:2:char*:"o/tmp/test_suite_hmac_drbg_seed":int:0
 
 HMAC_DRBG write/update seed file SHA-256 [#2]
 depends_on:1
@@ -44,7 +44,7 @@ depends_on:1
 
 HMAC_DRBG write/update seed file SHA-384 [#1]
 depends_on:2:3
-1:exp:3:char*:"/tmp/test_suite_hmac_drbg_seed":int:0
+1:exp:3:char*:"o/tmp/test_suite_hmac_drbg_seed":int:0
 
 HMAC_DRBG write/update seed file SHA-384 [#2]
 depends_on:2:3
@@ -52,11 +52,11 @@ depends_on:2:3
 
 HMAC_DRBG write/update seed file SHA-512 [#1]
 depends_on:2
-1:exp:4:char*:"/tmp/test_suite_hmac_drbg_seed":int:0
+1:exp:4:char*:"o/tmp/test_suite_hmac_drbg_seed":int:0
 
 HMAC_DRBG write/update seed file SHA-512 [#2]
 depends_on:2
-1:exp:4:char*:"/tmp/test_suite_hmac_drbg_no_such_dir/file":exp:5
+1:exp:4:char*:"o/tmp/test_suite_hmac_drbg_no_such_dir/file":exp:5
 
 HMAC_DRBG from buffer SHA-1
 depends_on:0

third_party/mbedtls/test/test_suite_mpi.datax

@@ -95,7 +95,7 @@ Test mbedtls_mpi_read_file #3 (Input too big)
 8:int:10:char*:"/zip/third_party/mbedtls/test/data/mpi_too_big":hex:"":exp:2
 
 Base test mbedtls_mpi_write_file #1
-9:int:10:char*:"56125680981752282334141896320372489490613963693556392520816017892111350604111697682705498319512049040516698827829292076808006940873974979584527073481012636016353913462376755556720019831187364993587901952757307830896531678727717924":int:16:char*:"/tmp/test_suite_mpi_write"
+9:int:10:char*:"56125680981752282334141896320372489490613963693556392520816017892111350604111697682705498319512049040516698827829292076808006940873974979584527073481012636016353913462376755556720019831187364993587901952757307830896531678727717924":int:16:char*:"o/tmp/test_suite_mpi_write"
 
 Base test mbedtls_mpi_lsb #1
 12:int:10:char*:"56125680981752282334141896320372489490613963693556392520816017892111350604111697682705498319512049040516698827829292076808006940873974979584527073481012636016353913462376755556720019831187364993587901952757307830896531678727717924":int:2

third_party/python/Lib/test/support/__init__.py

@@ -1049,7 +1049,7 @@ def temp_cwd(name='tempcwd', quiet=False):
     only a warning is raised and the original CWD is used.
 
     """
-    with temp_dir(path=name, quiet=quiet) as temp_path:
+    with temp_dir(quiet=quiet) as temp_path:
         with change_cwd(temp_path, quiet=quiet) as cwd_dir:
             yield cwd_dir
 

third_party/python/Lib/test/test_tarfile.py

@@ -2607,8 +2607,9 @@ class NumericOwnerTest(unittest.TestCase):
     #  because the uname and gname in the test file are 'root', and extract()
     #  will look them up using pwd and grp to find their uid and gid, which we
     #  test here to be 0.
-    @unittest.skipUnless(root_is_uid_gid_0(),
-                         'uid=0,gid=0 must be named "root"')
+    # [jart] tests shouldn't read /etc/passwd lool
+    # @unittest.skipUnless(root_is_uid_gid_0(),
+    #                      'uid=0,gid=0 must be named "root"')
     @unittest.mock.patch('os.chown')
     @unittest.mock.patch('os.chmod')
     @unittest.mock.patch('os.geteuid')

third_party/python/Modules/_elementtree.c

@@ -17,12 +17,14 @@
 #include "third_party/python/Include/object.h"
 #include "third_party/python/Include/objimpl.h"
 #include "third_party/python/Include/pycapsule.h"
+#include "third_party/python/Include/pyexpat.h"
 #include "third_party/python/Include/pyhash.h"
 #include "third_party/python/Include/pystate.h"
 #include "third_party/python/Include/sliceobject.h"
 #include "third_party/python/Include/structmember.h"
 #include "third_party/python/Include/warnings.h"
 #include "third_party/python/Include/yoink.h"
+#include "third_party/python/Modules/expat/expat.h"
 /* clang-format off */
 
 PYTHON_PROVIDE("_elementtree");
@@ -2772,9 +2774,6 @@ _elementtree_TreeBuilder_start_impl(TreeBuilderObject *self, PyObject *tag,
 /* ==================================================================== */
 /* the expat interface */
 
-#include "third_party/python/Modules/expat/expat.h"
-#include "third_party/python/Include/pyexpat.h"
-
 /* The PyExpat_CAPI structure is an immutable dispatch table, so it can be
  * cached globally without being in per-module state.
  */

third_party/python/Objects/typeobject.c

@@ -33,6 +33,11 @@
 #include "third_party/python/Include/weakrefobject.h"
 /* clang-format off */
 
+static const short slotoffsets[] = {
+    -1, /* invalid slot */
+#include "third_party/python/Objects/typeslots.inc"
+};
+
 /* Type object implementation */
 
 /* Support type attribute cache */
@@ -2791,11 +2796,6 @@ error:
     return NULL;
 }
 
-static const short slotoffsets[] = {
-    -1, /* invalid slot */
-#include "typeslots.inc"
-};
-
 PyObject *
 PyType_FromSpecWithBases(PyType_Spec *spec, PyObject *bases)
 {

third_party/python/python.mk

@@ -4194,6 +4194,39 @@ $(THIRD_PARTY_PYTHON_PYTEST_A_DATA_OBJS): ZIPOBJ_FLAGS += -P.python -C3
 o/$(MODE)/third_party/python/Python/ceval.o: QUOTA = -C64 -M1024m -L300
 o/$(MODE)/third_party/python/Objects/unicodeobject.o: QUOTA += -C64 -M1024m -L300
 
+o/$(MODE)/third_party/python/Objects/unicodeobject.o:			\
+		third_party/python/Objects/unicodeobject.c		\
+		third_party/python/Objects/stringlib/localeutil.inc	\
+		third_party/python/Objects/stringlib/unicode_format.inc	\
+		third_party/python/Objects/stringlib/asciilib.inc	\
+		third_party/python/Objects/stringlib/codecs.inc		\
+		third_party/python/Objects/stringlib/undef.inc		\
+		third_party/python/Objects/stringlib/ucs1lib.inc	\
+		third_party/python/Objects/stringlib/codecs.inc		\
+		third_party/python/Objects/stringlib/undef.inc		\
+		third_party/python/Objects/stringlib/ucs2lib.inc	\
+		third_party/python/Objects/stringlib/codecs.inc		\
+		third_party/python/Objects/stringlib/undef.inc		\
+		third_party/python/Objects/stringlib/ucs4lib.inc	\
+		third_party/python/Objects/stringlib/codecs.inc		\
+		third_party/python/Objects/stringlib/undef.inc
+
+o/$(MODE)/third_party/python/Modules/_elementtree.o:			\
+		third_party/python/Modules/_elementtree.c		\
+		third_party/python/Modules/clinic/_elementtree.inc
+
+o/$(MODE)/third_party/python/Modules/_io/bufferedio.o:			\
+		third_party/python/Modules/_io/bufferedio.c		\
+		third_party/python/Modules/_io/clinic/bufferedio.inc
+
+o/$(MODE)/third_party/python/Modules/_io/textio.o:			\
+		third_party/python/Modules/_io/textio.c			\
+		third_party/python/Modules/_io/clinic/textio.inc
+
+o/$(MODE)/third_party/python/Modules/_sre.o:				\
+		third_party/python/Modules/_sre.c			\
+		third_party/python/Modules/clinic/_sre.inc
+
 o/$(MODE)/third_party/python/Parser/asdl_c.o: PYFLAGS += -m
 $(THIRD_PARTY_PYTHON_PYTEST_PYMAINS_OBJS): PYFLAGS += -t -P.python -C3
 $(THIRD_PARTY_PYTHON_PYTEST_TODOS:%.py=o/$(MODE)/%.o): PYFLAGS += -t -P.python -C3
@@ -4348,7 +4381,6 @@ o/$(MODE)/third_party/python/chibicc.inc:				\
 		libc/nexgen32e/kcpuids.h				\
 		libc/runtime/runtime.h					\
 		libc/runtime/symbolic.h					\
-		libc/runtime/valist.h					\
 		libc/stdio/stdio.h					\
 		libc/str/str.h						\
 		libc/unicode/unicode.h					\

third_party/sqlite3/alter.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/alter.c"

third_party/sqlite3/analyze.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/analyze.c"

third_party/sqlite3/appendvfs.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/appendvfs.c"

third_party/sqlite3/attach.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/attach.c"

third_party/sqlite3/auth.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/auth.c"

third_party/sqlite3/backup.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/backup.c"

third_party/sqlite3/bitvec.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/bitvec.c"

third_party/sqlite3/btmutex.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/btmutex.c"

third_party/sqlite3/btree.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/btree.c"

third_party/sqlite3/build.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/build.c"

third_party/sqlite3/callback.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/callback.c"

third_party/sqlite3/complete.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/complete.c"

third_party/sqlite3/completion.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/completion.c"

third_party/sqlite3/ctime.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/ctime.c"

third_party/sqlite3/date.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/date.c"

third_party/sqlite3/dbdata.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/dbdata.c"

third_party/sqlite3/dbpage.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/dbpage.c"

third_party/sqlite3/dbstat.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/dbstat.c"

third_party/sqlite3/decimal.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/decimal.c"

third_party/sqlite3/delete.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/delete.c"

third_party/sqlite3/dog.py

@@ -0,0 +1,120 @@
+sauce = '''
+alter
+analyze
+appendvfs
+attach
+auth
+backup
+bitvec
+btmutex
+btree
+build
+callback
+complete
+completion
+ctime
+date
+dbdata
+dbpage
+dbstat
+decimal
+delete
+expr
+fault
+fileio
+fkey
+fts3
+fts3_aux
+fts3_expr
+fts3_hash
+fts3_icu
+fts3_porter
+fts3_snippet
+fts3_tokenize_vtab
+fts3_tokenizer
+fts3_tokenizer1
+fts3_unicode
+fts3_unicode2
+fts3_write
+fts5
+func
+global
+hash
+icu
+ieee754
+insert
+json1
+legacy
+loadext
+main
+malloc
+mem0
+mem1
+mem2
+mem3
+mem5
+memdb
+memjournal
+memtrace
+mutex
+mutex_noop
+mutex_unix
+notify
+opcodes
+os
+os_unix
+os_win
+pager
+parse
+pcache
+pcache1
+pragma
+prepare
+printf
+random
+resolve
+rowset
+rtree
+select
+series
+shathree
+shell
+sqlar
+sqlite3expert
+sqlite3rbu
+sqlite3session
+status
+stmt
+table
+threads
+tokenize
+treeview
+trigger
+uint
+update
+upsert
+userauth
+utf
+util
+vacuum
+vdbe
+vdbeapi
+vdbeaux
+vdbeblob
+vdbemem
+vdbesort
+vdbetrace
+vdbevtab
+vtab
+wal
+walker
+where
+wherecode
+whereexpr
+window
+zipfile
+'''.split()
+
+for s in sauce:
+  with open('third_party/sqlite3/%s.shell.c' % (s), 'w') as f:
+    f.write('#include "third_party/sqlite3/%s.c"\n' % (s))

third_party/sqlite3/expr.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/expr.c"

third_party/sqlite3/fault.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/fault.c"

third_party/sqlite3/fileio.c

@@ -1,3 +1,18 @@
+#include "libc/assert.h"
+#include "libc/calls/calls.h"
+#include "libc/calls/struct/dirent.h"
+#include "libc/calls/struct/stat.h"
+#include "libc/calls/struct/stat.macros.h"
+#include "libc/calls/weirdtypes.h"
+#include "libc/errno.h"
+#include "libc/stdio/stdio.h"
+#include "libc/str/str.h"
+#include "libc/sysv/consts/at.h"
+#include "libc/sysv/consts/s.h"
+#include "libc/time/time.h"
+#include "third_party/sqlite3/sqlite3ext.h"
+// clang-format off
+
 /*
 ** 2014-06-13
 **
@@ -73,21 +88,6 @@
 **   And the paths returned in the "name" column of the table are also
 **   relative to directory $dir.
 */
-#include "libc/assert.h"
-#include "libc/calls/calls.h"
-#include "libc/calls/struct/dirent.h"
-#include "libc/calls/struct/stat.h"
-#include "libc/calls/struct/stat.macros.h"
-#include "libc/calls/weirdtypes.h"
-#include "libc/errno.h"
-#include "libc/isystem/unistd.h"
-#include "libc/stdio/stdio.h"
-#include "libc/str/str.h"
-#include "libc/sysv/consts/at.h"
-#include "libc/sysv/consts/s.h"
-#include "libc/time/time.h"
-#include "third_party/sqlite3/sqlite3ext.h"
-// clang-format off
 
 SQLITE_EXTENSION_INIT1
 

third_party/sqlite3/fileio.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/fileio.c"

third_party/sqlite3/fkey.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/fkey.c"

third_party/sqlite3/fts3.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/fts3.c"

third_party/sqlite3/fts3_aux.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/fts3_aux.c"

third_party/sqlite3/fts3_expr.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/fts3_expr.c"

third_party/sqlite3/fts3_hash.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/fts3_hash.c"

third_party/sqlite3/fts3_icu.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/fts3_icu.c"

third_party/sqlite3/fts3_porter.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/fts3_porter.c"

third_party/sqlite3/fts3_snippet.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/fts3_snippet.c"

third_party/sqlite3/fts3_tokenize_vtab.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/fts3_tokenize_vtab.c"

third_party/sqlite3/fts3_tokenizer.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/fts3_tokenizer.c"

third_party/sqlite3/fts3_tokenizer1.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/fts3_tokenizer1.c"

third_party/sqlite3/fts3_unicode.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/fts3_unicode.c"

third_party/sqlite3/fts3_unicode2.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/fts3_unicode2.c"

third_party/sqlite3/fts3_write.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/fts3_write.c"

third_party/sqlite3/fts5.c

@@ -1,3 +1,10 @@
+#include "libc/assert.h"
+#include "libc/assert.h"
+#include "libc/math.h"
+#include "libc/stdio/stdio.h"
+#include "libc/str/str.h"
+#include "third_party/sqlite3/sqlite3.h"
+#include "third_party/sqlite3/sqlite3ext.h"
 
 /* clang-format off */
 
@@ -34,8 +41,6 @@
 #ifndef _FTS5_H
 #define _FTS5_H
 
-#include "third_party/sqlite3/sqlite3.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -604,12 +609,8 @@ struct fts5_api {
 #ifndef _FTS5INT_H
 #define _FTS5INT_H
 
-/* #include "third_party/sqlite3/fts5.h" */
-#include "third_party/sqlite3/sqlite3ext.h"
 SQLITE_EXTENSION_INIT1
 
-#include "libc/assert.h"
-#include "libc/str/str.h"
 
 #ifndef SQLITE_AMALGAMATION
 
@@ -1478,9 +1479,6 @@ static void sqlite3Fts5UnicodeAscii(u8*, u8*);
 /************ Begin %include sections from the grammar ************************/
 #line 47 "fts5parse.y"
 
-/* #include "third_party/sqlite3/fts5Int.h" */
-/* #include "third_party/sqlite3/fts5parse.h" */
-
 /*
 ** Disable all error recovery processing in the parser push-down
 ** automaton.
@@ -1807,8 +1805,6 @@ struct fts5yyParser {
 typedef struct fts5yyParser fts5yyParser;
 
 #ifndef NDEBUG
-#include "libc/assert.h"
-#include "libc/stdio/stdio.h"
 static FILE *fts5yyTraceFILE = 0;
 static char *fts5yyTracePrompt = 0;
 #endif /* NDEBUG */
@@ -3013,9 +3009,6 @@ static int sqlite3Fts5ParserFallback(int iToken){
 ******************************************************************************
 */
 
-/* #include "third_party/sqlite3/fts5Int.h" */
-#include "libc/math.h" /* amalgamator: keep */
-
 /*
 ** Object used to iterate through all "coalesced phrase instances" in
 ** a single column of the current row. If the phrase instances in the

third_party/sqlite3/fts5.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/fts5.c"

third_party/sqlite3/func.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/func.c"

third_party/sqlite3/global.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/global.c"

third_party/sqlite3/hash.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/hash.c"

third_party/sqlite3/icu.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/icu.c"

third_party/sqlite3/ieee754.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/ieee754.c"

third_party/sqlite3/insert.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/insert.c"

third_party/sqlite3/json1.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/json1.c"

third_party/sqlite3/legacy.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/legacy.c"

third_party/sqlite3/loadext.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/loadext.c"

third_party/sqlite3/main.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/main.c"

third_party/sqlite3/malloc.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/malloc.c"

third_party/sqlite3/mem0.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/mem0.c"

third_party/sqlite3/mem1.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/mem1.c"

third_party/sqlite3/mem2.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/mem2.c"

third_party/sqlite3/mem3.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/mem3.c"

third_party/sqlite3/mem5.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/mem5.c"

third_party/sqlite3/memdb.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/memdb.c"

third_party/sqlite3/memjournal.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/memjournal.c"

third_party/sqlite3/memtrace.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/memtrace.c"

third_party/sqlite3/mutex.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/mutex.c"

third_party/sqlite3/mutex_noop.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/mutex_noop.c"

third_party/sqlite3/mutex_unix.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/mutex_unix.c"

third_party/sqlite3/notify.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/notify.c"

third_party/sqlite3/opcodes.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/opcodes.c"

third_party/sqlite3/os.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/os.c"

third_party/sqlite3/os_unix.c

@@ -96,7 +96,6 @@
 #include "libc/calls/struct/flock.h"
 #include "libc/calls/weirdtypes.h"
 #include "libc/errno.h"
-#include "libc/isystem/unistd.h"
 #include "libc/runtime/sysconf.h"
 #include "libc/sysv/consts/f.h"
 #include "libc/sysv/consts/map.h"

third_party/sqlite3/os_unix.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/os_unix.c"

third_party/sqlite3/os_win.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/os_win.c"

third_party/sqlite3/pager.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/pager.c"

third_party/sqlite3/parse.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/parse.c"

third_party/sqlite3/pcache.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/pcache.c"

third_party/sqlite3/pcache1.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/pcache1.c"

third_party/sqlite3/pragma.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/pragma.c"

third_party/sqlite3/prepare.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/prepare.c"

third_party/sqlite3/printf.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/printf.c"

third_party/sqlite3/random.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/random.c"

third_party/sqlite3/resolve.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/resolve.c"

third_party/sqlite3/rowset.shell.c

@@ -0,0 +1 @@
+#include "third_party/sqlite3/rowset.c"