Skip to content

Prevent directly including some internal subheader files #4000

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
clumens wants to merge 22 commits into
base: main
Choose a base branch
from
Open

Prevent directly including some internal subheader files #4000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d0d854e
Refactor: include: Don't allow including pcmki headers directly.
clumens Nov 26, 2025
e8a458e
Refactor: include: Don't directly include output_internal.h.
clumens Jan 5, 2026
59bf21d
Refactor: include: Rearrange includes in crm/common/internal.h
clumens Nov 26, 2025
42f5134
Refactor: include: Move function definitions into agents_internal.h.
clumens Nov 26, 2025
59e4e84
Refactor: include: Move function definitions into nvpair_internal.h.
clumens Nov 26, 2025
ea6fb07
Refactor: include: Add mainloop_internal.h.
clumens Nov 26, 2025
c6f2e93
Refactor: include: Add flags_internal.h.
clumens Nov 26, 2025
e540f55
Refactor: include: Add memory_internal.h.
clumens Nov 26, 2025
fa7c46a
Refactor: include: Add procfs_internal.h.
clumens Nov 26, 2025
ced91ba
Refactor: include: Move score-related variables out of internal.h.
clumens Nov 26, 2025
b8ee429
Refactor: include: Move list-related functions out of internal.h.
clumens Nov 26, 2025
b8d7956
Refactor: include: Add utils_internal.h.
clumens Nov 26, 2025
45ccd34
Refactor: include: Add pid_internal.h.
clumens Nov 26, 2025
193ab74
Refactor: include: Move failure-related functions out of internal.h.
clumens Nov 26, 2025
f9caed0
Refactor: include: Add cib_secrets_internal.h.
clumens Nov 26, 2025
c194865
Refactor: include: Move pcmk__is_daemon into logging_internal.h.
clumens Nov 26, 2025
ee1f39f
Refactor: include: crm/common/internal.h now includes all internal he…
clumens Nov 26, 2025
63f4d5a
Refactor: include: Simplify includes in crm_internal.h.
clumens Nov 26, 2025
8ce8c6d
Refactor: include: Don't allow including internal libcrmcommon...
clumens Nov 26, 2025
6222148
Refactor: libcrmcommon: Fix internal includes for unit tests.
clumens Nov 26, 2025
ce0c423
Test: test-headers.sh: Set internal include guards before testing hea…
clumens Nov 26, 2025
620d334
Refactor: include: Move PCMK__NELEMS to utils_internal.h.
clumens Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions daemons/attrd/attrd_alerts.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
#include <crm/cib/internal.h>
#include <crm/cluster/internal.h>
#include <crm/cluster/election_internal.h>
#include <crm/common/alerts_internal.h>
#include <crm/common/cib_internal.h>
#include <crm/common/xml.h>
#include <crm/lrmd_internal.h>
#include "pacemaker-attrd.h"
Expand Down
1 change: 0 additions & 1 deletion daemons/attrd/attrd_attributes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

#include <crm/common/logging.h>
#include <crm/common/results.h>
#include <crm/common/strings_internal.h>
#include <crm/common/xml.h>

#include "pacemaker-attrd.h"
Expand Down
1 change: 0 additions & 1 deletion daemons/attrd/attrd_cib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#include <crm/cib/internal.h> // cib__*
#include <crm/common/logging.h>
#include <crm/common/results.h>
#include <crm/common/strings_internal.h>
#include <crm/common/xml.h>
#include <crm/cluster/internal.h> // pcmk__get_node()

Expand Down
1 change: 0 additions & 1 deletion daemons/attrd/attrd_corosync.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <crm/cluster/internal.h>
#include <crm/common/logging.h>
#include <crm/common/results.h>
#include <crm/common/strings_internal.h>
#include <crm/common/xml.h>

#include "pacemaker-attrd.h"
Expand Down
3 changes: 0 additions & 3 deletions daemons/attrd/attrd_ipc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,8 @@

#include <crm/cluster.h>
#include <crm/cluster/internal.h>
#include <crm/common/acl_internal.h>
#include <crm/common/ipc_internal.h>
#include <crm/common/logging.h>
#include <crm/common/results.h>
#include <crm/common/strings_internal.h>
#include <crm/common/util.h>
#include <crm/common/xml.h>

Expand Down
1 change: 0 additions & 1 deletion daemons/attrd/attrd_messages.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

#include <glib.h>

#include <crm/common/messages_internal.h>
#include <crm/cluster/internal.h> // pcmk__get_node()
#include <crm/common/xml.h>

Expand Down
1 change: 0 additions & 1 deletion daemons/attrd/attrd_sync.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include <stdbool.h>

#include <crm/common/xml.h>
#include <crm/common/attrs_internal.h>

#include "pacemaker-attrd.h"

Expand Down
1 change: 0 additions & 1 deletion daemons/attrd/attrd_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#include <sys/types.h>

#include <crm/crm.h>
#include <crm/common/ipc_internal.h>
#include <crm/common/mainloop.h>
#include <crm/common/xml.h>

Expand Down
4 changes: 0 additions & 4 deletions daemons/attrd/pacemaker-attrd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,11 @@
#include <fcntl.h>

#include <crm/crm.h>
#include <crm/common/cmdline_internal.h>
#include <crm/common/iso8601.h>
#include <crm/common/ipc.h>
#include <crm/common/ipc_internal.h>
#include <crm/common/output_internal.h>
#include <crm/common/xml.h>
#include <crm/cluster/internal.h>

#include <crm/common/attrs_internal.h>
#include "pacemaker-attrd.h"

#define SUMMARY "daemon for managing Pacemaker node attributes"
Expand Down
2 changes: 1 addition & 1 deletion daemons/attrd/pacemaker-attrd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <crm/crm.h>
#include <crm/cluster.h>
#include <crm/cluster/election_internal.h>
#include <crm/common/messages_internal.h>
#include <crm/common/internal.h>
#include <crm/cib/cib_types.h>

/*
Expand Down
1 change: 0 additions & 1 deletion daemons/based/based_callbacks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
#include <crm/cluster/internal.h>

#include <crm/common/xml.h>
#include <crm/common/remote_internal.h>

#include <pacemaker-based.h>

Expand Down
2 changes: 0 additions & 2 deletions daemons/based/based_messages.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
#include <crm/cib/internal.h>

#include <crm/common/xml.h>
#include <crm/common/ipc_internal.h>
#include <crm/common/xml_internal.h>
#include <crm/cluster/internal.h>

#include <pacemaker-based.h>
Expand Down
1 change: 0 additions & 1 deletion daemons/based/based_notify.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
#include <crm/cib/internal.h>

#include <crm/common/xml.h>
#include <crm/common/remote_internal.h>
#include <pacemaker-based.h>

struct cib_notification_s {
Expand Down
3 changes: 0 additions & 3 deletions daemons/based/based_remote.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@
#include <libxml/tree.h>

#include <crm/common/ipc.h>
#include <crm/common/ipc_internal.h>
#include <crm/common/xml.h>
#include <crm/common/remote_internal.h>
#include <crm/common/tls_internal.h>
#include <crm/cib/internal.h>

#include "pacemaker-based.h"
Expand Down
2 changes: 0 additions & 2 deletions daemons/based/pacemaker-based.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@
#include <crm/crm.h>
#include <crm/cib/internal.h>
#include <crm/cluster/internal.h>
#include <crm/common/cmdline_internal.h>
#include <crm/common/mainloop.h>
#include <crm/common/output_internal.h>
#include <crm/common/xml.h>

#include <pacemaker-based.h>
Expand Down
2 changes: 1 addition & 1 deletion daemons/based/pacemaker-based.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <crm/cib.h>
#include <crm/common/xml.h>
#include <crm/cluster.h>
#include <crm/common/ipc_internal.h>
#include <crm/common/internal.h>
#include <crm/common/mainloop.h>
#include <crm/cib/internal.h>

Expand Down
1 change: 0 additions & 1 deletion daemons/controld/controld_alerts.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include <glib.h>
#include <libxml/tree.h>

#include <crm/common/alerts_internal.h>
#include <crm/fencing/internal.h>
#include <crm/lrmd.h>
#include <crm/lrmd_internal.h>
Expand Down
2 changes: 0 additions & 2 deletions daemons/controld/controld_attrd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@
#include <stdbool.h>

#include <crm/crm.h>
#include <crm/common/attrs_internal.h>
#include <crm/common/ipc.h>
#include <crm/common/ipc_attrd_internal.h>
#include <crm/common/xml.h>

#include <pacemaker-controld.h>
Expand Down
1 change: 0 additions & 1 deletion daemons/controld/controld_cib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include <stdbool.h>
#include <unistd.h> /* sleep */

#include <crm/common/alerts_internal.h>
#include <crm/common/xml.h>
#include <crm/crm.h>
#include <crm/lrmd_internal.h>
Expand Down
1 change: 0 additions & 1 deletion daemons/controld/controld_control.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <crm/common/xml.h>
#include <crm/cluster/internal.h>
#include <crm/cluster/election_internal.h>
#include <crm/common/ipc_internal.h>

#include <pacemaker-controld.h>

Expand Down
2 changes: 1 addition & 1 deletion daemons/controld/controld_fsa.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# include <crm/common/mainloop.h>
# include <crm/cluster.h>
# include <crm/cluster/election_internal.h>
# include <crm/common/ipc_internal.h>
# include <crm/common/internal.h>

/*! States the controller can be in */
enum crmd_fsa_state {
Expand Down
1 change: 0 additions & 1 deletion daemons/controld/controld_membership.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

#include <crm/crm.h>
#include <crm/common/xml.h>
#include <crm/common/xml_internal.h>
#include <crm/cluster/internal.h>

#include <pacemaker-controld.h>
Expand Down
1 change: 0 additions & 1 deletion daemons/controld/controld_messages.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#include <crm/common/xml.h>
#include <crm/cluster/internal.h>
#include <crm/cib.h>
#include <crm/common/ipc_internal.h>

#include <pacemaker-controld.h>

Expand Down
2 changes: 1 addition & 1 deletion daemons/controld/controld_messages.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <stdbool.h>

# include <crm/crm.h>
# include <crm/common/ipc_internal.h>
# include <crm/common/internal.h>
# include <crm/common/xml.h>
# include <crm/cluster/internal.h>
# include <controld_fsa.h>
Expand Down
1 change: 0 additions & 1 deletion daemons/controld/controld_remote_ra.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

#include <crm/crm.h>
#include <crm/common/xml.h>
#include <crm/common/xml_internal.h>
#include <crm/lrmd.h>
#include <crm/lrmd_internal.h>
#include <crm/services.h>
Expand Down
1 change: 0 additions & 1 deletion daemons/controld/controld_schedulerd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include <crm/cluster.h>
#include <crm/common/xml.h>
#include <crm/crm.h>
#include <crm/common/xml_internal.h>
#include <crm/common/ipc.h>
#include <crm/common/ipc_schedulerd.h>

Expand Down
1 change: 0 additions & 1 deletion daemons/controld/controld_te_callbacks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

#include <crm/crm.h>
#include <crm/common/xml.h>
#include <crm/common/xml_internal.h>

#include <libxml/xpath.h> // xmlXPathObject, etc.

Expand Down
3 changes: 0 additions & 3 deletions daemons/controld/controld_te_events.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@

#include <pacemaker-controld.h>

#include <crm/common/attrs_internal.h>
#include <crm/common/ipc_attrd_internal.h>

/*!
* \internal
* \brief Action numbers of outside events processed in current update diff
Expand Down
2 changes: 0 additions & 2 deletions daemons/controld/pacemaker-controld.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
#include <fcntl.h>

#include <crm/crm.h>
#include <crm/common/cmdline_internal.h>
#include <crm/common/ipc.h>
#include <crm/common/output_internal.h>
#include <crm/common/xml.h>

#include <pacemaker-controld.h>
Expand Down
1 change: 0 additions & 1 deletion daemons/execd/cts-exec-helper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

#include <crm/crm.h>
#include <crm/services.h>
#include <crm/common/cmdline_internal.h>
#include <crm/common/mainloop.h>

#include <crm/pengine/status.h>
Expand Down
2 changes: 0 additions & 2 deletions daemons/execd/execd_alerts.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
#include <crm/services.h>
#include <crm/services_internal.h>
#include <crm/common/ipc.h>
#include <crm/common/ipc_internal.h>
#include <crm/common/alerts_internal.h>
#include <crm/common/xml.h>

#include "pacemaker-execd.h"
Expand Down
1 change: 0 additions & 1 deletion daemons/execd/execd_commands.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#include <crm/services_internal.h>
#include <crm/common/mainloop.h>
#include <crm/common/ipc.h>
#include <crm/common/ipc_internal.h>
#include <crm/common/xml.h>

#include "pacemaker-execd.h"
Expand Down
2 changes: 0 additions & 2 deletions daemons/execd/execd_messages.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@
#include <crm/crm.h> // CRM_SYSTEM_LRMD
#include <crm/common/internal.h> // pcmk__process_request, pcmk__xml_free
#include <crm/common/ipc.h> // crm_ipc_flags
#include <crm/common/ipc_internal.h> // pcmk__client_s, pcmk__find_client
#include <crm/common/results.h> // pcmk_rc_e, pcmk_rc_str
#include <crm/common/xml_internal.h> // PCMK__XA_LRMD_*, pcmk__xe_is

#include "pacemaker-execd.h" // client_disconnect_cleanup

Expand Down
4 changes: 0 additions & 4 deletions daemons/execd/pacemaker-execd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,8 @@
#include <crm/crm.h>
#include <crm/common/xml.h>
#include <crm/services.h>
#include <crm/common/cmdline_internal.h>
#include <crm/common/ipc.h>
#include <crm/common/ipc_internal.h>
#include <crm/common/mainloop.h>
#include <crm/common/output_internal.h>
#include <crm/common/remote_internal.h>
#include <crm/fencing/internal.h> // stonith__api_new()
#include <crm/lrmd_internal.h>

Expand Down
2 changes: 1 addition & 1 deletion daemons/execd/pacemaker-execd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# define PACEMAKER_EXECD__H

# include <glib.h>
# include <crm/common/ipc_internal.h>
# include <crm/common/internal.h>
# include <crm/lrmd.h>
# include <crm/stonith-ng.h>

Expand Down
1 change: 0 additions & 1 deletion daemons/execd/remoted_proxy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <crm/services.h>
#include <crm/common/mainloop.h>
#include <crm/common/ipc.h>
#include <crm/common/ipc_internal.h>
#include <crm/cib/internal.h>
#include <crm/fencing/internal.h>

Expand Down
2 changes: 0 additions & 2 deletions daemons/execd/remoted_tls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
#include <crm/crm.h>
#include <crm/common/mainloop.h>
#include <crm/common/xml.h>
#include <crm/common/remote_internal.h>
#include <crm/common/tls_internal.h>
#include <crm/lrmd_internal.h>

#include <netdb.h>
Expand Down
1 change: 0 additions & 1 deletion daemons/fenced/cts-fence-helper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include <crm/stonith-ng.h>
#include <crm/fencing/internal.h>
#include <crm/common/agents.h>
#include <crm/common/cmdline_internal.h>
#include <crm/common/xml.h>

#include <crm/common/mainloop.h>
Expand Down
1 change: 0 additions & 1 deletion daemons/fenced/fenced_commands.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@

#include <crm/crm.h>
#include <crm/common/ipc.h>
#include <crm/common/ipc_internal.h>
#include <crm/cluster/internal.h>
#include <crm/common/mainloop.h>

Expand Down
2 changes: 0 additions & 2 deletions daemons/fenced/fenced_history.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,11 @@

#include <crm/crm.h>
#include <crm/common/ipc.h>
#include <crm/common/ipc_internal.h>
#include <crm/cluster/internal.h>

#include <crm/stonith-ng.h>
#include <crm/fencing/internal.h>
#include <crm/common/xml.h>
#include <crm/common/xml_internal.h>

#include <pacemaker-fenced.h>

Expand Down
2 changes: 0 additions & 2 deletions daemons/fenced/fenced_remote.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,11 @@

#include <crm/crm.h>
#include <crm/common/ipc.h>
#include <crm/common/ipc_internal.h>
#include <crm/cluster/internal.h>

#include <crm/stonith-ng.h>
#include <crm/fencing/internal.h>
#include <crm/common/xml.h>
#include <crm/common/xml_internal.h>

#include <crm/common/util.h>
#include <pacemaker-fenced.h>
Expand Down
4 changes: 0 additions & 4 deletions daemons/fenced/pacemaker-fenced.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,11 @@
#include <inttypes.h> // PRIu32, PRIx32

#include <crm/crm.h>
#include <crm/common/cmdline_internal.h>
#include <crm/common/ipc.h>
#include <crm/common/ipc_internal.h>
#include <crm/common/output_internal.h>

#include <crm/stonith-ng.h>
#include <crm/fencing/internal.h>
#include <crm/common/xml.h>
#include <crm/common/xml_internal.h>

#include <crm/common/mainloop.h>

Expand Down
Loading