diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj
index 7d0b9d44d..dc2748d6d 100644
--- a/Transmission.xcodeproj/project.pbxproj
+++ b/Transmission.xcodeproj/project.pbxproj
@@ -606,7 +606,6 @@
 		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		2B9BA6C508B488FE586A0AB1 /* torrents.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = torrents.cc; sourceTree = "<group>"; };
 		2B9BA6C508B488FE586A0AB3 /* torrents.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = torrents.h; sourceTree = "<group>"; };
-		32CA4F630368D1EE00C91783 /* Transmission_Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Transmission_Prefix.pch; sourceTree = "<group>"; };
 		35F373000C2DA88F00DAA8F2 /* FilePriorityCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FilePriorityCell.h; sourceTree = "<group>"; };
 		35F373010C2DA88F00DAA8F2 /* FilePriorityCell.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = FilePriorityCell.mm; sourceTree = "<group>"; };
 		3C7A118D0D0B2EB800B5701F /* libnatpmp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libnatpmp.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1386,7 +1385,6 @@
 		080E96DDFE201D6D7F000001 /* Sources */ = {
 			isa = PBXGroup;
 			children = (
-				32CA4F630368D1EE00C91783 /* Transmission_Prefix.pch */,
 				29B97316FDCFA39411CA2CEA /* main.mm */,
 				C86BCD9828228A9600F45599 /* SparkleProxy.mm */,
 				4DF0C5AA0899190500DD8943 /* Controller.h */,
@@ -3627,14 +3625,17 @@
 				CODE_SIGN_IDENTITY = "-";
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = macosx;
-				GCC_PREFIX_HEADER = macosx/Transmission_Prefix.pch;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					.,
 				);
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks";
 				OTHER_CFLAGS = "$(inherited)";
-				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-fmodules",
+					"-fcxx-modules",
+				);
 				OTHER_LDFLAGS = "-lc++";
 				PRODUCT_NAME = Transmission;
 				SYSTEM_HEADER_SEARCH_PATHS = (
@@ -3888,14 +3889,17 @@
 				CODE_SIGN_IDENTITY = "-";
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = macosx;
-				GCC_PREFIX_HEADER = macosx/Transmission_Prefix.pch;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					.,
 				);
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks";
 				OTHER_CFLAGS = "$(inherited)";
-				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-fmodules",
+					"-fcxx-modules",
+				);
 				OTHER_LDFLAGS = "-lc++";
 				PRODUCT_NAME = Transmission;
 				SYSTEM_HEADER_SEARCH_PATHS = (
@@ -4082,14 +4086,17 @@
 				CODE_SIGN_IDENTITY = "-";
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = macosx;
-				GCC_PREFIX_HEADER = macosx/Transmission_Prefix.pch;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					.,
 				);
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks";
 				OTHER_CFLAGS = "$(inherited)";
-				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-fmodules",
+					"-fcxx-modules",
+				);
 				OTHER_LDFLAGS = "-lc++";
 				PRODUCT_NAME = Transmission;
 				SYSTEM_HEADER_SEARCH_PATHS = (
@@ -4272,7 +4279,11 @@
 				INFOPLIST_FILE = "macosx/QuickLookPlugin/QuickLookPlugin-Info.plist";
 				INSTALL_PATH = /Library/QuickLook;
 				OTHER_CFLAGS = "$(inherited)";
-				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-fcxx-modules",
+					"-fmodules",
+				);
 				OTHER_LDFLAGS = "-lc++";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.m0k.transmission.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -4298,7 +4309,11 @@
 				INFOPLIST_FILE = "macosx/QuickLookPlugin/QuickLookPlugin-Info.plist";
 				INSTALL_PATH = /Library/QuickLook;
 				OTHER_CFLAGS = "$(inherited)";
-				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-fcxx-modules",
+					"-fmodules",
+				);
 				OTHER_LDFLAGS = "-lc++";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.m0k.transmission.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -4324,7 +4339,11 @@
 				INFOPLIST_FILE = "macosx/QuickLookPlugin/QuickLookPlugin-Info.plist";
 				INSTALL_PATH = /Library/QuickLook;
 				OTHER_CFLAGS = "$(inherited)";
-				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-fcxx-modules",
+					"-fmodules",
+				);
 				OTHER_LDFLAGS = "-lc++";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.m0k.transmission.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/macosx/AboutWindowController.h b/macosx/AboutWindowController.h
index 2dced0350..ab1035e37 100644
--- a/macosx/AboutWindowController.h
+++ b/macosx/AboutWindowController.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 @interface AboutWindowController : NSWindowController
 
diff --git a/macosx/AddMagnetWindowController.h b/macosx/AddMagnetWindowController.h
index 3eee748d7..e1d32a61a 100644
--- a/macosx/AddMagnetWindowController.h
+++ b/macosx/AddMagnetWindowController.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 @class Controller;
 @class Torrent;
diff --git a/macosx/AddWindowController.h b/macosx/AddWindowController.h
index e5276355c..1d670591d 100644
--- a/macosx/AddWindowController.h
+++ b/macosx/AddWindowController.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 @class Controller;
 @class Torrent;
diff --git a/macosx/BadgeView.h b/macosx/BadgeView.h
index 3e6450a2a..e858d7d35 100644
--- a/macosx/BadgeView.h
+++ b/macosx/BadgeView.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 #include <libtransmission/transmission.h>
 
diff --git a/macosx/Badger.h b/macosx/Badger.h
index 18475fc04..f61a29a7e 100644
--- a/macosx/Badger.h
+++ b/macosx/Badger.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
 
 #include <libtransmission/transmission.h>
 
diff --git a/macosx/BlocklistDownloader.h b/macosx/BlocklistDownloader.h
index 7beadfba8..1dee17f5a 100644
--- a/macosx/BlocklistDownloader.h
+++ b/macosx/BlocklistDownloader.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
 
 @class BlocklistDownloaderViewController;
 
diff --git a/macosx/BlocklistDownloaderViewController.h b/macosx/BlocklistDownloaderViewController.h
index 29b7915d1..79fa3ec5b 100644
--- a/macosx/BlocklistDownloaderViewController.h
+++ b/macosx/BlocklistDownloaderViewController.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
 
 #include <libtransmission/transmission.h>
 
diff --git a/macosx/BlocklistScheduler.h b/macosx/BlocklistScheduler.h
index b8d13d52f..f76668d7a 100644
--- a/macosx/BlocklistScheduler.h
+++ b/macosx/BlocklistScheduler.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/Appkit.h>
 
 @interface BlocklistScheduler : NSObject
 
diff --git a/macosx/ButtonToolbarItem.h b/macosx/ButtonToolbarItem.h
index f945a95a5..c7af70de8 100644
--- a/macosx/ButtonToolbarItem.h
+++ b/macosx/ButtonToolbarItem.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 @interface ButtonToolbarItem : NSToolbarItem
 
diff --git a/macosx/CMakeLists.txt b/macosx/CMakeLists.txt
index 9efaf2730..1d9335a07 100644
--- a/macosx/CMakeLists.txt
+++ b/macosx/CMakeLists.txt
@@ -8,6 +8,8 @@ else()
     add_definitions(-fobjc-arc)
 endif()
 
+add_compile_options(-fmodules -fcxx-modules)
+
 find_program(IBTOOL_EXECUTABLE ibtool REQUIRED)
 find_program(ICONUTIL_EXECUTABLE iconutil REQUIRED)
 find_program(TIFFUTIL_EXECUTABLE tiffutil REQUIRED)
diff --git a/macosx/ColorTextField.h b/macosx/ColorTextField.h
index eb485b2c9..90e0445de 100644
--- a/macosx/ColorTextField.h
+++ b/macosx/ColorTextField.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 @interface ColorTextField : NSTextField
 
diff --git a/macosx/Controller.h b/macosx/Controller.h
index 72a0e08d1..cb134391d 100644
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 #import <Quartz/Quartz.h>
 
 #import <Sparkle/SUUpdaterDelegate.h>
diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 5ace687a9..1cfb0d432 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -2,11 +2,11 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <IOKit/IOMessage.h>
-#import <IOKit/pwr_mgt/IOPMLib.h>
-#import <Carbon/Carbon.h>
+@import IOKit;
+@import IOKit.pwr_mgt;
+@import Carbon;
 
-#import <Sparkle/Sparkle.h>
+@import Sparkle;
 
 #include <atomic> /* atomic, atomic_fetch_add_explicit, memory_order_relaxed */
 
diff --git a/macosx/CreatorWindowController.h b/macosx/CreatorWindowController.h
index 09e3d18cb..86995bf7f 100644
--- a/macosx/CreatorWindowController.h
+++ b/macosx/CreatorWindowController.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 #include <libtransmission/transmission.h>
 
diff --git a/macosx/DragOverlayView.h b/macosx/DragOverlayView.h
index 359b29217..75b552815 100644
--- a/macosx/DragOverlayView.h
+++ b/macosx/DragOverlayView.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 @interface DragOverlayView : NSView
 
diff --git a/macosx/DragOverlayWindow.h b/macosx/DragOverlayWindow.h
index 2d44b8f0f..515670ae8 100644
--- a/macosx/DragOverlayWindow.h
+++ b/macosx/DragOverlayWindow.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 #include <libtransmission/transmission.h>
 
diff --git a/macosx/DragOverlayWindow.mm b/macosx/DragOverlayWindow.mm
index 35b61efcc..8338a7380 100644
--- a/macosx/DragOverlayWindow.mm
+++ b/macosx/DragOverlayWindow.mm
@@ -6,7 +6,6 @@
 #import "DragOverlayView.h"
 #import "NSStringAdditions.h"
 
-#include <libtransmission/transmission.h>
 #include <libtransmission/torrent-metainfo.h>
 
 @interface DragOverlayWindow ()
diff --git a/macosx/ExpandedPathToIconTransformer.mm b/macosx/ExpandedPathToIconTransformer.mm
index 7b33867cb..0da58a946 100644
--- a/macosx/ExpandedPathToIconTransformer.mm
+++ b/macosx/ExpandedPathToIconTransformer.mm
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <AppKit/AppKit.h>
+@import AppKit;
 
 #import "ExpandedPathToIconTransformer.h"
 
diff --git a/macosx/FileListNode.h b/macosx/FileListNode.h
index 97f953428..86fd12a7c 100644
--- a/macosx/FileListNode.h
+++ b/macosx/FileListNode.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
 
 @class Torrent;
 
diff --git a/macosx/FileListNode.mm b/macosx/FileListNode.mm
index fc11e4518..7386f2879 100644
--- a/macosx/FileListNode.mm
+++ b/macosx/FileListNode.mm
@@ -2,6 +2,8 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
+@import AppKit;
+
 #import "FileListNode.h"
 
 @interface FileListNode ()
diff --git a/macosx/FileNameCell.h b/macosx/FileNameCell.h
index 5ca1f1665..8c0442ada 100644
--- a/macosx/FileNameCell.h
+++ b/macosx/FileNameCell.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 @interface FileNameCell : NSActionCell
 
diff --git a/macosx/FileOutlineController.h b/macosx/FileOutlineController.h
index cda4b03d9..047c71ae0 100644
--- a/macosx/FileOutlineController.h
+++ b/macosx/FileOutlineController.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
 
 @class Torrent;
 @class FileOutlineView;
diff --git a/macosx/FileOutlineController.mm b/macosx/FileOutlineController.mm
index 4a585ec88..7478084e0 100644
--- a/macosx/FileOutlineController.mm
+++ b/macosx/FileOutlineController.mm
@@ -2,8 +2,6 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Quartz/Quartz.h>
-
 #import "FileOutlineController.h"
 #import "Torrent.h"
 #import "FileListNode.h"
diff --git a/macosx/FileOutlineView.h b/macosx/FileOutlineView.h
index 139377854..822ac3c2c 100644
--- a/macosx/FileOutlineView.h
+++ b/macosx/FileOutlineView.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 @interface FileOutlineView : NSOutlineView
 
diff --git a/macosx/FilePriorityCell.h b/macosx/FilePriorityCell.h
index 8fbe2185a..bbb0b4efd 100644
--- a/macosx/FilePriorityCell.h
+++ b/macosx/FilePriorityCell.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 @interface FilePriorityCell : NSSegmentedCell
 
diff --git a/macosx/FileRenameSheetController.h b/macosx/FileRenameSheetController.h
index 67aa18e49..58f83ab89 100644
--- a/macosx/FileRenameSheetController.h
+++ b/macosx/FileRenameSheetController.h
@@ -3,7 +3,7 @@
 // License text can be found in the licenses/ folder.
 // Created by Mitchell Livingston on 1/20/13.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 @class FileListNode;
 @class Torrent;
diff --git a/macosx/FilterBarController.h b/macosx/FilterBarController.h
index c226bf209..96c950594 100644
--- a/macosx/FilterBarController.h
+++ b/macosx/FilterBarController.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 #define FILTER_NONE @"None"
 #define FILTER_ACTIVE @"Active"
diff --git a/macosx/FilterBarView.h b/macosx/FilterBarView.h
index 3c201c2dd..e72b5a31d 100644
--- a/macosx/FilterBarView.h
+++ b/macosx/FilterBarView.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 @interface FilterBarView : NSView
 
diff --git a/macosx/FilterButton.h b/macosx/FilterButton.h
index 8fd05649d..f1427c26f 100644
--- a/macosx/FilterButton.h
+++ b/macosx/FilterButton.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 @interface FilterButton : NSButton
 
diff --git a/macosx/GlobalOptionsPopoverViewController.h b/macosx/GlobalOptionsPopoverViewController.h
index 124238029..2fcf40f6c 100644
--- a/macosx/GlobalOptionsPopoverViewController.h
+++ b/macosx/GlobalOptionsPopoverViewController.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 #include <libtransmission/transmission.h>
 
diff --git a/macosx/GroupToolbarItem.h b/macosx/GroupToolbarItem.h
index cc79f31e6..8a464b4bb 100644
--- a/macosx/GroupToolbarItem.h
+++ b/macosx/GroupToolbarItem.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 @interface GroupToolbarItem : NSToolbarItem
 
diff --git a/macosx/GroupsController.h b/macosx/GroupsController.h
index 8454c3c11..9df607b10 100644
--- a/macosx/GroupsController.h
+++ b/macosx/GroupsController.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 @class Torrent;
 
diff --git a/macosx/GroupsPrefsController.h b/macosx/GroupsPrefsController.h
index 6144cb983..b0496c63a 100644
--- a/macosx/GroupsPrefsController.h
+++ b/macosx/GroupsPrefsController.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
 
 @interface GroupsPrefsController : NSObject
 
diff --git a/macosx/InfoActivityViewController.h b/macosx/InfoActivityViewController.h
index 5ce92a71f..bd6b5cb58 100644
--- a/macosx/InfoActivityViewController.h
+++ b/macosx/InfoActivityViewController.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 #import "InfoViewController.h"
 
diff --git a/macosx/InfoFileViewController.h b/macosx/InfoFileViewController.h
index 0f5e60eb3..5bb86065a 100644
--- a/macosx/InfoFileViewController.h
+++ b/macosx/InfoFileViewController.h
@@ -2,8 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
-#import <Quartz/Quartz.h>
+#import <AppKit/AppKit.h>
 
 #import "InfoViewController.h"
 
diff --git a/macosx/InfoGeneralViewController.h b/macosx/InfoGeneralViewController.h
index e8ed1751d..64915bd76 100644
--- a/macosx/InfoGeneralViewController.h
+++ b/macosx/InfoGeneralViewController.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 #import "InfoViewController.h"
 
diff --git a/macosx/InfoOptionsViewController.h b/macosx/InfoOptionsViewController.h
index e9f70c1ce..b108653ee 100644
--- a/macosx/InfoOptionsViewController.h
+++ b/macosx/InfoOptionsViewController.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 #import "InfoViewController.h"
 
diff --git a/macosx/InfoPeersViewController.h b/macosx/InfoPeersViewController.h
index 864539f01..bce085c8d 100644
--- a/macosx/InfoPeersViewController.h
+++ b/macosx/InfoPeersViewController.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 #import "InfoViewController.h"
 
diff --git a/macosx/InfoTextField.h b/macosx/InfoTextField.h
index ea30e3231..063c1ee0b 100644
--- a/macosx/InfoTextField.h
+++ b/macosx/InfoTextField.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 @interface InfoTextField : NSTextField
 
diff --git a/macosx/InfoTrackersViewController.h b/macosx/InfoTrackersViewController.h
index 28142f2ed..e17acb1db 100644
--- a/macosx/InfoTrackersViewController.h
+++ b/macosx/InfoTrackersViewController.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 #import "InfoViewController.h"
 
diff --git a/macosx/InfoViewController.h b/macosx/InfoViewController.h
index 27232f4c3..47fa5c3a8 100644
--- a/macosx/InfoViewController.h
+++ b/macosx/InfoViewController.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
 
 @class Torrent;
 
diff --git a/macosx/InfoWindowController.h b/macosx/InfoWindowController.h
index e7dd4909f..8826d3bb2 100644
--- a/macosx/InfoWindowController.h
+++ b/macosx/InfoWindowController.h
@@ -2,8 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
-#import <Quartz/Quartz.h>
+#import <AppKit/AppKit.h>
 
 @class Torrent;
 
diff --git a/macosx/MessageWindowController.h b/macosx/MessageWindowController.h
index d8b02930d..3afe2ef63 100644
--- a/macosx/MessageWindowController.h
+++ b/macosx/MessageWindowController.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 @interface MessageWindowController : NSWindowController
 
diff --git a/macosx/NSImageAdditions.h b/macosx/NSImageAdditions.h
index 5ecdd4e74..6049e23b1 100644
--- a/macosx/NSImageAdditions.h
+++ b/macosx/NSImageAdditions.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 @interface NSImage (NSImageAdditions)
 
diff --git a/macosx/PeerProgressIndicatorCell.h b/macosx/PeerProgressIndicatorCell.h
index 99f660450..1b48a8848 100644
--- a/macosx/PeerProgressIndicatorCell.h
+++ b/macosx/PeerProgressIndicatorCell.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 @interface PeerProgressIndicatorCell : NSLevelIndicatorCell
 
diff --git a/macosx/PeerTableView.h b/macosx/PeerTableView.h
index 79165e55e..ccd8a8d2a 100644
--- a/macosx/PeerTableView.h
+++ b/macosx/PeerTableView.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 @interface PeerTableView : NSTableView
 
diff --git a/macosx/PiecesView.h b/macosx/PiecesView.h
index 4d3217836..90b45e9ae 100644
--- a/macosx/PiecesView.h
+++ b/macosx/PiecesView.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 @class Torrent;
 
diff --git a/macosx/PredicateEditorRowTemplateAny.h b/macosx/PredicateEditorRowTemplateAny.h
index 4c1883096..8ea1b9a42 100644
--- a/macosx/PredicateEditorRowTemplateAny.h
+++ b/macosx/PredicateEditorRowTemplateAny.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 @interface PredicateEditorRowTemplateAny : NSPredicateEditorRowTemplate
 
diff --git a/macosx/PrefsController.h b/macosx/PrefsController.h
index 4553dffc4..cb00941ea 100644
--- a/macosx/PrefsController.h
+++ b/macosx/PrefsController.h
@@ -2,8 +2,8 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
 #import "PortChecker.h"
+#import <AppKit/AppKit.h>
 
 #include <libtransmission/transmission.h>
 
diff --git a/macosx/PrefsController.mm b/macosx/PrefsController.mm
index 31c0a070d..dd14479fe 100644
--- a/macosx/PrefsController.mm
+++ b/macosx/PrefsController.mm
@@ -2,11 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Foundation/Foundation.h>
-
 #import <Sparkle/Sparkle.h>
-
-#include <libtransmission/transmission.h>
 #include <libtransmission/utils.h>
 
 #import "VDKQueue.h"
diff --git a/macosx/PrefsWindow.h b/macosx/PrefsWindow.h
index f8ef693ed..e32eda6a2 100644
--- a/macosx/PrefsWindow.h
+++ b/macosx/PrefsWindow.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 @interface PrefsWindow : NSWindow
 
diff --git a/macosx/ProgressGradients.h b/macosx/ProgressGradients.h
index 623bc33bc..4ab0e6fb0 100644
--- a/macosx/ProgressGradients.h
+++ b/macosx/ProgressGradients.h
@@ -2,7 +2,6 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Foundation/Foundation.h>
 #import <AppKit/AppKit.h>
 
 @interface ProgressGradients : NSObject
diff --git a/macosx/QuickLookPlugin/GeneratePreviewForURL.mm b/macosx/QuickLookPlugin/GeneratePreviewForURL.mm
index dc396e0c3..3e56b85bb 100644
--- a/macosx/QuickLookPlugin/GeneratePreviewForURL.mm
+++ b/macosx/QuickLookPlugin/GeneratePreviewForURL.mm
@@ -1,11 +1,9 @@
-#import <Cocoa/Cocoa.h>
-#import <CoreFoundation/CFPlugInCOM.h>
-#import <QuickLook/QuickLook.h>
+@import AppKit;
+@import CoreFoundation;
+@import QuickLook;
 
 #include <string>
 
-#include <libtransmission/transmission.h>
-
 #include <libtransmission/torrent-metainfo.h>
 
 #import "NSStringAdditions.h"
diff --git a/macosx/QuickLookPlugin/GenerateThumbnailForURL.mm b/macosx/QuickLookPlugin/GenerateThumbnailForURL.mm
index 44286d5c9..094409d92 100644
--- a/macosx/QuickLookPlugin/GenerateThumbnailForURL.mm
+++ b/macosx/QuickLookPlugin/GenerateThumbnailForURL.mm
@@ -1,6 +1,5 @@
-#import <CoreFoundation/CoreFoundation.h>
-#import <CoreFoundation/CFPlugInCOM.h>
-#import <QuickLook/QuickLook.h>
+@import CoreFoundation;
+@import QuickLook;
 
 QL_EXTERN_C_BEGIN
 OSStatus GenerateThumbnailForURL(void* thisInterface, QLThumbnailRequestRef thumbnail, CFURLRef url, CFStringRef contentTypeUTI, CFDictionaryRef options, CGSize maxSize);
diff --git a/macosx/SparkleProxy.mm b/macosx/SparkleProxy.mm
index 4993e09a9..3c49cdd9c 100644
--- a/macosx/SparkleProxy.mm
+++ b/macosx/SparkleProxy.mm
@@ -2,8 +2,8 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <objc/runtime.h>
-#import <AppKit/AppKit.h>
+@import ObjectiveC;
+@import AppKit;
 
 void SUUpdater_checkForUpdates(id self, SEL _cmd, ...)
 {
diff --git a/macosx/StatsWindowController.h b/macosx/StatsWindowController.h
index aa062b416..a987b749a 100644
--- a/macosx/StatsWindowController.h
+++ b/macosx/StatsWindowController.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 #include <libtransmission/transmission.h>
 
diff --git a/macosx/StatusBarController.h b/macosx/StatusBarController.h
index 741e85dda..6c64b1812 100644
--- a/macosx/StatusBarController.h
+++ b/macosx/StatusBarController.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 #include <libtransmission/transmission.h>
 
diff --git a/macosx/StatusBarController.mm b/macosx/StatusBarController.mm
index 90b695607..6c7053d4a 100644
--- a/macosx/StatusBarController.mm
+++ b/macosx/StatusBarController.mm
@@ -2,8 +2,6 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#include <libtransmission/transmission.h>
-
 #import "StatusBarController.h"
 #import "NSStringAdditions.h"
 
diff --git a/macosx/StatusBarView.h b/macosx/StatusBarView.h
index 125d421fa..b24a9360e 100644
--- a/macosx/StatusBarView.h
+++ b/macosx/StatusBarView.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 @interface StatusBarView : NSView
 
diff --git a/macosx/ToolbarSegmentedCell.h b/macosx/ToolbarSegmentedCell.h
index 1709a0232..f6e730bdc 100644
--- a/macosx/ToolbarSegmentedCell.h
+++ b/macosx/ToolbarSegmentedCell.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 @interface ToolbarSegmentedCell : NSSegmentedCell
 
diff --git a/macosx/Torrent.h b/macosx/Torrent.h
index 913d7c9b2..fc645ff85 100644
--- a/macosx/Torrent.h
+++ b/macosx/Torrent.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
 #import <Quartz/Quartz.h>
 
 #include <libtransmission/transmission.h>
diff --git a/macosx/TorrentGroup.h b/macosx/TorrentGroup.h
index 7fdeecbff..bb1a8ef43 100644
--- a/macosx/TorrentGroup.h
+++ b/macosx/TorrentGroup.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
 
 @class Torrent;
 
diff --git a/macosx/TorrentTableView.h b/macosx/TorrentTableView.h
index 7bda0fa49..78e8074bf 100644
--- a/macosx/TorrentTableView.h
+++ b/macosx/TorrentTableView.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 #include <libtransmission/transmission.h>
 
diff --git a/macosx/TrackerCell.h b/macosx/TrackerCell.h
index cc93fdb86..4ddb2bfd0 100644
--- a/macosx/TrackerCell.h
+++ b/macosx/TrackerCell.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 @interface TrackerCell : NSActionCell
 
diff --git a/macosx/TrackerNode.h b/macosx/TrackerNode.h
index 030e3b987..86a1879f1 100644
--- a/macosx/TrackerNode.h
+++ b/macosx/TrackerNode.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
 
 #include <libtransmission/transmission.h>
 
diff --git a/macosx/TrackerTableView.h b/macosx/TrackerTableView.h
index a6ef210c3..c017b74a5 100644
--- a/macosx/TrackerTableView.h
+++ b/macosx/TrackerTableView.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 @class Torrent;
 
diff --git a/macosx/Transmission_Prefix.pch b/macosx/Transmission_Prefix.pch
deleted file mode 100644
index aabef477d..000000000
--- a/macosx/Transmission_Prefix.pch
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifdef __OBJC__
-    #import <Cocoa/Cocoa.h>
-#endif
diff --git a/macosx/URLSheetWindowController.h b/macosx/URLSheetWindowController.h
index 4788919a8..aed06f0a8 100644
--- a/macosx/URLSheetWindowController.h
+++ b/macosx/URLSheetWindowController.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 @interface URLSheetWindowController : NSWindowController
 
diff --git a/macosx/WebSeedTableView.h b/macosx/WebSeedTableView.h
index 9148ceebc..f1a7334b3 100644
--- a/macosx/WebSeedTableView.h
+++ b/macosx/WebSeedTableView.h
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 @interface WebSeedTableView : NSTableView
 
diff --git a/macosx/main.mm b/macosx/main.mm
index 816c50db5..2e75f5728 100644
--- a/macosx/main.mm
+++ b/macosx/main.mm
@@ -2,7 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#import <Cocoa/Cocoa.h>
+@import AppKit;
 
 int main(int argc, char** argv)
 {