From d5744ae0c2bdca4840e7e6b34834a188a08062ba Mon Sep 17 00:00:00 2001
From: Andreas Karlsson <andreas.karlsson@percona.com>
Date: Tue, 10 Jun 2025 14:48:21 +0200
Subject: [PATCH] Remove unused system header includes

None of these headers were necessary to include, some because they are
already included by postgres.h and others because we have removed the
functions which we used to use from them.
---
 contrib/pg_tde/src/access/pg_tde_tdemap.c  | 1 -
 contrib/pg_tde/src/catalog/tde_keyring.c   | 2 --
 contrib/pg_tde/src/encryption/enc_aes.c    | 8 --------
 contrib/pg_tde/src/keyring/keyring_api.c   | 1 -
 contrib/pg_tde/src/keyring/keyring_file.c  | 3 ---
 contrib/pg_tde/src/keyring/keyring_vault.c | 1 -
 6 files changed, 16 deletions(-)

diff --git a/contrib/pg_tde/src/access/pg_tde_tdemap.c b/contrib/pg_tde/src/access/pg_tde_tdemap.c
index 3ab258ea05ec3..841c58f360d74 100644
--- a/contrib/pg_tde/src/access/pg_tde_tdemap.c
+++ b/contrib/pg_tde/src/access/pg_tde_tdemap.c
@@ -2,7 +2,6 @@
 
 #include <openssl/err.h>
 #include <openssl/rand.h>
-#include <unistd.h>
 
 #include "access/xlog.h"
 #include "access/xlog_internal.h"
diff --git a/contrib/pg_tde/src/catalog/tde_keyring.c b/contrib/pg_tde/src/catalog/tde_keyring.c
index c5aee34e377bd..32910fc4c9a54 100644
--- a/contrib/pg_tde/src/catalog/tde_keyring.c
+++ b/contrib/pg_tde/src/catalog/tde_keyring.c
@@ -12,8 +12,6 @@
 
 #include "postgres.h"
 
-#include <unistd.h>
-
 #include "access/skey.h"
 #include "access/xlog.h"
 #include "access/xloginsert.h"
diff --git a/contrib/pg_tde/src/encryption/enc_aes.c b/contrib/pg_tde/src/encryption/enc_aes.c
index 650645168463b..8c98a3750741a 100644
--- a/contrib/pg_tde/src/encryption/enc_aes.c
+++ b/contrib/pg_tde/src/encryption/enc_aes.c
@@ -1,15 +1,7 @@
 #include "postgres.h"
 
-#include <errno.h>
-#include <fcntl.h>
-#include <openssl/crypto.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
-#include <openssl/ssl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 #include "encryption/enc_aes.h"
 
diff --git a/contrib/pg_tde/src/keyring/keyring_api.c b/contrib/pg_tde/src/keyring/keyring_api.c
index 4af3c82130db7..7e69f4a15575c 100644
--- a/contrib/pg_tde/src/keyring/keyring_api.c
+++ b/contrib/pg_tde/src/keyring/keyring_api.c
@@ -1,6 +1,5 @@
 #include "postgres.h"
 
-#include <assert.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>
 
diff --git a/contrib/pg_tde/src/keyring/keyring_file.c b/contrib/pg_tde/src/keyring/keyring_file.c
index 391b6dae91d01..291fd38f2fb76 100644
--- a/contrib/pg_tde/src/keyring/keyring_file.c
+++ b/contrib/pg_tde/src/keyring/keyring_file.c
@@ -12,9 +12,6 @@
 
 #include "postgres.h"
 
-#include <stdio.h>
-#include <unistd.h>
-
 #include "common/file_perm.h"
 #include "storage/fd.h"
 #include "utils/wait_event.h"
diff --git a/contrib/pg_tde/src/keyring/keyring_vault.c b/contrib/pg_tde/src/keyring/keyring_vault.c
index 4d896e5ffb675..55357e8827396 100644
--- a/contrib/pg_tde/src/keyring/keyring_vault.c
+++ b/contrib/pg_tde/src/keyring/keyring_vault.c
@@ -12,7 +12,6 @@
 #include "postgres.h"
 
 #include <curl/curl.h>
-#include <stdio.h>
 
 #include "common/base64.h"
 #include "common/jsonapi.h"