diff --git a/native/Avalonia.Native/src/OSX/SystemDialogs.mm b/native/Avalonia.Native/src/OSX/SystemDialogs.mm
index a47221056b..21ad9cfa7c 100644
--- a/native/Avalonia.Native/src/OSX/SystemDialogs.mm
+++ b/native/Avalonia.Native/src/OSX/SystemDialogs.mm
@@ -1,5 +1,6 @@
 #include "common.h"
 #include "window.h"
+#include "INSWindowHolder.h"
 
 class SystemDialogs : public ComSingleObject<IAvnSystemDialogs, &IID_IAvnSystemDialogs>
 {
diff --git a/native/Avalonia.Native/src/OSX/automation.h b/native/Avalonia.Native/src/OSX/automation.h
index 4a12a965fd..79ccfd0eaa 100644
--- a/native/Avalonia.Native/src/OSX/automation.h
+++ b/native/Avalonia.Native/src/OSX/automation.h
@@ -1,5 +1,5 @@
 #import <Cocoa/Cocoa.h>
-#include "window.h"
+#import "window.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/native/Avalonia.Native/src/OSX/automation.mm b/native/Avalonia.Native/src/OSX/automation.mm
index 7d697140c2..226e8810c7 100644
--- a/native/Avalonia.Native/src/OSX/automation.mm
+++ b/native/Avalonia.Native/src/OSX/automation.mm
@@ -1,7 +1,7 @@
 #include "common.h"
-#include "automation.h"
+#import "automation.h"
 #include "AvnString.h"
-#include "window.h"
+#import "INSWindowHolder.h"
 
 @interface AvnAccessibilityElement (Events)
 - (void) raiseChildrenChanged;
diff --git a/native/Avalonia.Native/src/OSX/menu.mm b/native/Avalonia.Native/src/OSX/menu.mm
index 2dbe76bc6d..726e58478b 100644
--- a/native/Avalonia.Native/src/OSX/menu.mm
+++ b/native/Avalonia.Native/src/OSX/menu.mm
@@ -1,7 +1,7 @@
 
 #include "common.h"
 #include "menu.h"
-#include "window.h"
+#import "window.h"
 #include "KeyTransform.h"
 #include <CoreFoundation/CoreFoundation.h>
 #include <Carbon/Carbon.h> /* For kVK_ constants, and TIS functions. */