diff --git a/src/agg_bookend.c b/src/agg_bookend.c
index 7ca285b48..ff618a665 100644
--- a/src/agg_bookend.c
+++ b/src/agg_bookend.c
@@ -5,16 +5,15 @@
  */
 #include <postgres.h>
 #include <fmgr.h>
+#include <access/htup_details.h>
 #include <catalog/namespace.h>
-#include <nodes/value.h>
-#include <utils/lsyscache.h>
-#include <utils/datum.h>
-#include <lib/stringinfo.h>
+#include <catalog/pg_type.h>
 #include <libpq/pqformat.h>
-#include "catalog/pg_type.h"
+#include <lib/stringinfo.h>
+#include <nodes/value.h>
+#include <utils/datum.h>
 #include <utils/lsyscache.h>
 #include <utils/syscache.h>
-#include <access/htup_details.h>
 
 #include "compat.h"
 
diff --git a/src/bgw/job.c b/src/bgw/job.c
index f5fe0399d..27afd0878 100644
--- a/src/bgw/job.c
+++ b/src/bgw/job.c
@@ -4,16 +4,15 @@
  * LICENSE-APACHE for a copy of the license.
  */
 #include <postgres.h>
-#include <utils/builtins.h>
-#include <postmaster/bgworker.h>
-#include <access/xact.h>
-#include <pgstat.h>
-#include <utils/memutils.h>
-#include <utils/timestamp.h>
 #include <miscadmin.h>
+#include <pgstat.h>
+#include <access/xact.h>
+#include <postmaster/bgworker.h>
 #include <storage/ipc.h>
 #include <tcop/tcopprot.h>
 #include <utils/builtins.h>
+#include <utils/memutils.h>
+#include <utils/timestamp.h>
 
 #include "job.h"
 #include "scanner.h"
diff --git a/src/cross_module_fn.h b/src/cross_module_fn.h
index 8c8427727..982872d61 100644
--- a/src/cross_module_fn.h
+++ b/src/cross_module_fn.h
@@ -6,17 +6,13 @@
 #ifndef TIMESCALEDB_CROSS_MODULE_FN_H
 #define TIMESCALEDB_CROSS_MODULE_FN_H
 
-#include <postgres.h>
-#include <c.h>
 #include <postgres.h>
 #include <fmgr.h>
 #include <commands/event_trigger.h>
-
+#include <optimizer/planner.h>
 #include <utils/timestamp.h>
 #include <utils/jsonb.h>
 
-#include <optimizer/planner.h>
-
 #include "export.h"
 #include "bgw/job.h"
 #include "process_utility.h"
diff --git a/test/src/bgw/params.c b/test/src/bgw/params.c
index a16ca8d08..1ae918154 100644
--- a/test/src/bgw/params.c
+++ b/test/src/bgw/params.c
@@ -4,16 +4,15 @@
  * LICENSE-APACHE for a copy of the license.
  */
 #include <postgres.h>
-#include <access/xact.h>
-#include <catalog/namespace.h>
-#include <utils/builtins.h>
-#include <utils/lsyscache.h>
 #include <access/relscan.h>
 #include <access/xact.h>
-#include <storage/lmgr.h>
+#include <catalog/namespace.h>
 #include <storage/bufmgr.h>
 #include <storage/dsm.h>
+#include <storage/lmgr.h>
 #include <storage/spin.h>
+#include <utils/builtins.h>
+#include <utils/lsyscache.h>
 #include <utils/rel.h>
 #include <utils/tqual.h>
 
diff --git a/test/src/bgw/timer_mock.c b/test/src/bgw/timer_mock.c
index e4ed39b02..77161a461 100644
--- a/test/src/bgw/timer_mock.c
+++ b/test/src/bgw/timer_mock.c
@@ -4,14 +4,13 @@
  * LICENSE-APACHE for a copy of the license.
  */
 #include <postgres.h>
-#include <access/xact.h>
-#include <catalog/namespace.h>
-#include <utils/builtins.h>
-#include <utils/lsyscache.h>
 #include <access/relscan.h>
 #include <access/xact.h>
-#include <storage/lmgr.h>
+#include <catalog/namespace.h>
 #include <storage/bufmgr.h>
+#include <storage/lmgr.h>
+#include <utils/builtins.h>
+#include <utils/lsyscache.h>
 #include <utils/rel.h>
 #include <utils/tqual.h>