From 09859dbc9fd8644dbc2f45b5e74f6a0e48e98d41 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 3 Jul 2026 10:01:32 +0900
Subject: [PATCH] tree-wide: drop unnecessary header inclusions

---
 .../cryptsetup-tokens/cryptsetup-token-systemd-fido2.c        | 1 -
 .../cryptsetup-tokens/cryptsetup-token-systemd-pkcs11.c       | 1 -
 .../cryptsetup-tokens/cryptsetup-token-systemd-tpm2.c         | 1 -
 src/cryptsetup/cryptsetup-tokens/luks2-fido2.c                | 2 --
 src/journal-remote/journal-gatewayd.c                         | 1 -
 src/journal-remote/journal-upload-journal.c                   | 2 --
 src/journal-remote/journal-upload.h                           | 3 +--
 src/shared/pkcs11-util.c                                      | 4 ----
 8 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-fido2.c b/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-fido2.c
index 0bfe0c2ec7..4cf6b7654c 100644
--- a/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-fido2.c
+++ b/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-fido2.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <libcryptsetup.h>
 #include <string.h>
 #include <syslog.h>
 
diff --git a/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-pkcs11.c b/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-pkcs11.c
index 63be8a7c64..6952bb7ca2 100644
--- a/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-pkcs11.c
+++ b/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-pkcs11.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <libcryptsetup.h>
 #include <syslog.h>
 
 #include "sd-json.h"
diff --git a/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-tpm2.c b/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-tpm2.c
index 552d81da17..450399ec12 100644
--- a/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-tpm2.c
+++ b/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-tpm2.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <libcryptsetup.h>
 #include <syslog.h>
 
 #include "alloc-util.h"
diff --git a/src/cryptsetup/cryptsetup-tokens/luks2-fido2.c b/src/cryptsetup/cryptsetup-tokens/luks2-fido2.c
index c6cfdcf6ef..eeb5ca0242 100644
--- a/src/cryptsetup/cryptsetup-tokens/luks2-fido2.c
+++ b/src/cryptsetup/cryptsetup-tokens/luks2-fido2.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <libcryptsetup.h>
-
 #include "alloc-util.h"
 #include "cryptsetup-token-util.h"
 #include "hexdecoct.h"
diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
index bb1f901d9c..2546550720 100644
--- a/src/journal-remote/journal-gatewayd.c
+++ b/src/journal-remote/journal-gatewayd.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <fcntl.h>
-#include <microhttpd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
diff --git a/src/journal-remote/journal-upload-journal.c b/src/journal-remote/journal-upload-journal.c
index 66cc4114f4..21974a67ed 100644
--- a/src/journal-remote/journal-upload-journal.c
+++ b/src/journal-remote/journal-upload-journal.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <curl/curl.h>
-
 #include "sd-daemon.h"
 #include "sd-event.h"
 #include "sd-journal.h"
diff --git a/src/journal-remote/journal-upload.h b/src/journal-remote/journal-upload.h
index 9ab0f535a4..3c857dc4b6 100644
--- a/src/journal-remote/journal-upload.h
+++ b/src/journal-remote/journal-upload.h
@@ -2,8 +2,7 @@
 
 #pragma once
 
-#include <curl/curl.h>
-
+#include "curl-util.h"
 #include "shared-forward.h"
 #include "journal-compression-util.h"
 
diff --git a/src/shared/pkcs11-util.c b/src/shared/pkcs11-util.c
index 60235fa3e0..6002c2e0af 100644
--- a/src/shared/pkcs11-util.c
+++ b/src/shared/pkcs11-util.c
@@ -1,9 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#if HAVE_OPENSSL
-#  include <openssl/core_names.h>
-#endif
-
 #include "sd-dlopen.h"
 
 #include "alloc-util.h"