diff --git a/src/Avalonia.Native.OSX/Avalonia.Native.OSX.xcodeproj/project.pbxproj b/src/Avalonia.Native.OSX/Avalonia.Native.OSX.xcodeproj/project.pbxproj
index 57de0fc36d..8d36bf3b8f 100644
--- a/src/Avalonia.Native.OSX/Avalonia.Native.OSX.xcodeproj/project.pbxproj
+++ b/src/Avalonia.Native.OSX/Avalonia.Native.OSX.xcodeproj/project.pbxproj
@@ -22,7 +22,7 @@
 
 /* Begin PBXFileReference section */
 		379860FE214DA0C000CD0246 /* KeyTransform.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KeyTransform.h; sourceTree = "<group>"; };
-		379A4506214D0F6500CC143D /* headers */ = {isa = PBXFileReference; lastKnownFileType = folder; name = headers; path = ../headers; sourceTree = "<group>"; };
+		37A4E71A2178846A00EACBCD /* headers */ = {isa = PBXFileReference; lastKnownFileType = folder; name = headers; path = ../Avalonia.Native/headers; sourceTree = "<group>"; };
 		37A517B22159597E00FBA241 /* Screens.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = Screens.mm; sourceTree = "<group>"; };
 		37C09D8721580FE4006A6758 /* SystemDialogs.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = SystemDialogs.mm; sourceTree = "<group>"; };
 		37C09D8A21581EF2006A6758 /* window.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = window.h; sourceTree = "<group>"; };
@@ -65,11 +65,11 @@
 		AB7A61E62147C814003C5833 = {
 			isa = PBXGroup;
 			children = (
+				37A4E71A2178846A00EACBCD /* headers */,
 				AB573DC3217605E400D389A2 /* gl.mm */,
 				5BF943652167AD1D009CAE35 /* cursor.h */,
 				5B21A981216530F500CEE36E /* cursor.mm */,
 				5B8BD94E215BFEA6005ED2A7 /* clipboard.mm */,
-				379A4506214D0F6500CC143D /* headers */,
 				AB8F7D6A21482D7F0057DBA5 /* platformthreading.mm */,
 				AB661C212148288600291242 /* common.h */,
 				379860FE214DA0C000CD0246 /* KeyTransform.h */,
@@ -285,7 +285,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				EXECUTABLE_PREFIX = lib;
-				HEADER_SEARCH_PATHS = ../headers;
+				HEADER_SEARCH_PATHS = ../Avalonia.Native/headers;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -296,7 +296,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				EXECUTABLE_PREFIX = lib;
-				HEADER_SEARCH_PATHS = ../headers;
+				HEADER_SEARCH_PATHS = ../Avalonia.Native/headers;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
diff --git a/src/Avalonia.Native/Mappings.xml b/src/Avalonia.Native/Mappings.xml
index 2949d4bfa2..9e6c6512c7 100644
--- a/src/Avalonia.Native/Mappings.xml
+++ b/src/Avalonia.Native/Mappings.xml
@@ -3,7 +3,7 @@
     <assembly>Avalonia.Native</assembly>
     <namespace>Avalonia.Native.Interop</namespace>
     <depends>SharpGen.Runtime.COM</depends>
-    <include-dir>$(THIS_CONFIG_PATH)/../headers</include-dir>
+    <include-dir>$(THIS_CONFIG_PATH)/headers</include-dir>
     <include file="avalonia-native.h" 
              namespace="Avalonia.Native.Interop"
              attach="true"
diff --git a/src/headers/avalonia-native-guids.h b/src/Avalonia.Native/headers/avalonia-native-guids.h
similarity index 100%
rename from src/headers/avalonia-native-guids.h
rename to src/Avalonia.Native/headers/avalonia-native-guids.h
diff --git a/src/headers/avalonia-native.h b/src/Avalonia.Native/headers/avalonia-native.h
similarity index 100%
rename from src/headers/avalonia-native.h
rename to src/Avalonia.Native/headers/avalonia-native.h
diff --git a/src/headers/com.h b/src/Avalonia.Native/headers/com.h
similarity index 100%
rename from src/headers/com.h
rename to src/Avalonia.Native/headers/com.h
diff --git a/src/headers/comimpl.h b/src/Avalonia.Native/headers/comimpl.h
similarity index 100%
rename from src/headers/comimpl.h
rename to src/Avalonia.Native/headers/comimpl.h
diff --git a/src/headers/key.h b/src/Avalonia.Native/headers/key.h
similarity index 100%
rename from src/headers/key.h
rename to src/Avalonia.Native/headers/key.h