--- a/h3/src/binding/edge.c
+++ b/h3/src/binding/edge.c
@@ -15,7 +15,7 @@
  */
 
 #include <postgres.h>
-#include <h3api.h>
+#include <h3/h3api.h>
 
 #include <fmgr.h>				 // PG_FUNCTION_INFO_V1
 #include <funcapi.h>			 // SRF_IS_FIRSTCALL
--- a/h3/src/binding/hierarchy.c
+++ b/h3/src/binding/hierarchy.c
@@ -15,7 +15,7 @@
  */
 
 #include <postgres.h>
-#include <h3api.h>
+#include <h3/h3api.h>
 
 #include <fmgr.h>		 // PG_FUNCTION_INFO_V1
 #include <funcapi.h>	 // SRF_IS_FIRSTCALL
--- a/h3/src/binding/indexing.c
+++ b/h3/src/binding/indexing.c
@@ -21,7 +21,7 @@
 #include "varatt.h" //VAR_SIZE and friends moved to here from postgres.h
 #endif
 
-#include <h3api.h>
+#include <h3/h3api.h>
 
 #include <fmgr.h>			 // PG_FUNCTION_INFO_V1
 #include <utils/geo_decls.h> // PG_GETARG_POINT_P
--- a/h3/src/binding/inspection.c
+++ b/h3/src/binding/inspection.c
@@ -15,7 +15,7 @@
  */
 
 #include <postgres.h>
-#include <h3api.h>
+#include <h3/h3api.h>
 
 #include <fmgr.h>			 // PG_FUNCTION_ARGS
 #include <utils/array.h>	 // ArrayType
--- a/h3/src/binding/miscellaneous.c
+++ b/h3/src/binding/miscellaneous.c
@@ -15,7 +15,7 @@
  */
 
 #include <postgres.h>
-#include <h3api.h>
+#include <h3/h3api.h>
 
 #include <fmgr.h>			 // PG_FUNCTION_ARGS
 #include <funcapi.h>		 // SRF_IS_FIRSTCALL
--- a/h3/src/binding/regions.c
+++ b/h3/src/binding/regions.c
@@ -15,7 +15,7 @@
  */
 
 #include <postgres.h>
-#include <h3api.h>
+#include <h3/h3api.h>
 
 #include <fmgr.h>				 // PG_FUNCTION_ARGS
 #include <funcapi.h>			 // SRF_IS_FIRSTCALL
--- a/h3/src/binding/traversal.c
+++ b/h3/src/binding/traversal.c
@@ -15,7 +15,7 @@
  */
 
 #include <postgres.h>
-#include <h3api.h>
+#include <h3/h3api.h>
 
 #include <fmgr.h>			 // PG_FUNCTION_ARGS
 #include <funcapi.h>		 // SRF_IS_FIRSTCALL
--- a/h3/src/binding/vertex.c
+++ b/h3/src/binding/vertex.c
@@ -15,7 +15,7 @@
  */
 
 #include <postgres.h>
-#include <h3api.h>
+#include <h3/h3api.h>
 
 #include <fmgr.h>			 // PG_FUNCTION_ARGS
 #include <funcapi.h>		 // SRF_IS_FIRSTCALL
--- a/h3/src/extension.c
+++ b/h3/src/extension.c
@@ -15,7 +15,7 @@
  */
 
 #include <postgres.h>
-#include <h3api.h>
+#include <h3/h3api.h>
 
 #include <fmgr.h>			// PG_FUNCTION_INFO_V1
 #include <utils/builtins.h> // cstring_to_text
--- a/h3/src/opclass_btree.c
+++ b/h3/src/opclass_btree.c
@@ -15,7 +15,7 @@
  */
 
 #include <postgres.h>
-#include <h3api.h>
+#include <h3/h3api.h>
 
 #include <fmgr.h>			   // PG_FUNCTION_ARGS
 #include <utils/sortsupport.h> // SortSupport
--- a/h3/src/opclass_hash.c
+++ b/h3/src/opclass_hash.c
@@ -15,7 +15,7 @@
  */
 
 #include <postgres.h>
-#include <h3api.h>
+#include <h3/h3api.h>
 
 #include <fmgr.h>		 // PG_FUNCTION_ARGS
 #include <access/hash.h> // hash_any
--- a/h3/src/opclass_spgist.c
+++ b/h3/src/opclass_spgist.c
@@ -19,7 +19,7 @@
 #include <access/spgist.h>	   // SP-GiST
 #include "catalog/pg_type.h"
 
-#include <h3api.h> // Main H3 include
+#include <h3/h3api.h> // Main H3 include
 #include "type.h"
 #include "error.h"
 
--- a/h3/src/operators.c
+++ b/h3/src/operators.c
@@ -15,7 +15,7 @@
  */
 
 #include <postgres.h>
-#include <h3api.h>
+#include <h3/h3api.h>
 
 #include <fmgr.h> // PG_FUNCTION_ARGS
 
--- a/h3/src/srf.c
+++ b/h3/src/srf.c
@@ -15,7 +15,7 @@
  */
 
 #include <postgres.h>
-#include <h3api.h>
+#include <h3/h3api.h>
 
 #include <funcapi.h>			 // SRF_IS_FIRSTCALL
 #include <access/htup_details.h> // HeapTuple
--- a/h3/src/srf.h
+++ b/h3/src/srf.h
@@ -17,7 +17,7 @@
 #ifndef H3_SRF_H
 #define H3_SRF_H
 
-#include <h3api.h>
+#include <h3/h3api.h>
 
 typedef struct
 {
--- a/h3/src/type.c
+++ b/h3/src/type.c
@@ -15,7 +15,7 @@
  */
 
 #include <postgres.h>
-#include <h3api.h>
+#include <h3/h3api.h>
 
 #include <fmgr.h> // PG_FUNCTION_ARGS
 #include <libpq/pqformat.h> // needed for send/recv functions
--- a/h3/src/upstream_macros.h
+++ b/h3/src/upstream_macros.h
@@ -19,7 +19,7 @@
 #ifndef H3_UPSTREAM_MACROS_H
 #define H3_UPSTREAM_MACROS_H
 
-#include "h3api.h"
+#include "h3/h3api.h"
 
 /* SOURCE coordijk.h */
 
--- a/h3_postgis/src/wkb.h
+++ b/h3_postgis/src/wkb.h
@@ -18,7 +18,7 @@
 #define PGH3_WKB_H
 
 #include <postgres.h>
-#include <h3api.h>
+#include <h3/h3api.h>
 
 #include <fmgr.h>
 
--- a/h3_postgis/src/wkb_bbox3.h
+++ b/h3_postgis/src/wkb_bbox3.h
@@ -17,7 +17,7 @@
 #ifndef PGH3_WKB_BBOX3_H
 #define PGH3_WKB_BBOX3_H
 
-#include <h3api.h>
+#include <h3/h3api.h>
 
 #include "wkb_vect3.h"
 
--- a/h3_postgis/src/wkb_indexing.c
+++ b/h3_postgis/src/wkb_indexing.c
@@ -15,7 +15,7 @@
  */
 
 #include <postgres.h>
-#include <h3api.h>
+#include <h3/h3api.h>
 
 #include <fmgr.h>  // PG_FUNCTION_ARGS
 #include <math.h>
--- a/h3_postgis/src/wkb_linked_geo.h
+++ b/h3_postgis/src/wkb_linked_geo.h
@@ -17,7 +17,7 @@
 #ifndef PGH3_WKB_LINKED_GEO_H
 #define PGH3_WKB_LINKED_GEO_H
 
-#include <h3api.h>
+#include <h3/h3api.h>
 
 #define _FOREACH_LINKED_ITEM(first, item, Type)			\
 	for (Type *item = (first);								\
--- a/h3_postgis/src/wkb_regions.c
+++ b/h3_postgis/src/wkb_regions.c
@@ -15,7 +15,7 @@
  */
 
 #include <postgres.h>
-#include <h3api.h>
+#include <h3/h3api.h>
 
 #include <fmgr.h>		 // PG_FUNCTION_ARGS
 #include <utils/array.h> // using arrays
--- a/h3_postgis/src/wkb_split.h
+++ b/h3_postgis/src/wkb_split.h
@@ -17,7 +17,7 @@
 #ifndef PGH3_WKB_SPLIT_H
 #define PGH3_WKB_SPLIT_H
 
-#include <h3api.h>
+#include <h3/h3api.h>
 
 #include <stdbool.h>
 
--- a/h3_postgis/src/wkb_vect3.h
+++ b/h3_postgis/src/wkb_vect3.h
@@ -18,7 +18,7 @@
 #define PGH3_VECT3_H
 
 #include <postgres.h>
-#include <h3api.h>
+#include <h3/h3api.h>
 
 #include <fmgr.h>
 
--- a/include/type.h
+++ b/include/type.h
@@ -17,7 +17,7 @@
 #ifndef H3_TYPE_H
 #define H3_TYPE_H
 
-#include <h3api.h>
+#include <h3/h3api.h>
 
 /*
  * DatumGetH3Index
