Optimize imports

src/input/seat.cpp

@@ -5,8 +5,9 @@
 #include "server.hpp"
 #include "types.hpp"
 
-#include "wlr-wrap-start.hpp"
 #include <wayland-util.h>
+
+#include "wlr-wrap-start.hpp"
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_data_device.h>
 #include <wlr/types/wlr_input_device.h>

src/output.cpp

@@ -4,12 +4,10 @@
 #include "surface/layer.hpp"
 #include "types.hpp"
 
-#include <algorithm>
 #include <set>
 
 #include <wlr-wrap-start.hpp>
 #include <wlr/types/wlr_layer_shell_v1.h>
-#include <wlr/types/wlr_scene.h>
 #include <wlr-wrap-end.hpp>
 
 static void output_enable_notify(wl_listener* listener, void* data) {

src/server.cpp

@@ -9,21 +9,23 @@
 #include "types.hpp"
 #include "xwayland.hpp"
 
-#include <algorithm>
 #include <cassert>
 #include <wayland-server.h>
 
 #include "wlr-wrap-start.hpp"
+#include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_data_control_v1.h>
+#include <wlr/types/wlr_data_device.h>
 #include <wlr/types/wlr_export_dmabuf_v1.h>
-#include <wlr/types/wlr_xdg_foreign_registry.h>
-#include <wlr/types/wlr_xdg_foreign_v1.h>
-#include <wlr/types/wlr_xdg_foreign_v2.h>
 #include <wlr/types/wlr_gamma_control_v1.h>
-#include <wlr/types/wlr_output_power_management_v1.h>
 #include <wlr/types/wlr_presentation_time.h>
 #include <wlr/types/wlr_primary_selection_v1.h>
 #include <wlr/types/wlr_screencopy_v1.h>
+#include <wlr/types/wlr_single_pixel_buffer_v1.h>
+#include <wlr/types/wlr_viewporter.h>
+#include <wlr/types/wlr_xdg_foreign_registry.h>
+#include <wlr/types/wlr_xdg_foreign_v1.h>
+#include <wlr/types/wlr_xdg_foreign_v2.h>
 #include "wlr-wrap-end.hpp"
 
 void Server::focus_view(View& view, wlr_surface* surface) {
@@ -315,7 +317,7 @@ Server::Server() : listeners(*this) {
 	listeners.activation_request_activation.notify = request_activation_notify;
 	wl_signal_add(&xdg_activation->events.request_activate, &listeners.activation_request_activation);
 
-	data_controller = wlr_data_control_manager_v1_create(display);
+	wlr_data_control_manager_v1_create(display);
 	foreign_toplevel_manager = wlr_foreign_toplevel_manager_v1_create(display);
 
 	xwayland = new XWayland(*this);

src/server.hpp

@@ -2,36 +2,23 @@
 #define MAGPIE_SERVER_HPP
 
 #include "types.hpp"
-#include "xwayland.hpp"
 
+#include <functional>
 #include <list>
 #include <set>
-#include <vector>
 
 #include "wlr-wrap-start.hpp"
-#include <wayland-server.h>
 #include <wlr/render/allocator.h>
-#include <wlr/render/wlr_renderer.h>
-#include <wlr/types/wlr_cursor.h>
-#include <wlr/types/wlr_data_control_v1.h>
-#include <wlr/types/wlr_data_device.h>
 #include <wlr/types/wlr_drm_lease_v1.h>
 #include <wlr/types/wlr_foreign_toplevel_management_v1.h>
-#include <wlr/types/wlr_idle.h>
 #include <wlr/types/wlr_idle_inhibit_v1.h>
 #include <wlr/types/wlr_idle_notify_v1.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
-#include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_output_power_management_v1.h>
 #include <wlr/types/wlr_scene.h>
-#include <wlr/types/wlr_single_pixel_buffer_v1.h>
-#include <wlr/types/wlr_subcompositor.h>
-#include <wlr/types/wlr_viewporter.h>
-#include <wlr/types/wlr_xcursor_manager.h>
 #include <wlr/types/wlr_xdg_activation_v1.h>
 #include <wlr/types/wlr_xdg_output_v1.h>
 #include <wlr/types/wlr_xdg_shell.h>
-#include <wlr/xwayland.h>
 #include "wlr-wrap-end.hpp"
 
 typedef enum {
@@ -75,7 +62,6 @@ class Server {
 
 	wlr_xdg_activation_v1* xdg_activation;
 
-	wlr_data_control_manager_v1* data_controller;
 	wlr_foreign_toplevel_manager_v1* foreign_toplevel_manager;
 
 	wlr_layer_shell_v1* layer_shell;

src/surface/layer.hpp

@@ -3,17 +3,10 @@
 
 #include "surface.hpp"
 #include "types.hpp"
-
-#include <functional>
 #include <set>
 
 #include "wlr-wrap-start.hpp"
-#include <wlr/types/wlr_layer_shell_v1.h>
-#include <wlr/types/wlr_output_layout.h>
-#include <wlr/types/wlr_scene.h>
 #include <wlr/types/wlr_subcompositor.h>
-#include <wlr/types/wlr_xdg_shell.h>
-#include <wlr/util/log.h>
 #include "wlr-wrap-end.hpp"
 
 class Layer : public Surface {

src/surface/popup.cpp

@@ -3,11 +3,6 @@
 #include "surface.hpp"
 #include "types.hpp"
 
-#include "wlr-wrap-start.hpp"
-#include <wlr/types/wlr_scene.h>
-#include <wlr/types/wlr_xdg_shell.h>
-#include "wlr-wrap-end.hpp"
-
 static void popup_map_notify(wl_listener* listener, void* data) {
 	(void) listener;
 	(void) data;

src/surface/popup.hpp

@@ -4,10 +4,7 @@
 #include "surface.hpp"
 #include "types.hpp"
 
-#include <functional>
-
 #include "wlr-wrap-start.hpp"
-#include <wlr/types/wlr_scene.h>
 #include <wlr/types/wlr_xdg_shell.h>
 #include "wlr-wrap-end.hpp"
 

src/surface/view.hpp

@@ -8,7 +8,6 @@
 #include <optional>
 
 #include "wlr-wrap-start.hpp"
-#include <wlr/types/wlr_scene.h>
 #include <wlr/types/wlr_xdg_shell.h>
 #include <wlr/util/box.h>
 #include <wlr/xwayland.h>