From 87c4213ac6b8ac73c8752e175f777d372e492ab4 Mon Sep 17 00:00:00 2001
From: Chris Thrasher <chrisjthrasher@gmail.com>
Date: Mon, 4 Jul 2022 20:05:15 -0600
Subject: [PATCH] Add missing headers

Reformatting with clang-format revealed that a few files were missing
some #include and #import statements.
---
 src/SFML/Window/OSX/SFKeyboardModifiersHelper.h  | 2 ++
 src/SFML/Window/OSX/SFOpenGLView+keyboard.mm     | 1 -
 src/SFML/Window/OSX/SFOpenGLView+keyboard_priv.h | 1 +
 src/SFML/Window/OSX/SFOpenGLView+mouse_priv.h    | 1 +
 src/SFML/Window/Unix/InputImpl.cpp               | 5 +----
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/SFML/Window/OSX/SFKeyboardModifiersHelper.h b/src/SFML/Window/OSX/SFKeyboardModifiersHelper.h
index 053fbfe8a..a34b00eb0 100644
--- a/src/SFML/Window/OSX/SFKeyboardModifiersHelper.h
+++ b/src/SFML/Window/OSX/SFKeyboardModifiersHelper.h
@@ -26,6 +26,8 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
+#include <SFML/Window/Event.hpp>
+
 #import <AppKit/AppKit.h>
 
 namespace sf
diff --git a/src/SFML/Window/OSX/SFOpenGLView+keyboard.mm b/src/SFML/Window/OSX/SFOpenGLView+keyboard.mm
index 65581aa8e..0a8d67939 100644
--- a/src/SFML/Window/OSX/SFOpenGLView+keyboard.mm
+++ b/src/SFML/Window/OSX/SFOpenGLView+keyboard.mm
@@ -29,7 +29,6 @@
 #include <SFML/Window/OSX/HIDInputManager.hpp> // For localizedKeys and nonLocalizedKeys
 #import <SFML/Window/OSX/SFKeyboardModifiersHelper.h>
 #import <SFML/Window/OSX/SFOpenGLView+keyboard_priv.h>
-#import <SFML/Window/OSX/SFOpenGLView.h>
 #include <SFML/Window/OSX/WindowImplCocoa.hpp>
 
 #if defined(__APPLE__)
diff --git a/src/SFML/Window/OSX/SFOpenGLView+keyboard_priv.h b/src/SFML/Window/OSX/SFOpenGLView+keyboard_priv.h
index 165362929..3c3e2b8c3 100644
--- a/src/SFML/Window/OSX/SFOpenGLView+keyboard_priv.h
+++ b/src/SFML/Window/OSX/SFOpenGLView+keyboard_priv.h
@@ -27,6 +27,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/Mouse.hpp>
+#import <SFML/Window/OSX/SFOpenGLView.h>
 
 #import <AppKit/AppKit.h>
 
diff --git a/src/SFML/Window/OSX/SFOpenGLView+mouse_priv.h b/src/SFML/Window/OSX/SFOpenGLView+mouse_priv.h
index cf89891a9..344274df0 100644
--- a/src/SFML/Window/OSX/SFOpenGLView+mouse_priv.h
+++ b/src/SFML/Window/OSX/SFOpenGLView+mouse_priv.h
@@ -27,6 +27,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/Mouse.hpp>
+#import <SFML/Window/OSX/SFOpenGLView.h>
 
 #import <AppKit/AppKit.h>
 
diff --git a/src/SFML/Window/Unix/InputImpl.cpp b/src/SFML/Window/Unix/InputImpl.cpp
index cf6522ca8..75ce67254 100644
--- a/src/SFML/Window/Unix/InputImpl.cpp
+++ b/src/SFML/Window/Unix/InputImpl.cpp
@@ -26,12 +26,9 @@
 // Headers
 ////////////////////////////////////////////////////////////
 
-// clang-format off
-#include <SFML/Window/Window.hpp> // important to be included first (conflict with None)
-// clang-format on
-
 #include <SFML/Window/Unix/Display.hpp>
 #include <SFML/Window/Unix/InputImpl.hpp>
+#include <SFML/Window/Window.hpp>
 
 #include <X11/Xlib.h>
 #include <X11/keysym.h>