control: Remove an unnecessary header in control_events.h

And replace it with a struct forward declaration.

Also, move all the headers in the file before the forward
declaration.

Cleanup after 31531.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/feature/control/control_events.h b/src/feature/control/control_events.h
index b0cf429fe3..3e9192fcc6 100644
--- a/src/feature/control/control_events.h
+++ b/src/feature/control/control_events.h
@@ -13,7 +13,9 @@
 #define TOR_CONTROL_EVENTS_H
 
 #include "core/or/ocirc_event.h"
-#include "lib/encoding/confline.h"
+#include "core/or/orconn_event.h"
+
+struct config_line_t;
 
 /** Used to indicate the type of a CIRC_MINOR event passed to the controller.
  * The various types are defined in control-spec.txt . */
@@ -22,8 +24,6 @@ typedef enum circuit_status_minor_event_t {
   CIRC_MINOR_EVENT_CANNIBALIZED,
 } circuit_status_minor_event_t;
 
-#include "core/or/orconn_event.h"
-
 /** Used to indicate the type of a stream event passed to the controller.
  * The various types are defined in control-spec.txt */
 typedef enum stream_status_event_t {
@@ -158,7 +158,7 @@ int control_event_server_error(const char *format, ...)
 
 int control_event_guard(const char *nickname, const char *digest,
                         const char *status);
-int control_event_conf_changed(const config_line_t *elements);
+int control_event_conf_changed(const struct config_line_t *elements);
 int control_event_buildtimeout_set(buildtimeout_set_event_t type,
                                    const char *args);
 int control_event_signal(uintptr_t signal);