From 2b741ef06876b6bdb8d48ce23eeee118edcf0c3d Mon Sep 17 00:00:00 2001
From: Andrew Kane <andrew@ankane.org>
Date: Thu, 11 Dec 2025 00:35:18 -0800
Subject: [PATCH] Improved includes for types

---
 src/bitvec.c    | 1 +
 src/halfutils.c | 2 ++
 src/halfvec.c   | 8 ++++++--
 src/sparsevec.c | 7 ++++++-
 src/vector.c    | 4 ++--
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/bitvec.c b/src/bitvec.c
index 094ddd2..8bdff95 100644
--- a/src/bitvec.c
+++ b/src/bitvec.c
@@ -2,6 +2,7 @@
 
 #include "bitutils.h"
 #include "bitvec.h"
+#include "fmgr.h"
 #include "utils/varbit.h"
 #include "vector.h"
 
diff --git a/src/halfutils.c b/src/halfutils.c
index d169094..2df4995 100644
--- a/src/halfutils.c
+++ b/src/halfutils.c
@@ -1,5 +1,7 @@
 #include "postgres.h"
 
+#include <math.h>
+
 #include "halfutils.h"
 #include "halfvec.h"
 
diff --git a/src/halfvec.c b/src/halfvec.c
index 6b926e1..6854c3d 100644
--- a/src/halfvec.c
+++ b/src/halfvec.c
@@ -13,12 +13,16 @@
 #include "port.h"				/* for strtof() */
 #include "sparsevec.h"
 #include "utils/array.h"
-#include "utils/builtins.h"
 #include "utils/float.h"
+#include "utils/fmgrprotos.h"
 #include "utils/lsyscache.h"
-#include "utils/numeric.h"
+#include "utils/varbit.h"
 #include "vector.h"
 
+#if PG_VERSION_NUM >= 160000
+#include "varatt.h"
+#endif
+
 #define STATE_DIMS(x) (ARR_DIMS(x)[0] - 1)
 #define CreateStateDatums(dim) palloc(sizeof(Datum) * (dim + 1))
 
diff --git a/src/sparsevec.c b/src/sparsevec.c
index 1893752..ca1648f 100644
--- a/src/sparsevec.c
+++ b/src/sparsevec.c
@@ -5,18 +5,23 @@
 
 #include "catalog/pg_type.h"
 #include "common/shortest_dec.h"
-#include "common/string.h"
 #include "fmgr.h"
 #include "halfutils.h"
 #include "halfvec.h"
+#include "lib/stringinfo.h"
 #include "libpq/pqformat.h"
 #include "sparsevec.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
 #include "utils/float.h"
+#include "utils/fmgrprotos.h"
 #include "utils/lsyscache.h"
 #include "vector.h"
 
+#if PG_VERSION_NUM >= 160000
+#include "varatt.h"
+#endif
+
 typedef struct SparseInputElement
 {
 	int32		index;
diff --git a/src/vector.c b/src/vector.c
index 03f70d6..4736838 100644
--- a/src/vector.c
+++ b/src/vector.c
@@ -16,10 +16,10 @@
 #include "port.h"				/* for strtof() */
 #include "sparsevec.h"
 #include "utils/array.h"
-#include "utils/builtins.h"
 #include "utils/float.h"
+#include "utils/fmgrprotos.h"
 #include "utils/lsyscache.h"
-#include "utils/numeric.h"
+#include "utils/varbit.h"
 #include "vector.h"
 
 #if PG_VERSION_NUM >= 160000