diff --git a/mac/Audacity.xcodeproj/project.pbxproj b/mac/Audacity.xcodeproj/project.pbxproj
index 33ae9cefc..e547cbb15 100644
--- a/mac/Audacity.xcodeproj/project.pbxproj
+++ b/mac/Audacity.xcodeproj/project.pbxproj
@@ -9609,16 +9609,8 @@
 				INSTALL_PATH = /Audacity/modules;
 				KEEP_PRIVATE_EXTERNS = NO;
 				MACH_O_TYPE = mh_dylib;
-				OTHER_CFLAGS = (
-					"-I",
-					../src,
-					"$(WX_CFLAGS)",
-				);
-				OTHER_CPLUSPLUSFLAGS = (
-					"-I",
-					../src,
-					"$(WX_CXXFLAGS)",
-				);
+				OTHER_CFLAGS = "$(WX_CFLAGS)";
+				OTHER_CPLUSPLUSFLAGS = "$(WX_CXXFLAGS)";
 				OTHER_LDFLAGS = (
 					"-flat_namespace",
 					"-undefined",
@@ -9628,6 +9620,7 @@
 				PREBINDING = NO;
 				PRODUCT_NAME = "mod-nyq-bench";
 				SKIP_INSTALL = NO;
+				USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/include $(TOPLEVEL)/mac $(TOPLEVEL)/src/**";
 				ZERO_LINK = YES;
 			};
 			name = "Debug Static";
@@ -9646,16 +9639,8 @@
 				INSTALL_PATH = /Audacity/modules;
 				KEEP_PRIVATE_EXTERNS = NO;
 				MACH_O_TYPE = mh_dylib;
-				OTHER_CFLAGS = (
-					"-I",
-					../src,
-					"$(WX_CFLAGS)",
-				);
-				OTHER_CPLUSPLUSFLAGS = (
-					"-I",
-					../src,
-					"$(WX_CXXFLAGS)",
-				);
+				OTHER_CFLAGS = "$(WX_CFLAGS)";
+				OTHER_CPLUSPLUSFLAGS = "$(WX_CXXFLAGS)";
 				OTHER_LDFLAGS = (
 					"-flat_namespace",
 					"-undefined",
@@ -9665,6 +9650,7 @@
 				PREBINDING = NO;
 				PRODUCT_NAME = "mod-nyq-bench";
 				SKIP_INSTALL = NO;
+				USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/include $(TOPLEVEL)/mac $(TOPLEVEL)/src/**";
 				ZERO_LINK = YES;
 			};
 			name = "Debug Shared";
@@ -9683,16 +9669,8 @@
 				INSTALL_PATH = /Audacity/modules;
 				KEEP_PRIVATE_EXTERNS = NO;
 				MACH_O_TYPE = mh_dylib;
-				OTHER_CFLAGS = (
-					"-I",
-					../src,
-					"$(WX_CFLAGS)",
-				);
-				OTHER_CPLUSPLUSFLAGS = (
-					"-I",
-					../src,
-					"$(WX_CXXFLAGS)",
-				);
+				OTHER_CFLAGS = "$(WX_CFLAGS)";
+				OTHER_CPLUSPLUSFLAGS = "$(WX_CXXFLAGS)";
 				OTHER_LDFLAGS = (
 					"-flat_namespace",
 					"-undefined",
@@ -9702,6 +9680,7 @@
 				PREBINDING = NO;
 				PRODUCT_NAME = "mod-nyq-bench";
 				SKIP_INSTALL = NO;
+				USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/include $(TOPLEVEL)/mac $(TOPLEVEL)/src/**";
 				ZERO_LINK = YES;
 			};
 			name = "Release Static";
@@ -9720,16 +9699,8 @@
 				INSTALL_PATH = /Audacity/modules;
 				KEEP_PRIVATE_EXTERNS = NO;
 				MACH_O_TYPE = mh_dylib;
-				OTHER_CFLAGS = (
-					"-I",
-					../src,
-					"$(WX_CFLAGS)",
-				);
-				OTHER_CPLUSPLUSFLAGS = (
-					"-I",
-					../src,
-					"$(WX_CXXFLAGS)",
-				);
+				OTHER_CFLAGS = "$(WX_CFLAGS)";
+				OTHER_CPLUSPLUSFLAGS = "$(WX_CXXFLAGS)";
 				OTHER_LDFLAGS = (
 					"-flat_namespace",
 					"-undefined",
@@ -9739,6 +9710,7 @@
 				PREBINDING = NO;
 				PRODUCT_NAME = "mod-nyq-bench";
 				SKIP_INSTALL = NO;
+				USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/include $(TOPLEVEL)/mac $(TOPLEVEL)/src/**";
 				ZERO_LINK = YES;
 			};
 			name = "Release Shared";