From 38d2414567c97cdccef0a00b77882bb3861842bd Mon Sep 17 00:00:00 2001
From: James Tucker <james@tailscale.com>
Date: Fri, 24 May 2024 15:55:31 -0700
Subject: [PATCH] cgosqlite: cleanup the import layout some more

---
 cgosqlite/cgosqlite.go | 15 ++-------------
 cgosqlite/cgosqlite.h  |  4 ++++
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/cgosqlite/cgosqlite.go b/cgosqlite/cgosqlite.go
index 07ad05b..75fb9b7 100644
--- a/cgosqlite/cgosqlite.go
+++ b/cgosqlite/cgosqlite.go
@@ -34,21 +34,10 @@ package cgosqlite
 // // Select POSIX 2014 at least for clock_gettime.
 // #cgo CFLAGS: -D_XOPEN_SOURCE=600
 // #cgo CFLAGS: -D_DARWIN_C_SOURCE=1
-// #cgo linux CFLAGS: -std=c99
 //
-// // On Android, unlike Linux, there are no separate libpthread or librt
-// // libraries. That functionality is included directly in libc, which does not
-// // need to be explicitly linked against. See
-// // https://developer.android.com/ndk/guides/stable_apis#c_library.
-// #cgo android LDFLAGS: -ldl -lm
-// #cgo linux,!android LDFLAGS: -ldl -lm -lrt
+// // libm is required by the FTS5 extension, on Linux.
+// #cgo linux LDFLAGS: -lm
 //
-// #include <stdint.h>
-// #include <stdlib.h>
-// #include <string.h>
-// #include <pthread.h>
-// #include <sqlite3.h>
-// #include <time.h>
 // #include "cgosqlite.h"
 import "C"
 import (
diff --git a/cgosqlite/cgosqlite.h b/cgosqlite/cgosqlite.h
index 773abed..7e88483 100644
--- a/cgosqlite/cgosqlite.h
+++ b/cgosqlite/cgosqlite.h
@@ -1,4 +1,8 @@
+#include <math.h> // math.h is required on linux for FTS5.
+#include "sqlite3.h"
+#include <stdlib.h>
 #include <stdint.h>
+#include <string.h>
 #include <time.h>
 
 // uintptr versions of sqlite3 pointer types, to avoid allocations