diff --git a/GitUp/Application/Base.lproj/WelcomeWindowController.xib b/GitUp/Application/Base.lproj/WelcomeWindowController.xib
index 2b8da48f..4ebde2fc 100644
--- a/GitUp/Application/Base.lproj/WelcomeWindowController.xib
+++ b/GitUp/Application/Base.lproj/WelcomeWindowController.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="24765" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment version="110000" identifier="macosx"/>
+        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24765"/>
         <capability name="System colors introduced in macOS 10.14" minToolsVersion="10.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
diff --git a/GitUp/Application/Document.m b/GitUp/Application/Document.m
index 33333588..bff6a91a 100644
--- a/GitUp/Application/Document.m
+++ b/GitUp/Application/Document.m
@@ -47,7 +47,6 @@
 
 #define kMaxProgressRefreshRate 10.0  // Hz
 
-#define kNavigateSegmentWidth 34.0
 #define kSearchFieldCompactWidth 190.0
 #define kSearchFieldExpandedWidth 238.0
 
diff --git a/GitUp/GitUp.xcodeproj/project.pbxproj b/GitUp/GitUp.xcodeproj/project.pbxproj
index 6acaef1f..2da02a5d 100644
--- a/GitUp/GitUp.xcodeproj/project.pbxproj
+++ b/GitUp/GitUp.xcodeproj/project.pbxproj
@@ -660,7 +660,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 11.5;
+				MACOSX_DEPLOYMENT_TARGET = 12.4;
 				MARKETING_VERSION = 1.5.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "co.gitup.mac-debug";
 				PRODUCT_NAME = GitUp;
@@ -680,7 +680,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 11.5;
+				MACOSX_DEPLOYMENT_TARGET = 12.4;
 				MARKETING_VERSION = 1.5.0;
 				PRODUCT_BUNDLE_IDENTIFIER = co.gitup.mac;
 				PRODUCT_NAME = GitUp;
diff --git a/GitUpKit/Components/GICommitListViewController.h b/GitUpKit/Components/GICommitListViewController.h
index 9dc56ffa..725f299c 100644
--- a/GitUpKit/Components/GICommitListViewController.h
+++ b/GitUpKit/Components/GICommitListViewController.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GIViewController.h"
+#import <GitUpKit/GIViewController.h>
 
 @class GICommitListViewController, GCHistoryCommit;
 
diff --git a/GitUpKit/Components/GICommitListViewController.m b/GitUpKit/Components/GICommitListViewController.m
index 11cffeb8..4bd11c52 100644
--- a/GitUpKit/Components/GICommitListViewController.m
+++ b/GitUpKit/Components/GICommitListViewController.m
@@ -17,10 +17,10 @@
 #error This file requires ARC
 #endif
 
-#import "GICommitListViewController.h"
+#import <GitUpKit/GICommitListViewController.h>
 
-#import "GCLiveRepository+Utilities.h"
-#import "GIInterface.h"
+#import <GitUpKit/GCLiveRepository+Utilities.h>
+#import <GitUpKit/GIInterface.h>
 #import "XLFacilityMacros.h"
 
 @interface GICommitListViewController () <NSTableViewDataSource>
diff --git a/GitUpKit/Components/GIDiffContentsViewController.h b/GitUpKit/Components/GIDiffContentsViewController.h
index 32624ec2..f6d13972 100644
--- a/GitUpKit/Components/GIDiffContentsViewController.h
+++ b/GitUpKit/Components/GIDiffContentsViewController.h
@@ -13,9 +13,9 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GIViewController.h"
+#import <GitUpKit/GIViewController.h>
 
-#import "GCDiff.h"
+#import <GitUpKit/GCDiff.h>
 
 extern NSString* const GIDiffContentsViewControllerUserDefaultKey_DiffViewMode;  // Integer (-1, 0 or 1)
 
diff --git a/GitUpKit/Components/GIDiffContentsViewController.m b/GitUpKit/Components/GIDiffContentsViewController.m
index 27860689..4dee7130 100644
--- a/GitUpKit/Components/GIDiffContentsViewController.m
+++ b/GitUpKit/Components/GIDiffContentsViewController.m
@@ -17,11 +17,11 @@
 #error This file requires ARC
 #endif
 
-#import "GIDiffContentsViewController.h"
+#import <GitUpKit/GIDiffContentsViewController.h>
 
-#import "GIInterface.h"
-#import "GIViewController+Utilities.h"
-#import "GCRepository+Index.h"
+#import <GitUpKit/GIInterface.h>
+#import <GitUpKit/GIViewController+Utilities.h>
+#import <GitUpKit/GCRepository+Index.h>
 #import "XLFacilityMacros.h"
 
 // Units ems: a multiple of the font point size, so the width threshold is 100 * 10 = 1000 for a 10 point font.
diff --git a/GitUpKit/Components/GIDiffFilesViewController.h b/GitUpKit/Components/GIDiffFilesViewController.h
index 6e232006..c38111fe 100644
--- a/GitUpKit/Components/GIDiffFilesViewController.h
+++ b/GitUpKit/Components/GIDiffFilesViewController.h
@@ -13,9 +13,9 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GIViewController.h"
+#import <GitUpKit/GIViewController.h>
 
-#import "GCDiff.h"
+#import <GitUpKit/GCDiff.h>
 
 @class GIDiffFilesViewController;
 
diff --git a/GitUpKit/Components/GIDiffFilesViewController.m b/GitUpKit/Components/GIDiffFilesViewController.m
index bab11a8b..92b043dc 100644
--- a/GitUpKit/Components/GIDiffFilesViewController.m
+++ b/GitUpKit/Components/GIDiffFilesViewController.m
@@ -17,9 +17,9 @@
 #error This file requires ARC
 #endif
 
-#import "GIDiffFilesViewController.h"
+#import <GitUpKit/GIDiffFilesViewController.h>
 
-#import "GIInterface.h"
+#import <GitUpKit/GIInterface.h>
 #import "XLFacilityMacros.h"
 
 static const NSPasteboardType GIPasteboardTypeFileRowIndex = @"co.gitup.mac.file-row-index";
diff --git a/GitUpKit/Components/GISnapshotListViewController.h b/GitUpKit/Components/GISnapshotListViewController.h
index bfb43a8b..7dd6b674 100644
--- a/GitUpKit/Components/GISnapshotListViewController.h
+++ b/GitUpKit/Components/GISnapshotListViewController.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GIViewController.h"
+#import <GitUpKit/GIViewController.h>
 
 @class GISnapshotListViewController, GCSnapshot;
 
diff --git a/GitUpKit/Components/GISnapshotListViewController.m b/GitUpKit/Components/GISnapshotListViewController.m
index 4962ea48..718c304e 100644
--- a/GitUpKit/Components/GISnapshotListViewController.m
+++ b/GitUpKit/Components/GISnapshotListViewController.m
@@ -17,11 +17,11 @@
 #error This file requires ARC
 #endif
 
-#import "GISnapshotListViewController.h"
-#import "GIWindowController.h"
+#import <GitUpKit/GISnapshotListViewController.h>
+#import <GitUpKit/GIWindowController.h>
 
-#import "GIInterface.h"
-#import "GCRepository+Utilities.h"
+#import <GitUpKit/GIInterface.h>
+#import <GitUpKit/GCRepository+Utilities.h>
 #import "XLFacilityMacros.h"
 
 @interface GISnapshotListViewController () <NSTableViewDataSource>
diff --git a/GitUpKit/Components/GIUnifiedReflogViewController.h b/GitUpKit/Components/GIUnifiedReflogViewController.h
index 285f775b..e235f0a7 100644
--- a/GitUpKit/Components/GIUnifiedReflogViewController.h
+++ b/GitUpKit/Components/GIUnifiedReflogViewController.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GIViewController.h"
+#import <GitUpKit/GIViewController.h>
 
 @class GIUnifiedReflogViewController, GCReflogEntry, GCCommit;
 
diff --git a/GitUpKit/Components/GIUnifiedReflogViewController.m b/GitUpKit/Components/GIUnifiedReflogViewController.m
index 2484f5e4..eb0d7ff1 100644
--- a/GitUpKit/Components/GIUnifiedReflogViewController.m
+++ b/GitUpKit/Components/GIUnifiedReflogViewController.m
@@ -17,9 +17,9 @@
 #error This file requires ARC
 #endif
 
-#import "GIUnifiedReflogViewController.h"
+#import <GitUpKit/GIUnifiedReflogViewController.h>
 
-#import "GIInterface.h"
+#import <GitUpKit/GIInterface.h>
 #import "XLFacilityMacros.h"
 
 @interface GIUnifiedReflogViewController () <NSTableViewDataSource>
diff --git a/GitUpKit/Core/GCBranch.h b/GitUpKit/Core/GCBranch.h
index fadf4a79..e5ab1bd1 100644
--- a/GitUpKit/Core/GCBranch.h
+++ b/GitUpKit/Core/GCBranch.h
@@ -13,8 +13,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GCReference.h"
-#import "GCRepository.h"
+#import <GitUpKit/GCReference.h>
+#import <GitUpKit/GCRepository.h>
 
 @class GCCommit;
 
diff --git a/GitUpKit/Core/GCCommit.h b/GitUpKit/Core/GCCommit.h
index 61a6c15c..e39adfa7 100644
--- a/GitUpKit/Core/GCCommit.h
+++ b/GitUpKit/Core/GCCommit.h
@@ -13,8 +13,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GCObject.h"
-#import "GCRepository.h"
+#import <GitUpKit/GCObject.h>
+#import <GitUpKit/GCRepository.h>
 
 @interface GCCommit : GCObject
 @property(nonatomic, readonly) NSString* message;
diff --git a/GitUpKit/Core/GCCore.h b/GitUpKit/Core/GCCore.h
index 29e2bebd..c6a01076 100644
--- a/GitUpKit/Core/GCCore.h
+++ b/GitUpKit/Core/GCCore.h
@@ -13,35 +13,35 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GCBranch.h"
-#import "GCCommit.h"
-#import "GCCommitDatabase.h"
-#import "GCDiff.h"
-#import "GCError.h"
-#import "GCFoundation.h"
-#import "GCFunctions.h"
-#import "GCHistory.h"
-#import "GCIndex.h"
+#import <GitUpKit/GCBranch.h>
+#import <GitUpKit/GCCommit.h>
+#import <GitUpKit/GCCommitDatabase.h>
+#import <GitUpKit/GCDiff.h>
+#import <GitUpKit/GCError.h>
+#import <GitUpKit/GCFoundation.h>
+#import <GitUpKit/GCFunctions.h>
+#import <GitUpKit/GCHistory.h>
+#import <GitUpKit/GCIndex.h>
 #if !TARGET_OS_IPHONE
-#import "GCLiveRepository.h"
+#import <GitUpKit/GCLiveRepository.h>
 #endif
-#import "GCMacros.h"
-#import "GCObject.h"
-#import "GCOrderedSet.h"
-#import "GCReference.h"
-#import "GCSnapshot.h"
-#import "GCReferenceTransform.h"
-#import "GCReflogMessages.h"
-#import "GCRemote.h"
-#import "GCRepository.h"
-#import "GCRepository+Bare.h"
-#import "GCRepository+Config.h"
-#import "GCRepository+HEAD.h"
-#import "GCRepository+Mock.h"
-#import "GCRepository+Reflog.h"
-#import "GCRepository+Reset.h"
-#import "GCRepository+Status.h"
-#import "GCSQLiteRepository.h"
-#import "GCStash.h"
-#import "GCSubmodule.h"
-#import "GCTag.h"
+#import <GitUpKit/GCMacros.h>
+#import <GitUpKit/GCObject.h>
+#import <GitUpKit/GCOrderedSet.h>
+#import <GitUpKit/GCReference.h>
+#import <GitUpKit/GCSnapshot.h>
+#import <GitUpKit/GCReferenceTransform.h>
+#import <GitUpKit/GCReflogMessages.h>
+#import <GitUpKit/GCRemote.h>
+#import <GitUpKit/GCRepository.h>
+#import <GitUpKit/GCRepository+Bare.h>
+#import <GitUpKit/GCRepository+Config.h>
+#import <GitUpKit/GCRepository+HEAD.h>
+#import <GitUpKit/GCRepository+Mock.h>
+#import <GitUpKit/GCRepository+Reflog.h>
+#import <GitUpKit/GCRepository+Reset.h>
+#import <GitUpKit/GCRepository+Status.h>
+#import <GitUpKit/GCSQLiteRepository.h>
+#import <GitUpKit/GCStash.h>
+#import <GitUpKit/GCSubmodule.h>
+#import <GitUpKit/GCTag.h>
diff --git a/GitUpKit/Core/GCDiff-Tests.m b/GitUpKit/Core/GCDiff-Tests.m
index e60713d5..4e84780b 100644
--- a/GitUpKit/Core/GCDiff-Tests.m
+++ b/GitUpKit/Core/GCDiff-Tests.m
@@ -18,7 +18,7 @@
 #endif
 
 #import "GCTestCase.h"
-#import "GCRepository+Index.h"
+#import <GitUpKit/GCRepository+Index.h>
 
 @implementation GCSingleCommitRepositoryTests (GCRepository_Diffs)
 
diff --git a/GitUpKit/Core/GCDiff.h b/GitUpKit/Core/GCDiff.h
index 857f5649..d488f6f8 100644
--- a/GitUpKit/Core/GCDiff.h
+++ b/GitUpKit/Core/GCDiff.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GCRepository.h"
+#import <GitUpKit/GCRepository.h>
 
 typedef NS_ENUM(NSUInteger, GCDiffType) {
   kGCDiffType_WorkingDirectoryWithCommit = 0,
diff --git a/GitUpKit/Core/GCFoundation-Tests.m b/GitUpKit/Core/GCFoundation-Tests.m
index 0bc0b551..2fb761cb 100644
--- a/GitUpKit/Core/GCFoundation-Tests.m
+++ b/GitUpKit/Core/GCFoundation-Tests.m
@@ -14,7 +14,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #import <XCTest/XCTest.h>
-#import "GCFoundation.h"
+#import <GitUpKit/GCFoundation.h>
 
 @interface GCFoundation_Tests : XCTestCase
 
diff --git a/GitUpKit/Core/GCFunctions.h b/GitUpKit/Core/GCFunctions.h
index 78bddb35..becb0cd7 100644
--- a/GitUpKit/Core/GCFunctions.h
+++ b/GitUpKit/Core/GCFunctions.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GCError.h"
+#import <GitUpKit/GCError.h>
 
 #define GC_SET_ERROR(code, ...)                                    \
   do {                                                             \
diff --git a/GitUpKit/Core/GCHistory-Tests.m b/GitUpKit/Core/GCHistory-Tests.m
index fa68b7a7..e2a6beed 100644
--- a/GitUpKit/Core/GCHistory-Tests.m
+++ b/GitUpKit/Core/GCHistory-Tests.m
@@ -18,7 +18,7 @@
 #endif
 
 #import "GCTestCase.h"
-#import "GCRepository+Index.h"
+#import <GitUpKit/GCRepository+Index.h>
 
 @implementation GCSQLiteRepositoryTests (GCHistory)
 
diff --git a/GitUpKit/Core/GCHistory.h b/GitUpKit/Core/GCHistory.h
index ca63be6b..1f055ad4 100644
--- a/GitUpKit/Core/GCHistory.h
+++ b/GitUpKit/Core/GCHistory.h
@@ -13,10 +13,10 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GCRepository.h"
-#import "GCCommit.h"
-#import "GCTag.h"
-#import "GCBranch.h"
+#import <GitUpKit/GCRepository.h>
+#import <GitUpKit/GCCommit.h>
+#import <GitUpKit/GCTag.h>
+#import <GitUpKit/GCBranch.h>
 
 typedef NS_ENUM(NSUInteger, GCHistorySorting) {
   kGCHistorySorting_None = 0,
diff --git a/GitUpKit/Core/GCIndex.h b/GitUpKit/Core/GCIndex.h
index d247bbec..9a6ee43e 100644
--- a/GitUpKit/Core/GCIndex.h
+++ b/GitUpKit/Core/GCIndex.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GCDiff.h"
+#import <GitUpKit/GCDiff.h>
 
 // The cases "Both Deleted", "Added by Us" and "Added by Them" are not possible in practice as they are automatically resolved by the trivial merge machinery
 // http://permalink.gmane.org/gmane.comp.version-control.git/245661
diff --git a/GitUpKit/Core/GCLiveRepository+Conflicts.m b/GitUpKit/Core/GCLiveRepository+Conflicts.m
index f6ccf7da..ecbe6cf7 100644
--- a/GitUpKit/Core/GCLiveRepository+Conflicts.m
+++ b/GitUpKit/Core/GCLiveRepository+Conflicts.m
@@ -5,10 +5,10 @@
 //  Created by Felix Lapalme on 2024-04-13.
 //
 
-#import "GCLiveRepository+Conflicts.h"
+#import <GitUpKit/GCLiveRepository+Conflicts.h>
 
-#import "GCRepository+Utilities.h"
-#import "GCRepository+HEAD.h"
+#import <GitUpKit/GCRepository+Utilities.h>
+#import <GitUpKit/GCRepository+HEAD.h>
 
 @implementation GCLiveRepository (Conflicts)
 
diff --git a/GitUpKit/Core/GCLiveRepository-Tests.m b/GitUpKit/Core/GCLiveRepository-Tests.m
index 0f584646..07680a34 100644
--- a/GitUpKit/Core/GCLiveRepository-Tests.m
+++ b/GitUpKit/Core/GCLiveRepository-Tests.m
@@ -7,10 +7,10 @@
 
 #import <XCTest/XCTest.h>
 #import "GCTestCase.h"
-#import "GCHistory+Rewrite.h"
-#import "GCRepository+Index.h"
-#import "GCLiveRepository+Conflicts.h"
-#import "GIViewController+Utilities.h"
+#import <GitUpKit/GCHistory+Rewrite.h>
+#import <GitUpKit/GCRepository+Index.h>
+#import <GitUpKit/GCLiveRepository+Conflicts.h>
+#import <GitUpKit/GIViewController+Utilities.h>
 
 // block based object that conforms to GCMergeConflictResolver
 @interface GCBlockConflictResolver : NSObject <GCMergeConflictResolver>
diff --git a/GitUpKit/Core/GCLiveRepository.h b/GitUpKit/Core/GCLiveRepository.h
index fa9bef96..22754017 100644
--- a/GitUpKit/Core/GCLiveRepository.h
+++ b/GitUpKit/Core/GCLiveRepository.h
@@ -13,10 +13,10 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GCRepository+Status.h"
-#import "GCHistory.h"
-#import "GCSnapshot.h"
-#import "GCCommitDatabase.h"
+#import <GitUpKit/GCRepository+Status.h>
+#import <GitUpKit/GCHistory.h>
+#import <GitUpKit/GCSnapshot.h>
+#import <GitUpKit/GCCommitDatabase.h>
 
 typedef NS_ENUM(NSUInteger, GCLiveRepositoryStatusMode) {
   kGCLiveRepositoryStatusMode_Disabled = 0,
diff --git a/GitUpKit/Core/GCOrderedSet-Tests.m b/GitUpKit/Core/GCOrderedSet-Tests.m
index 8025dac3..f150054f 100644
--- a/GitUpKit/Core/GCOrderedSet-Tests.m
+++ b/GitUpKit/Core/GCOrderedSet-Tests.m
@@ -14,7 +14,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #import "GCTestCase.h"
-#import "GCOrderedSet.h"
+#import <GitUpKit/GCOrderedSet.h>
 
 @implementation GCMultipleCommitsRepositoryTests (GCOrderedSetTests)
 
diff --git a/GitUpKit/Core/GCPrivate.h b/GitUpKit/Core/GCPrivate.h
index fae08853..b05b63bc 100644
--- a/GitUpKit/Core/GCPrivate.h
+++ b/GitUpKit/Core/GCPrivate.h
@@ -29,7 +29,7 @@
 #import <git2/sys/repository.h>
 #pragma clang diagnostic pop
 
-#import "GCCore.h"
+#import <GitUpKit/GCCore.h>
 
 #import "XLFacilityMacros.h"
 
diff --git a/GitUpKit/Core/GCReference.h b/GitUpKit/Core/GCReference.h
index e6559666..94e66849 100644
--- a/GitUpKit/Core/GCReference.h
+++ b/GitUpKit/Core/GCReference.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GCRepository.h"
+#import <GitUpKit/GCRepository.h>
 
 @interface GCReference : NSObject
 @property(nonatomic, readonly) GCRepository* repository;  // NOT RETAINED
diff --git a/GitUpKit/Core/GCReferenceTransform.h b/GitUpKit/Core/GCReferenceTransform.h
index 558f7079..ce579ef7 100644
--- a/GitUpKit/Core/GCReferenceTransform.h
+++ b/GitUpKit/Core/GCReferenceTransform.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GCRepository.h"
+#import <GitUpKit/GCRepository.h>
 
 @class GCObject, GCCommit;
 
diff --git a/GitUpKit/Core/GCRemote.h b/GitUpKit/Core/GCRemote.h
index 32a9b8b4..b978d1f8 100644
--- a/GitUpKit/Core/GCRemote.h
+++ b/GitUpKit/Core/GCRemote.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GCRepository.h"
+#import <GitUpKit/GCRepository.h>
 
 typedef NS_ENUM(NSUInteger, GCFetchTagMode) {
   kGCFetchTagMode_Automatic = 0,
diff --git a/GitUpKit/Core/GCRepository+Bare.h b/GitUpKit/Core/GCRepository+Bare.h
index 008c646f..24f43ee2 100644
--- a/GitUpKit/Core/GCRepository+Bare.h
+++ b/GitUpKit/Core/GCRepository+Bare.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GCRepository.h"
+#import <GitUpKit/GCRepository.h>
 
 typedef NS_ENUM(NSUInteger, GCMergeAnalysisResult) {
   kGCMergeAnalysisResult_Unknown = 0,
diff --git a/GitUpKit/Core/GCRepository+Config.h b/GitUpKit/Core/GCRepository+Config.h
index 99923a75..0d3b1a9a 100644
--- a/GitUpKit/Core/GCRepository+Config.h
+++ b/GitUpKit/Core/GCRepository+Config.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GCRepository.h"
+#import <GitUpKit/GCRepository.h>
 
 typedef NS_ENUM(NSUInteger, GCConfigLevel) {
   kGCConfigLevel_System = 0,  // $(prefix)/etc/gitconfig: system-wide configuration file
diff --git a/GitUpKit/Core/GCRepository+HEAD-Tests.m b/GitUpKit/Core/GCRepository+HEAD-Tests.m
index cb85f4f3..fdfcc211 100644
--- a/GitUpKit/Core/GCRepository+HEAD-Tests.m
+++ b/GitUpKit/Core/GCRepository+HEAD-Tests.m
@@ -18,8 +18,8 @@
 #endif
 
 #import "GCTestCase.h"
-#import "GCRepository+Utilities.h"
-#import "GCRepository+Index.h"
+#import <GitUpKit/GCRepository+Utilities.h>
+#import <GitUpKit/GCRepository+Index.h>
 
 @implementation GCEmptyRepositoryTests (GCRepository_HEAD)
 
diff --git a/GitUpKit/Core/GCRepository+HEAD.h b/GitUpKit/Core/GCRepository+HEAD.h
index 70cda216..5fe2d79f 100644
--- a/GitUpKit/Core/GCRepository+HEAD.h
+++ b/GitUpKit/Core/GCRepository+HEAD.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GCRepository.h"
+#import <GitUpKit/GCRepository.h>
 
 typedef NS_OPTIONS(NSUInteger, GCCheckoutOptions) {
   kGCCheckoutOption_Force = (1 << 0),
diff --git a/GitUpKit/Core/GCRepository+Mock.h b/GitUpKit/Core/GCRepository+Mock.h
index 406f2cd1..8acf916b 100644
--- a/GitUpKit/Core/GCRepository+Mock.h
+++ b/GitUpKit/Core/GCRepository+Mock.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GCRepository.h"
+#import <GitUpKit/GCRepository.h>
 
 /*
  The notation for a mock commit hierarchy is described using a simple plain text format:
diff --git a/GitUpKit/Core/GCRepository+Reflog.h b/GitUpKit/Core/GCRepository+Reflog.h
index ace0fd22..931fef23 100644
--- a/GitUpKit/Core/GCRepository+Reflog.h
+++ b/GitUpKit/Core/GCRepository+Reflog.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GCRepository.h"
+#import <GitUpKit/GCRepository.h>
 
 @class GCCommit;
 
diff --git a/GitUpKit/Core/GCRepository+Reset.h b/GitUpKit/Core/GCRepository+Reset.h
index 2828434e..356d20ae 100644
--- a/GitUpKit/Core/GCRepository+Reset.h
+++ b/GitUpKit/Core/GCRepository+Reset.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GCDiff.h"
+#import <GitUpKit/GCDiff.h>
 
 typedef NS_ENUM(NSUInteger, GCResetMode) {
   kGCResetMode_Soft = 0,
diff --git a/GitUpKit/Core/GCRepository+Status-Tests.m b/GitUpKit/Core/GCRepository+Status-Tests.m
index 33095302..1562ce6f 100644
--- a/GitUpKit/Core/GCRepository+Status-Tests.m
+++ b/GitUpKit/Core/GCRepository+Status-Tests.m
@@ -18,7 +18,7 @@
 #endif
 
 #import "GCTestCase.h"
-#import "GCRepository+Index.h"
+#import <GitUpKit/GCRepository+Index.h>
 
 @implementation GCSingleCommitRepositoryTests (GCRepository_Status)
 
diff --git a/GitUpKit/Core/GCRepository+Status.h b/GitUpKit/Core/GCRepository+Status.h
index 3ba9ed74..e2f7c850 100644
--- a/GitUpKit/Core/GCRepository+Status.h
+++ b/GitUpKit/Core/GCRepository+Status.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GCRepository.h"
+#import <GitUpKit/GCRepository.h>
 
 typedef NS_OPTIONS(NSUInteger, GCCleanCheckOptions) {
   kGCCleanCheckOption_IgnoreState = (1 << 0),
diff --git a/GitUpKit/Core/GCSQLiteRepository.h b/GitUpKit/Core/GCSQLiteRepository.h
index e8b82081..f35b9472 100644
--- a/GitUpKit/Core/GCSQLiteRepository.h
+++ b/GitUpKit/Core/GCSQLiteRepository.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GCRepository.h"
+#import <GitUpKit/GCRepository.h>
 
 @interface GCSQLiteRepository : GCRepository
 - (instancetype)initWithDatabase:(NSString*)databasePath error:(NSError**)error;
diff --git a/GitUpKit/Core/GCSnapshot.h b/GitUpKit/Core/GCSnapshot.h
index 640a8d40..abba2eb1 100644
--- a/GitUpKit/Core/GCSnapshot.h
+++ b/GitUpKit/Core/GCSnapshot.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GCRepository.h"
+#import <GitUpKit/GCRepository.h>
 
 typedef NS_OPTIONS(NSUInteger, GCSnapshotOptions) {
   kGCSnapshotOption_IncludeHEAD = (1 << 0),
diff --git a/GitUpKit/Core/GCStash-Tests.m b/GitUpKit/Core/GCStash-Tests.m
index b21e1623..fe3290e4 100644
--- a/GitUpKit/Core/GCStash-Tests.m
+++ b/GitUpKit/Core/GCStash-Tests.m
@@ -18,7 +18,7 @@
 #endif
 
 #import "GCTestCase.h"
-#import "GCRepository+Index.h"
+#import <GitUpKit/GCRepository+Index.h>
 
 // TODO: Test stash file list and content diff
 @implementation GCSingleCommitRepositoryTests (GCStash)
diff --git a/GitUpKit/Core/GCStash.h b/GitUpKit/Core/GCStash.h
index 3c537c27..9b996b42 100644
--- a/GitUpKit/Core/GCStash.h
+++ b/GitUpKit/Core/GCStash.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GCCommit.h"
+#import <GitUpKit/GCCommit.h>
 
 @interface GCStash : GCCommit
 @property(nonatomic, readonly) GCCommit* baseCommit;
diff --git a/GitUpKit/Core/GCSubmodule-Tests.m b/GitUpKit/Core/GCSubmodule-Tests.m
index f2bbee4a..e524aa80 100644
--- a/GitUpKit/Core/GCSubmodule-Tests.m
+++ b/GitUpKit/Core/GCSubmodule-Tests.m
@@ -18,7 +18,7 @@
 #endif
 
 #import "GCTestCase.h"
-#import "GCRepository+Index.h"
+#import <GitUpKit/GCRepository+Index.h>
 
 @implementation GCTests (GCSubmodule)
 
diff --git a/GitUpKit/Core/GCSubmodule.h b/GitUpKit/Core/GCSubmodule.h
index a1ed30bc..264608e5 100644
--- a/GitUpKit/Core/GCSubmodule.h
+++ b/GitUpKit/Core/GCSubmodule.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GCRepository.h"
+#import <GitUpKit/GCRepository.h>
 
 typedef NS_ENUM(NSUInteger, GCSubmoduleIgnoreMode) {
   kGCSubmoduleIgnoreMode_None = 0,  // Default in Git
diff --git a/GitUpKit/Core/GCTag.h b/GitUpKit/Core/GCTag.h
index 189bb7ce..799d32e9 100644
--- a/GitUpKit/Core/GCTag.h
+++ b/GitUpKit/Core/GCTag.h
@@ -13,9 +13,9 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GCObject.h"
-#import "GCReference.h"
-#import "GCRepository.h"
+#import <GitUpKit/GCObject.h>
+#import <GitUpKit/GCReference.h>
+#import <GitUpKit/GCRepository.h>
 
 @class GCCommit;
 
diff --git a/GitUpKit/Core/GCTestCase.m b/GitUpKit/Core/GCTestCase.m
index 07857ad2..054da4ee 100644
--- a/GitUpKit/Core/GCTestCase.m
+++ b/GitUpKit/Core/GCTestCase.m
@@ -20,7 +20,7 @@
 #import <objc/runtime.h>
 
 #import "GCTestCase.h"
-#import "GCRepository+Index.h"
+#import <GitUpKit/GCRepository+Index.h>
 
 #define kGitCLTPath @"/usr/bin/git"
 
diff --git a/GitUpKit/Extensions/GCHistory+Rewrite-Tests.m b/GitUpKit/Extensions/GCHistory+Rewrite-Tests.m
index 2f4ac1d9..f2d029d8 100644
--- a/GitUpKit/Extensions/GCHistory+Rewrite-Tests.m
+++ b/GitUpKit/Extensions/GCHistory+Rewrite-Tests.m
@@ -18,8 +18,8 @@
 #endif
 
 #import "GCTestCase.h"
-#import "GCHistory+Rewrite.h"
-#import "GCRepository+Utilities.h"
+#import <GitUpKit/GCHistory+Rewrite.h>
+#import <GitUpKit/GCRepository+Utilities.h>
 
 // TODO: Test updating detached HEAD and references
 @implementation GCSingleCommitRepositoryTests (GCHistory_Rewrite)
diff --git a/GitUpKit/Extensions/GCHistory+Rewrite.h b/GitUpKit/Extensions/GCHistory+Rewrite.h
index d984c9a5..deecb1b1 100644
--- a/GitUpKit/Extensions/GCHistory+Rewrite.h
+++ b/GitUpKit/Extensions/GCHistory+Rewrite.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GCCore.h"
+#import <GitUpKit/GCCore.h>
 
 @interface GCHistory (Rewrite)
 - (BOOL)isCommitOnAnyLocalBranch:(GCHistoryCommit*)commit;
diff --git a/GitUpKit/Extensions/GCHistory+Rewrite.m b/GitUpKit/Extensions/GCHistory+Rewrite.m
index 3968d376..7e57daa7 100644
--- a/GitUpKit/Extensions/GCHistory+Rewrite.m
+++ b/GitUpKit/Extensions/GCHistory+Rewrite.m
@@ -17,7 +17,7 @@
 #error This file requires ARC
 #endif
 
-#import "GCHistory+Rewrite.h"
+#import <GitUpKit/GCHistory+Rewrite.h>
 
 #import "XLFacilityMacros.h"
 
diff --git a/GitUpKit/Extensions/GCLiveRepository+Utilities.m b/GitUpKit/Extensions/GCLiveRepository+Utilities.m
index b6a899e5..06d22b7b 100644
--- a/GitUpKit/Extensions/GCLiveRepository+Utilities.m
+++ b/GitUpKit/Extensions/GCLiveRepository+Utilities.m
@@ -5,7 +5,7 @@
 //  Created by Lucas Derraugh on 8/2/19.
 //
 
-#import "GCLiveRepository+Utilities.h"
+#import <GitUpKit/GCLiveRepository+Utilities.h>
 
 @implementation GCLiveRepository (Utilities)
 
diff --git a/GitUpKit/Extensions/GCRepository+Index-Tests.m b/GitUpKit/Extensions/GCRepository+Index-Tests.m
index b22841da..e22197c8 100644
--- a/GitUpKit/Extensions/GCRepository+Index-Tests.m
+++ b/GitUpKit/Extensions/GCRepository+Index-Tests.m
@@ -18,7 +18,7 @@
 #endif
 
 #import "GCTestCase.h"
-#import "GCRepository+Index.h"
+#import <GitUpKit/GCRepository+Index.h>
 
 @implementation GCSingleCommitRepositoryTests (GCRepository_Index)
 
diff --git a/GitUpKit/Extensions/GCRepository+Index.h b/GitUpKit/Extensions/GCRepository+Index.h
index f6210396..5a414d81 100644
--- a/GitUpKit/Extensions/GCRepository+Index.h
+++ b/GitUpKit/Extensions/GCRepository+Index.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GCCore.h"
+#import <GitUpKit/GCCore.h>
 
 @interface GCRepository (Index)
 - (BOOL)resetIndexToHEAD:(NSError**)error;  // Like git reset --mixed HEAD but does not update reflog
diff --git a/GitUpKit/Extensions/GCRepository+Index.m b/GitUpKit/Extensions/GCRepository+Index.m
index 58c83527..7aab6593 100644
--- a/GitUpKit/Extensions/GCRepository+Index.m
+++ b/GitUpKit/Extensions/GCRepository+Index.m
@@ -17,7 +17,7 @@
 #error This file requires ARC
 #endif
 
-#import "GCRepository+Index.h"
+#import <GitUpKit/GCRepository+Index.h>
 
 #import "XLFacilityMacros.h"
 
diff --git a/GitUpKit/Extensions/GCRepository+Utilities-Tests.m b/GitUpKit/Extensions/GCRepository+Utilities-Tests.m
index 438ba724..3a6a0b3c 100644
--- a/GitUpKit/Extensions/GCRepository+Utilities-Tests.m
+++ b/GitUpKit/Extensions/GCRepository+Utilities-Tests.m
@@ -18,8 +18,8 @@
 #endif
 
 #import "GCTestCase.h"
-#import "GCRepository+Utilities.h"
-#import "GCRepository+Index.h"
+#import <GitUpKit/GCRepository+Utilities.h>
+#import <GitUpKit/GCRepository+Index.h>
 
 // TODO: Test -fetchDefaultRemoteBranchesFromAllRemotes:
 // TODO: Test -fetchAllTagsFromAllRemotes:
diff --git a/GitUpKit/Extensions/GCRepository+Utilities.h b/GitUpKit/Extensions/GCRepository+Utilities.h
index fa902d0a..317f7488 100644
--- a/GitUpKit/Extensions/GCRepository+Utilities.h
+++ b/GitUpKit/Extensions/GCRepository+Utilities.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GCCore.h"
+#import <GitUpKit/GCCore.h>
 
 typedef NS_ENUM(NSUInteger, GCHostingService) {
   kGCHostingService_Unknown = 0,
diff --git a/GitUpKit/Extensions/GCRepository+Utilities.m b/GitUpKit/Extensions/GCRepository+Utilities.m
index 68c6ba57..153ed7df 100644
--- a/GitUpKit/Extensions/GCRepository+Utilities.m
+++ b/GitUpKit/Extensions/GCRepository+Utilities.m
@@ -19,8 +19,8 @@
 
 #import <objc/runtime.h>
 
-#import "GCRepository+Utilities.h"
-#import "GCRepository+Index.h"
+#import <GitUpKit/GCRepository+Utilities.h>
+#import <GitUpKit/GCRepository+Index.h>
 
 #import "XLFacilityMacros.h"
 
diff --git a/GitUpKit/Interface/GIDiffView.m b/GitUpKit/Interface/GIDiffView.m
index 29fe6df7..37a83fca 100644
--- a/GitUpKit/Interface/GIDiffView.m
+++ b/GitUpKit/Interface/GIDiffView.m
@@ -18,7 +18,7 @@
 #endif
 
 #import "GIPrivate.h"
-#import "GIAppKit.h"
+#import <GitUpKit/GIAppKit.h>
 
 #define kTextLineHeightPadding 3
 #define kTextLineDescentAdjustment 1
diff --git a/GitUpKit/Interface/GIImageDiffView.m b/GitUpKit/Interface/GIImageDiffView.m
index 91317220..15053358 100644
--- a/GitUpKit/Interface/GIImageDiffView.m
+++ b/GitUpKit/Interface/GIImageDiffView.m
@@ -3,7 +3,7 @@
 #endif
 
 #import "GIPrivate.h"
-#import "GILaunchServicesLocator.h"
+#import <GitUpKit/GILaunchServicesLocator.h>
 #import <QuartzCore/CATransaction.h>
 #import <ImageIO/ImageIO.h>
 
diff --git a/GitUpKit/Interface/GIInterface.h b/GitUpKit/Interface/GIInterface.h
index b97c3646..1bf34024 100644
--- a/GitUpKit/Interface/GIInterface.h
+++ b/GitUpKit/Interface/GIInterface.h
@@ -23,21 +23,21 @@
 #endif
 #endif
 
-#import "GCCore.h"
+#import <GitUpKit/GCCore.h>
 
-#import "GIBranch.h"
-#import "GIConstants.h"
-#import "GIFunctions.h"
-#import "GIGraph.h"
-#import "GILayer.h"
-#import "GILine.h"
-#import "GINode.h"
+#import <GitUpKit/GIBranch.h>
+#import <GitUpKit/GIConstants.h>
+#import <GitUpKit/GIFunctions.h>
+#import <GitUpKit/GIGraph.h>
+#import <GitUpKit/GILayer.h>
+#import <GitUpKit/GILine.h>
+#import <GitUpKit/GINode.h>
 
 #if __GI_HAS_APPKIT__
-#import "GIDiffView.h"
-#import "GIGraphView.h"
-#import "GISplitDiffView.h"
-#import "GIUnifiedDiffView.h"
-#import "NSColor+GINamedColors.h"
-#import "GIImageDiffView.h"
+#import <GitUpKit/GIDiffView.h>
+#import <GitUpKit/GIGraphView.h>
+#import <GitUpKit/GISplitDiffView.h>
+#import <GitUpKit/GIUnifiedDiffView.h>
+#import <GitUpKit/NSColor+GINamedColors.h>
+#import <GitUpKit/GIImageDiffView.h>
 #endif
diff --git a/GitUpKit/Interface/GIPrivate.h b/GitUpKit/Interface/GIPrivate.h
index da17a35d..b4a89ff2 100644
--- a/GitUpKit/Interface/GIPrivate.h
+++ b/GitUpKit/Interface/GIPrivate.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GIInterface.h"
+#import <GitUpKit/GIInterface.h>
 
 #import "XLFacilityMacros.h"
 #import "NSBundle+GitUpKit.h"
diff --git a/GitUpKit/Interface/GISplitDiffView.h b/GitUpKit/Interface/GISplitDiffView.h
index 74a9c8a0..3f6823ac 100644
--- a/GitUpKit/Interface/GISplitDiffView.h
+++ b/GitUpKit/Interface/GISplitDiffView.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GIDiffView.h"
+#import <GitUpKit/GIDiffView.h>
 
 @interface GISplitDiffView : GIDiffView
 @end
diff --git a/GitUpKit/Interface/GISplitDiffView.m b/GitUpKit/Interface/GISplitDiffView.m
index 3ffedc55..924d0d73 100644
--- a/GitUpKit/Interface/GISplitDiffView.m
+++ b/GitUpKit/Interface/GISplitDiffView.m
@@ -18,7 +18,7 @@
 #endif
 
 #import "GIPrivate.h"
-#import "GIAppKit.h"
+#import <GitUpKit/GIAppKit.h>
 
 #define kTextBottomPadding 0
 
diff --git a/GitUpKit/Interface/GIUnifiedDiffView.h b/GitUpKit/Interface/GIUnifiedDiffView.h
index 6d363b4f..1efff633 100644
--- a/GitUpKit/Interface/GIUnifiedDiffView.h
+++ b/GitUpKit/Interface/GIUnifiedDiffView.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GIDiffView.h"
+#import <GitUpKit/GIDiffView.h>
 
 @interface GIUnifiedDiffView : GIDiffView
 @end
diff --git a/GitUpKit/Interface/GIUnifiedDiffView.m b/GitUpKit/Interface/GIUnifiedDiffView.m
index 7a15e3f8..ff3fb7c8 100644
--- a/GitUpKit/Interface/GIUnifiedDiffView.m
+++ b/GitUpKit/Interface/GIUnifiedDiffView.m
@@ -18,7 +18,7 @@
 #endif
 
 #import "GIPrivate.h"
-#import "GIAppKit.h"
+#import <GitUpKit/GIAppKit.h>
 
 #define kTextBottomPadding 0
 
diff --git a/GitUpKit/Utilities/GIAppKit.m b/GitUpKit/Utilities/GIAppKit.m
index 8d47c4cb..f5f9009f 100644
--- a/GitUpKit/Utilities/GIAppKit.m
+++ b/GitUpKit/Utilities/GIAppKit.m
@@ -19,8 +19,8 @@
 
 #import <objc/runtime.h>
 
-#import "GIAppKit.h"
-#import "GIConstants.h"
+#import <GitUpKit/GIAppKit.h>
+#import <GitUpKit/GIConstants.h>
 #import "NSColor+GINamedColors.h"
 
 #import "XLFacilityMacros.h"
diff --git a/GitUpKit/Utilities/GIColorView.m b/GitUpKit/Utilities/GIColorView.m
index 5022cdc3..5330ab63 100644
--- a/GitUpKit/Utilities/GIColorView.m
+++ b/GitUpKit/Utilities/GIColorView.m
@@ -17,7 +17,7 @@
 #error This file requires ARC
 #endif
 
-#import "GIColorView.h"
+#import <GitUpKit/GIColorView.h>
 
 @implementation GIColorView
 
diff --git a/GitUpKit/Utilities/GICustomToolbarItem.m b/GitUpKit/Utilities/GICustomToolbarItem.m
index 922e423d..51aa0ec7 100644
--- a/GitUpKit/Utilities/GICustomToolbarItem.m
+++ b/GitUpKit/Utilities/GICustomToolbarItem.m
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GICustomToolbarItem.h"
+#import <GitUpKit/GICustomToolbarItem.h>
 
 @implementation GICustomToolbarItem
 
diff --git a/GitUpKit/Utilities/GILaunchServicesLocator.m b/GitUpKit/Utilities/GILaunchServicesLocator.m
index 087bfce3..bb8aa445 100644
--- a/GitUpKit/Utilities/GILaunchServicesLocator.m
+++ b/GitUpKit/Utilities/GILaunchServicesLocator.m
@@ -5,7 +5,7 @@
 //  Created by Dmitry Lobanov on 08.10.2019.
 //
 
-#import "GILaunchServicesLocator.h"
+#import <GitUpKit/GILaunchServicesLocator.h>
 #import "XLFacilityMacros.h"
 
 // Settings
diff --git a/GitUpKit/Utilities/GILinkButton.m b/GitUpKit/Utilities/GILinkButton.m
index 8cf4d2c5..c52c6646 100644
--- a/GitUpKit/Utilities/GILinkButton.m
+++ b/GitUpKit/Utilities/GILinkButton.m
@@ -17,7 +17,7 @@
 #error This file requires ARC
 #endif
 
-#import "GILinkButton.h"
+#import <GitUpKit/GILinkButton.h>
 
 @implementation GILinkButton {
   BOOL _highlighted;
diff --git a/GitUpKit/Utilities/GIModalView.m b/GitUpKit/Utilities/GIModalView.m
index 0793410d..60cf1ef9 100644
--- a/GitUpKit/Utilities/GIModalView.m
+++ b/GitUpKit/Utilities/GIModalView.m
@@ -20,7 +20,7 @@
 #import <QuartzCore/QuartzCore.h>
 #import <sys/sysctl.h>
 
-#import "GIModalView.h"
+#import <GitUpKit/GIModalView.h>
 
 #import "XLFacilityMacros.h"
 #import "NSColor+GINamedColors.h"
diff --git a/GitUpKit/Utilities/GIViewController+Utilities.h b/GitUpKit/Utilities/GIViewController+Utilities.h
index d7a6cc14..55a4a137 100644
--- a/GitUpKit/Utilities/GIViewController+Utilities.h
+++ b/GitUpKit/Utilities/GIViewController+Utilities.h
@@ -13,8 +13,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GIViewController.h"
-#import "GILaunchServicesLocator.h"
+#import <GitUpKit/GIViewController.h>
+#import <GitUpKit/GILaunchServicesLocator.h>
 
 @protocol GCMergeConflictResolver;
 
diff --git a/GitUpKit/Utilities/GIViewController+Utilities.m b/GitUpKit/Utilities/GIViewController+Utilities.m
index 96bb290a..8d015767 100644
--- a/GitUpKit/Utilities/GIViewController+Utilities.m
+++ b/GitUpKit/Utilities/GIViewController+Utilities.m
@@ -17,14 +17,14 @@
 #error This file requires ARC
 #endif
 
-#import "GIViewController+Utilities.h"
-#import "GIWindowController.h"
-
-#import "GCCore.h"
-#import "GCRepository+Index.h"
-#import "GCRepository+Utilities.h"
-#import "GCLiveRepository+Conflicts.h"
-#import "GIAppKit.h"
+#import <GitUpKit/GIViewController+Utilities.h>
+#import <GitUpKit/GIWindowController.h>
+
+#import <GitUpKit/GCCore.h>
+#import <GitUpKit/GCRepository+Index.h>
+#import <GitUpKit/GCRepository+Utilities.h>
+#import <GitUpKit/GCLiveRepository+Conflicts.h>
+#import <GitUpKit/GIAppKit.h>
 #import "XLFacilityMacros.h"
 
 #define kOpenDiffPath @"/usr/bin/opendiff"
diff --git a/GitUpKit/Utilities/GIViewController.h b/GitUpKit/Utilities/GIViewController.h
index 82a1deb9..41d064c3 100644
--- a/GitUpKit/Utilities/GIViewController.h
+++ b/GitUpKit/Utilities/GIViewController.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GIAppKit.h"
+#import <GitUpKit/GIAppKit.h>
 
 @class GIWindowController, GIViewController, GCLiveRepository, GCSnapshot;
 
diff --git a/GitUpKit/Utilities/GIViewController.m b/GitUpKit/Utilities/GIViewController.m
index 6975cbff..d09febde 100644
--- a/GitUpKit/Utilities/GIViewController.m
+++ b/GitUpKit/Utilities/GIViewController.m
@@ -19,10 +19,10 @@
 
 #import <objc/runtime.h>
 
-#import "GIViewController.h"
-#import "GIWindowController.h"
+#import <GitUpKit/GIViewController.h>
+#import <GitUpKit/GIWindowController.h>
 
-#import "GIInterface.h"
+#import <GitUpKit/GIInterface.h>
 #import "XLFacilityMacros.h"
 
 @interface GIView ()
diff --git a/GitUpKit/Utilities/GIWindowController.h b/GitUpKit/Utilities/GIWindowController.h
index f0a55c5c..86f66024 100644
--- a/GitUpKit/Utilities/GIWindowController.h
+++ b/GitUpKit/Utilities/GIWindowController.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GIViewController.h"
+#import <GitUpKit/GIViewController.h>
 
 typedef NS_ENUM(NSUInteger, GIOverlayStyle) {
   kGIOverlayStyle_Help = 0,
diff --git a/GitUpKit/Utilities/GIWindowController.m b/GitUpKit/Utilities/GIWindowController.m
index c86e7466..6481b981 100644
--- a/GitUpKit/Utilities/GIWindowController.m
+++ b/GitUpKit/Utilities/GIWindowController.m
@@ -19,13 +19,13 @@
 
 #import <QuartzCore/QuartzCore.h>
 
-#import "GIWindowController.h"
-#import "GIModalView.h"
-#import "GIColorView.h"
-#import "GIConstants.h"
+#import <GitUpKit/GIWindowController.h>
+#import <GitUpKit/GIModalView.h>
+#import <GitUpKit/GIColorView.h>
+#import <GitUpKit/GIConstants.h>
 
 #import "XLFacilityMacros.h"
-#import "GIGraphView.h"
+#import <GitUpKit/GIGraphView.h>
 
 #define kOverlayAnimationInDuration 0.2  // seconds
 #define kOverlayAnimationOutDuration 0.15  // seconds
diff --git a/GitUpKit/Utilities/NSBundle+GitUpKit.m b/GitUpKit/Utilities/NSBundle+GitUpKit.m
index 8e988ac3..5f57e570 100644
--- a/GitUpKit/Utilities/NSBundle+GitUpKit.m
+++ b/GitUpKit/Utilities/NSBundle+GitUpKit.m
@@ -14,7 +14,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #import "NSBundle+GitUpKit.h"
-#import "GIBranch.h"  // just any class included on all platforms
+#import <GitUpKit/GIBranch.h>  // just any class included on all platforms
 
 @implementation NSBundle (GitUpKit)
 
diff --git a/GitUpKit/Utilities/NSColor+GINamedColors.h b/GitUpKit/Utilities/NSColor+GINamedColors.h
index 469a51c6..c2a975b4 100644
--- a/GitUpKit/Utilities/NSColor+GINamedColors.h
+++ b/GitUpKit/Utilities/NSColor+GINamedColors.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GIAppKit.h"
+#import <GitUpKit/GIAppKit.h>
 
 @interface NSColor (GINamedColors)
 
diff --git a/GitUpKit/Views/GIAdvancedCommitViewController.h b/GitUpKit/Views/GIAdvancedCommitViewController.h
index 9994335d..b3d46084 100644
--- a/GitUpKit/Views/GIAdvancedCommitViewController.h
+++ b/GitUpKit/Views/GIAdvancedCommitViewController.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GICommitViewController.h"
+#import <GitUpKit/GICommitViewController.h>
 
 @interface GIAdvancedCommitViewController : GICommitViewController
 @end
diff --git a/GitUpKit/Views/GIAdvancedCommitViewController.m b/GitUpKit/Views/GIAdvancedCommitViewController.m
index 75dfd4f2..7ccfc03b 100644
--- a/GitUpKit/Views/GIAdvancedCommitViewController.m
+++ b/GitUpKit/Views/GIAdvancedCommitViewController.m
@@ -17,15 +17,15 @@
 #error This file requires ARC
 #endif
 
-#import "GIAdvancedCommitViewController.h"
-#import "GIDiffFilesViewController.h"
-#import "GIDiffContentsViewController.h"
-#import "GIRemappingExplanationPopover.h"
-#import "GIViewController+Utilities.h"
-
-#import "GIColorView.h"
-#import "GIInterface.h"
-#import "GIWindowController.h"
+#import <GitUpKit/GIAdvancedCommitViewController.h>
+#import <GitUpKit/GIDiffFilesViewController.h>
+#import <GitUpKit/GIDiffContentsViewController.h>
+#import <GitUpKit/GIRemappingExplanationPopover.h>
+#import <GitUpKit/GIViewController+Utilities.h>
+
+#import <GitUpKit/GIColorView.h>
+#import <GitUpKit/GIInterface.h>
+#import <GitUpKit/GIWindowController.h>
 #import "XLFacilityMacros.h"
 
 @interface GIAdvancedCommitViewController () <GIDiffFilesViewControllerDelegate, GIDiffContentsViewControllerDelegate>
diff --git a/GitUpKit/Views/GICommitRewriterViewController.h b/GitUpKit/Views/GICommitRewriterViewController.h
index b75c3908..340f0f0b 100644
--- a/GitUpKit/Views/GICommitRewriterViewController.h
+++ b/GitUpKit/Views/GICommitRewriterViewController.h
@@ -13,8 +13,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GICommitViewController.h"
-#import "GIViewController+Utilities.h"
+#import <GitUpKit/GICommitViewController.h>
+#import <GitUpKit/GIViewController+Utilities.h>
 
 @class GICommitRewriterViewController, GCHistoryCommit;
 
diff --git a/GitUpKit/Views/GICommitRewriterViewController.m b/GitUpKit/Views/GICommitRewriterViewController.m
index 18d0b4dd..ab0f1fe8 100644
--- a/GitUpKit/Views/GICommitRewriterViewController.m
+++ b/GitUpKit/Views/GICommitRewriterViewController.m
@@ -17,14 +17,14 @@
 #error This file requires ARC
 #endif
 
-#import "GICommitRewriterViewController.h"
-#import "GIDiffContentsViewController.h"
-#import "GIDiffFilesViewController.h"
-#import "GIWindowController.h"
-
-#import "GIInterface.h"
-#import "GCRepository+Utilities.h"
-#import "GCHistory+Rewrite.h"
+#import <GitUpKit/GICommitRewriterViewController.h>
+#import <GitUpKit/GIDiffContentsViewController.h>
+#import <GitUpKit/GIDiffFilesViewController.h>
+#import <GitUpKit/GIWindowController.h>
+
+#import <GitUpKit/GIInterface.h>
+#import <GitUpKit/GCRepository+Utilities.h>
+#import <GitUpKit/GCHistory+Rewrite.h>
 #import "XLFacilityMacros.h"
 
 @interface GICommitRewriterViewController () <GIDiffContentsViewControllerDelegate, GIDiffFilesViewControllerDelegate>
diff --git a/GitUpKit/Views/GICommitSplitterViewController.h b/GitUpKit/Views/GICommitSplitterViewController.h
index f2c24658..9d2c5c3d 100644
--- a/GitUpKit/Views/GICommitSplitterViewController.h
+++ b/GitUpKit/Views/GICommitSplitterViewController.h
@@ -13,8 +13,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GISimpleCommitViewController.h"
-#import "GIViewController+Utilities.h"
+#import <GitUpKit/GISimpleCommitViewController.h>
+#import <GitUpKit/GIViewController+Utilities.h>
 
 @class GICommitSplitterViewController, GCHistoryCommit;
 
diff --git a/GitUpKit/Views/GICommitSplitterViewController.m b/GitUpKit/Views/GICommitSplitterViewController.m
index 2dc8860a..f4b75614 100644
--- a/GitUpKit/Views/GICommitSplitterViewController.m
+++ b/GitUpKit/Views/GICommitSplitterViewController.m
@@ -17,15 +17,15 @@
 #error This file requires ARC
 #endif
 
-#import "GICommitSplitterViewController.h"
-#import "GIDiffFilesViewController.h"
-#import "GIDiffContentsViewController.h"
-
-#import "GCCore.h"
-#import "GIColorView.h"
-#import "GIInterface.h"
-#import "GCHistory+Rewrite.h"
-#import "GIWindowController.h"
+#import <GitUpKit/GICommitSplitterViewController.h>
+#import <GitUpKit/GIDiffFilesViewController.h>
+#import <GitUpKit/GIDiffContentsViewController.h>
+
+#import <GitUpKit/GCCore.h>
+#import <GitUpKit/GIColorView.h>
+#import <GitUpKit/GIInterface.h>
+#import <GitUpKit/GCHistory+Rewrite.h>
+#import <GitUpKit/GIWindowController.h>
 #import "XLFacilityMacros.h"
 
 #define kGCDefaultMaxDiffContextLines 3
diff --git a/GitUpKit/Views/GICommitViewController.h b/GitUpKit/Views/GICommitViewController.h
index f302b381..8e4def72 100644
--- a/GitUpKit/Views/GICommitViewController.h
+++ b/GitUpKit/Views/GICommitViewController.h
@@ -13,9 +13,9 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GIViewController.h"
+#import <GitUpKit/GIViewController.h>
 
-#import "GCDiff.h"
+#import <GitUpKit/GCDiff.h>
 
 @class GICommitViewController, GCCommit, GCSubmodule, GCIndexConflict, GICommitMessageView;
 
diff --git a/GitUpKit/Views/GICommitViewController.m b/GitUpKit/Views/GICommitViewController.m
index e8b4c190..d0e7186f 100644
--- a/GitUpKit/Views/GICommitViewController.m
+++ b/GitUpKit/Views/GICommitViewController.m
@@ -17,9 +17,9 @@
 #error This file requires ARC
 #endif
 
-#import "GICommitViewController.h"
+#import <GitUpKit/GICommitViewController.h>
 
-#import "GIInterface.h"
+#import <GitUpKit/GIInterface.h>
 #import "XLFacilityMacros.h"
 
 @implementation GICommitViewController {
diff --git a/GitUpKit/Views/GIConfigViewController.h b/GitUpKit/Views/GIConfigViewController.h
index a468a100..c407c584 100644
--- a/GitUpKit/Views/GIConfigViewController.h
+++ b/GitUpKit/Views/GIConfigViewController.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GIViewController.h"
+#import <GitUpKit/GIViewController.h>
 
 @interface GIConfigViewController : GIViewController
 @end
diff --git a/GitUpKit/Views/GIConfigViewController.m b/GitUpKit/Views/GIConfigViewController.m
index 84538451..75e195d6 100644
--- a/GitUpKit/Views/GIConfigViewController.m
+++ b/GitUpKit/Views/GIConfigViewController.m
@@ -17,10 +17,10 @@
 #error This file requires ARC
 #endif
 
-#import "GIConfigViewController.h"
-#import "GIWindowController.h"
+#import <GitUpKit/GIConfigViewController.h>
+#import <GitUpKit/GIWindowController.h>
 
-#import "GIInterface.h"
+#import <GitUpKit/GIInterface.h>
 #import "XLFacilityMacros.h"
 
 @interface GIConfigViewController () <NSTableViewDataSource>
diff --git a/GitUpKit/Views/GIConflictResolverViewController.h b/GitUpKit/Views/GIConflictResolverViewController.h
index 5a10f9fa..34cacebf 100644
--- a/GitUpKit/Views/GIConflictResolverViewController.h
+++ b/GitUpKit/Views/GIConflictResolverViewController.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GIViewController.h"
+#import <GitUpKit/GIViewController.h>
 
 @class GCCommit, GIConflictResolverViewController;
 
diff --git a/GitUpKit/Views/GIConflictResolverViewController.m b/GitUpKit/Views/GIConflictResolverViewController.m
index f94e3b52..f967fcf5 100644
--- a/GitUpKit/Views/GIConflictResolverViewController.m
+++ b/GitUpKit/Views/GIConflictResolverViewController.m
@@ -17,12 +17,12 @@
 #error This file requires ARC
 #endif
 
-#import "GIConflictResolverViewController.h"
-#import "GIDiffContentsViewController.h"
-#import "GIDiffFilesViewController.h"
-#import "GIViewController+Utilities.h"
+#import <GitUpKit/GIConflictResolverViewController.h>
+#import <GitUpKit/GIDiffContentsViewController.h>
+#import <GitUpKit/GIDiffFilesViewController.h>
+#import <GitUpKit/GIViewController+Utilities.h>
 
-#import "GIInterface.h"
+#import <GitUpKit/GIInterface.h>
 #import "XLFacilityMacros.h"
 
 @interface GIConflictResolverViewController () <GIDiffContentsViewControllerDelegate, GIDiffFilesViewControllerDelegate>
diff --git a/GitUpKit/Views/GIDiffViewController.h b/GitUpKit/Views/GIDiffViewController.h
index 4565ca17..599eca5f 100644
--- a/GitUpKit/Views/GIDiffViewController.h
+++ b/GitUpKit/Views/GIDiffViewController.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GIViewController.h"
+#import <GitUpKit/GIViewController.h>
 
 @class GCCommit;
 
diff --git a/GitUpKit/Views/GIDiffViewController.m b/GitUpKit/Views/GIDiffViewController.m
index c1a987fe..9d20c12d 100644
--- a/GitUpKit/Views/GIDiffViewController.m
+++ b/GitUpKit/Views/GIDiffViewController.m
@@ -17,11 +17,11 @@
 #error This file requires ARC
 #endif
 
-#import "GIDiffViewController.h"
-#import "GIDiffContentsViewController.h"
-#import "GIDiffFilesViewController.h"
+#import <GitUpKit/GIDiffViewController.h>
+#import <GitUpKit/GIDiffContentsViewController.h>
+#import <GitUpKit/GIDiffFilesViewController.h>
 
-#import "GIInterface.h"
+#import <GitUpKit/GIInterface.h>
 #import "XLFacilityMacros.h"
 
 @interface GIDiffViewController () <GIDiffContentsViewControllerDelegate, GIDiffFilesViewControllerDelegate>
diff --git a/GitUpKit/Views/GIMapViewController+Operations.h b/GitUpKit/Views/GIMapViewController+Operations.h
index 8263b3fc..1b6df0c9 100644
--- a/GitUpKit/Views/GIMapViewController+Operations.h
+++ b/GitUpKit/Views/GIMapViewController+Operations.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GIMapViewController.h"
+#import <GitUpKit/GIMapViewController.h>
 
 @class GCBranch, GCLocalBranch, GCHistoryLocalBranch, GCHistoryRemoteBranch, GCHistoryTag, GCRemote;
 
diff --git a/GitUpKit/Views/GIMapViewController+Operations.m b/GitUpKit/Views/GIMapViewController+Operations.m
index 6e5ee9b2..3af3f45f 100644
--- a/GitUpKit/Views/GIMapViewController+Operations.m
+++ b/GitUpKit/Views/GIMapViewController+Operations.m
@@ -17,11 +17,11 @@
 #error This file requires ARC
 #endif
 
-#import "GIMapViewController+Operations.h"
+#import <GitUpKit/GIMapViewController+Operations.h>
 
-#import "GIWindowController.h"
-#import "GCRepository+Utilities.h"
-#import "GCHistory+Rewrite.h"
+#import <GitUpKit/GIWindowController.h>
+#import <GitUpKit/GCRepository+Utilities.h>
+#import <GitUpKit/GCHistory+Rewrite.h>
 #import "XLFacilityMacros.h"
 
 #define kUserDefaultsPrefix @"GIMapViewController_"
diff --git a/GitUpKit/Views/GIMapViewController.h b/GitUpKit/Views/GIMapViewController.h
index a4dd210d..589fda74 100644
--- a/GitUpKit/Views/GIMapViewController.h
+++ b/GitUpKit/Views/GIMapViewController.h
@@ -13,10 +13,10 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GIViewController+Utilities.h"
+#import <GitUpKit/GIViewController+Utilities.h>
 
-#import "GCLiveRepository+Conflicts.h"
-#import "GCRepository.h"
+#import <GitUpKit/GCLiveRepository+Conflicts.h>
+#import <GitUpKit/GCRepository.h>
 
 @class GIMapViewController, GIGraph, GINode, GCHistory, GCHistoryCommit, GCCommit;
 
diff --git a/GitUpKit/Views/GIMapViewController.m b/GitUpKit/Views/GIMapViewController.m
index f40ddc5f..69efaed9 100644
--- a/GitUpKit/Views/GIMapViewController.m
+++ b/GitUpKit/Views/GIMapViewController.m
@@ -17,13 +17,13 @@
 #error This file requires ARC
 #endif
 
-#import "GIMapViewController+Operations.h"
+#import <GitUpKit/GIMapViewController+Operations.h>
 
-#import "GIWindowController.h"
-#import "GIInterface.h"
-#import "GCLiveRepository+Utilities.h"
-#import "GCRepository+Utilities.h"
-#import "GCHistory+Rewrite.h"
+#import <GitUpKit/GIWindowController.h>
+#import <GitUpKit/GIInterface.h>
+#import <GitUpKit/GCLiveRepository+Utilities.h>
+#import <GitUpKit/GCRepository+Utilities.h>
+#import <GitUpKit/GCHistory+Rewrite.h>
 #import "XLFacilityMacros.h"
 #import "NSBundle+GitUpKit.h"
 
diff --git a/GitUpKit/Views/GIQuickViewController.h b/GitUpKit/Views/GIQuickViewController.h
index a8c08f79..1eb1adb6 100644
--- a/GitUpKit/Views/GIQuickViewController.h
+++ b/GitUpKit/Views/GIQuickViewController.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GIViewController.h"
+#import <GitUpKit/GIViewController.h>
 
 @class GCHistoryCommit;
 
diff --git a/GitUpKit/Views/GIQuickViewController.m b/GitUpKit/Views/GIQuickViewController.m
index 2c162a16..a4fec32a 100644
--- a/GitUpKit/Views/GIQuickViewController.m
+++ b/GitUpKit/Views/GIQuickViewController.m
@@ -17,12 +17,12 @@
 #error This file requires ARC
 #endif
 
-#import "GIQuickViewController.h"
-#import "GIDiffContentsViewController.h"
-#import "GIDiffFilesViewController.h"
-#import "GIViewController+Utilities.h"
+#import <GitUpKit/GIQuickViewController.h>
+#import <GitUpKit/GIDiffContentsViewController.h>
+#import <GitUpKit/GIDiffFilesViewController.h>
+#import <GitUpKit/GIViewController+Utilities.h>
 
-#import "GIInterface.h"
+#import <GitUpKit/GIInterface.h>
 #import "XLFacilityMacros.h"
 
 @interface GIQuickViewController () <GIDiffContentsViewControllerDelegate, GIDiffFilesViewControllerDelegate>
diff --git a/GitUpKit/Views/GIRemappingExplanationPopover.m b/GitUpKit/Views/GIRemappingExplanationPopover.m
index 8dffde5e..1eec0642 100644
--- a/GitUpKit/Views/GIRemappingExplanationPopover.m
+++ b/GitUpKit/Views/GIRemappingExplanationPopover.m
@@ -5,7 +5,7 @@
 //  Created by Lucas Derraugh on 3/3/24.
 //
 
-#import "GIRemappingExplanationPopover.h"
+#import <GitUpKit/GIRemappingExplanationPopover.h>
 
 static NSString* const GIRemappingExplanationShownUserDefaultKey = @"GIRemappingExplanationShownUserDefaultKey";
 
diff --git a/GitUpKit/Views/GISimpleCommitViewController.h b/GitUpKit/Views/GISimpleCommitViewController.h
index bdeae4fc..b281edbb 100644
--- a/GitUpKit/Views/GISimpleCommitViewController.h
+++ b/GitUpKit/Views/GISimpleCommitViewController.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GICommitViewController.h"
+#import <GitUpKit/GICommitViewController.h>
 
 @interface GISimpleCommitViewController : GICommitViewController
 @end
diff --git a/GitUpKit/Views/GISimpleCommitViewController.m b/GitUpKit/Views/GISimpleCommitViewController.m
index 19b56634..3c9b828e 100644
--- a/GitUpKit/Views/GISimpleCommitViewController.m
+++ b/GitUpKit/Views/GISimpleCommitViewController.m
@@ -17,14 +17,14 @@
 #error This file requires ARC
 #endif
 
-#import "GISimpleCommitViewController.h"
-#import "GIDiffContentsViewController.h"
-#import "GIDiffFilesViewController.h"
-#import "GIRemappingExplanationPopover.h"
-#import "GIViewController+Utilities.h"
-
-#import "GIInterface.h"
-#import "GCRepository+Utilities.h"
+#import <GitUpKit/GISimpleCommitViewController.h>
+#import <GitUpKit/GIDiffContentsViewController.h>
+#import <GitUpKit/GIDiffFilesViewController.h>
+#import <GitUpKit/GIRemappingExplanationPopover.h>
+#import <GitUpKit/GIViewController+Utilities.h>
+
+#import <GitUpKit/GIInterface.h>
+#import <GitUpKit/GCRepository+Utilities.h>
 #import "XLFacilityMacros.h"
 
 @interface GISimpleCommitViewController () <GIDiffContentsViewControllerDelegate, GIDiffFilesViewControllerDelegate>
diff --git a/GitUpKit/Views/GIStashListViewController.h b/GitUpKit/Views/GIStashListViewController.h
index a28150db..87f11e0d 100644
--- a/GitUpKit/Views/GIStashListViewController.h
+++ b/GitUpKit/Views/GIStashListViewController.h
@@ -13,7 +13,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "GIViewController.h"
+#import <GitUpKit/GIViewController.h>
 
 @interface GIStashListViewController : GIViewController
 @end
diff --git a/GitUpKit/Views/GIStashListViewController.m b/GitUpKit/Views/GIStashListViewController.m
index 20e449a0..c58e5fbc 100644
--- a/GitUpKit/Views/GIStashListViewController.m
+++ b/GitUpKit/Views/GIStashListViewController.m
@@ -17,11 +17,11 @@
 #error This file requires ARC
 #endif
 
-#import "GIStashListViewController.h"
-#import "GIDiffContentsViewController.h"
-#import "GIWindowController.h"
+#import <GitUpKit/GIStashListViewController.h>
+#import <GitUpKit/GIDiffContentsViewController.h>
+#import <GitUpKit/GIWindowController.h>
 
-#import "GIInterface.h"
+#import <GitUpKit/GIInterface.h>
 #import "XLFacilityMacros.h"
 
 #define kUserDefaultsPrefix @"GIStashListViewController_"