diff --git a/src/ivfbuild.c b/src/ivfbuild.c
index c0fda3f..cc4f7a3 100644
--- a/src/ivfbuild.c
+++ b/src/ivfbuild.c
@@ -5,6 +5,8 @@
 #include "access/parallel.h"
 #include "access/xact.h"
 #include "catalog/index.h"
+#include "catalog/pg_operator_d.h"
+#include "catalog/pg_type_d.h"
 #include "ivfflat.h"
 #include "miscadmin.h"
 #include "storage/bufmgr.h"
@@ -26,9 +28,6 @@
 #define PROGRESS_CREATEIDX_TUPLES_DONE 0
 #endif
 
-#include "catalog/pg_operator_d.h"
-#include "catalog/pg_type_d.h"
-
 #if PG_VERSION_NUM >= 130000
 #define CALLBACK_ITEM_POINTER ItemPointer tid
 #else
diff --git a/src/ivfscan.c b/src/ivfscan.c
index b16ad68..a2108ef 100644
--- a/src/ivfscan.c
+++ b/src/ivfscan.c
@@ -3,14 +3,13 @@
 #include <float.h>
 
 #include "access/relscan.h"
+#include "catalog/pg_operator_d.h"
+#include "catalog/pg_type_d.h"
 #include "ivfflat.h"
 #include "miscadmin.h"
 #include "pgstat.h"
 #include "storage/bufmgr.h"
 
-#include "catalog/pg_operator_d.h"
-#include "catalog/pg_type_d.h"
-
 /*
  * Compare list distances
  */
diff --git a/src/vector.c b/src/vector.c
index ac574e5..bc4a61a 100644
--- a/src/vector.c
+++ b/src/vector.c
@@ -2,18 +2,17 @@
 
 #include <math.h>
 
-#include "ivfflat.h"
-#include "vector.h"
-
-#include "fmgr.h"
-#include "port.h"				/* for strtof() */
 #include "catalog/pg_type.h"
+#include "fmgr.h"
+#include "ivfflat.h"
 #include "lib/stringinfo.h"
 #include "libpq/pqformat.h"
+#include "port.h"				/* for strtof() */
 #include "utils/array.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
 #include "utils/numeric.h"
+#include "vector.h"
 
 #if PG_VERSION_NUM >= 120000
 #include "common/shortest_dec.h"