diff --git a/src/frameworks/CoreServices/include/SearchKit/Analysis.h b/src/frameworks/CoreServices/include/SearchKit/SKAnalysis.h
similarity index 100%
rename from src/frameworks/CoreServices/include/SearchKit/Analysis.h
rename to src/frameworks/CoreServices/include/SearchKit/SKAnalysis.h
diff --git a/src/frameworks/CoreServices/include/SearchKit/SearchKit.h b/src/frameworks/CoreServices/include/SearchKit/SearchKit.h
index 0dd7bbd59..37b2af3a3 100644
--- a/src/frameworks/CoreServices/include/SearchKit/SearchKit.h
+++ b/src/frameworks/CoreServices/include/SearchKit/SearchKit.h
@@ -20,6 +20,6 @@
 #ifndef _CORESERVICES_SEARCHKIT_H_
 #define _CORESERVICES_SEARCHKIT_H_
 
-#include <SearchKit/Analysis.h>
+#include <SearchKit/SKAnalysis.h>
 
 #endif
diff --git a/src/frameworks/CoreServices/src/SearchKit/CMakeLists.txt b/src/frameworks/CoreServices/src/SearchKit/CMakeLists.txt
index 84141a194..0270e2063 100644
--- a/src/frameworks/CoreServices/src/SearchKit/CMakeLists.txt
+++ b/src/frameworks/CoreServices/src/SearchKit/CMakeLists.txt
@@ -13,7 +13,7 @@ add_framework(SearchKit
 	PARENT "CoreServices"
 
 	SOURCES
-		Analysis.m
+		SKAnalysis.m
 		SKIndex.c
 
 	DEPENDENCIES
diff --git a/src/frameworks/CoreServices/src/SearchKit/Analysis.m b/src/frameworks/CoreServices/src/SearchKit/SKAnalysis.m
similarity index 96%
rename from src/frameworks/CoreServices/src/SearchKit/Analysis.m
rename to src/frameworks/CoreServices/src/SearchKit/SKAnalysis.m
index dae279186..1c47f7e99 100644
--- a/src/frameworks/CoreServices/src/SearchKit/Analysis.m
+++ b/src/frameworks/CoreServices/src/SearchKit/SKAnalysis.m
@@ -17,7 +17,7 @@
  along with Darling.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#import <SearchKit/Analysis.h>
+#import <SearchKit/SKAnalysis.h>
 
 const CFStringRef kSKMinTermLength = CFSTR("kSKMinTermLength");
 const CFStringRef kSKMaximumTerms = CFSTR("kSKMaximumTerms");
-- 
2.51.2


From 9cf9b97feb6888b23e7495897fa2a6776425e426 Mon Sep 17 00:00:00 2001
From: Duncan Cunningham <duncanc4@gmail.com>
Date: Sat, 7 Mar 2026 14:59:22 +0100
Subject: [PATCH 2/3] Convert SKAnalysis to C header and implementation

---
 src/frameworks/CoreServices/include/SearchKit/SKAnalysis.h | 7 ++++++-
 src/frameworks/CoreServices/src/SearchKit/CMakeLists.txt   | 2 +-
 .../src/SearchKit/{SKAnalysis.m => SKAnalysis.c}           | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
 rename src/frameworks/CoreServices/src/SearchKit/{SKAnalysis.m => SKAnalysis.c} (96%)

diff --git a/src/frameworks/CoreServices/include/SearchKit/SKAnalysis.h b/src/frameworks/CoreServices/include/SearchKit/SKAnalysis.h
index 132a9392e..cd36a962a 100644
--- a/src/frameworks/CoreServices/include/SearchKit/SKAnalysis.h
+++ b/src/frameworks/CoreServices/include/SearchKit/SKAnalysis.h
@@ -17,8 +17,13 @@
  along with Darling.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#import <CoreFoundation/CFString.h>
+#ifndef _SKANALYSIS_H_
+#define _SKANALYSIS_H_
+
+#include <CoreFoundation/CFString.h>
 
 extern const CFStringRef kSKMinTermLength;
 extern const CFStringRef kSKMaximumTerms;
 extern const CFStringRef kSKProximityIndexing;
+
+#endif
diff --git a/src/frameworks/CoreServices/src/SearchKit/CMakeLists.txt b/src/frameworks/CoreServices/src/SearchKit/CMakeLists.txt
index 0270e2063..b1251ef19 100644
--- a/src/frameworks/CoreServices/src/SearchKit/CMakeLists.txt
+++ b/src/frameworks/CoreServices/src/SearchKit/CMakeLists.txt
@@ -13,7 +13,7 @@ add_framework(SearchKit
 	PARENT "CoreServices"
 
 	SOURCES
-		SKAnalysis.m
+		SKAnalysis.c
 		SKIndex.c
 
 	DEPENDENCIES
diff --git a/src/frameworks/CoreServices/src/SearchKit/SKAnalysis.m b/src/frameworks/CoreServices/src/SearchKit/SKAnalysis.c
similarity index 96%
rename from src/frameworks/CoreServices/src/SearchKit/SKAnalysis.m
rename to src/frameworks/CoreServices/src/SearchKit/SKAnalysis.c
index 1c47f7e99..90531fa20 100644
--- a/src/frameworks/CoreServices/src/SearchKit/SKAnalysis.m
+++ b/src/frameworks/CoreServices/src/SearchKit/SKAnalysis.c
@@ -17,7 +17,7 @@
  along with Darling.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#import <SearchKit/SKAnalysis.h>
+#include <SearchKit/SKAnalysis.h>
 
 const CFStringRef kSKMinTermLength = CFSTR("kSKMinTermLength");
 const CFStringRef kSKMaximumTerms = CFSTR("kSKMaximumTerms");
-- 
2.51.2


From bf0a8df1fb7e96e5c0c15588339da46f95c1844b Mon Sep 17 00:00:00 2001
From: Duncan Cunningham <duncanc4@gmail.com>
Date: Sun, 8 Mar 2026 11:06:19 +0100
Subject: [PATCH 3/3] Add symbols for Xcode 5

---
 src/frameworks/CoreServices/include/SearchKit/SKAnalysis.h | 4 ++++
 src/frameworks/CoreServices/src/SearchKit/SKAnalysis.c     | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/frameworks/CoreServices/include/SearchKit/SKAnalysis.h b/src/frameworks/CoreServices/include/SearchKit/SKAnalysis.h
index cd36a962a..f1e16cb0e 100644
--- a/src/frameworks/CoreServices/include/SearchKit/SKAnalysis.h
+++ b/src/frameworks/CoreServices/include/SearchKit/SKAnalysis.h
@@ -25,5 +25,9 @@
 extern const CFStringRef kSKMinTermLength;
 extern const CFStringRef kSKMaximumTerms;
 extern const CFStringRef kSKProximityIndexing;
+extern const CFStringRef kSKStopWords;
+extern const CFStringRef kSKTermChars;
+extern const CFStringRef kSKStartTermChars;
+extern const CFStringRef kSKEndTermChars;
 
 #endif
diff --git a/src/frameworks/CoreServices/src/SearchKit/SKAnalysis.c b/src/frameworks/CoreServices/src/SearchKit/SKAnalysis.c
index 90531fa20..6d4bb7940 100644
--- a/src/frameworks/CoreServices/src/SearchKit/SKAnalysis.c
+++ b/src/frameworks/CoreServices/src/SearchKit/SKAnalysis.c
@@ -22,3 +22,7 @@
 const CFStringRef kSKMinTermLength = CFSTR("kSKMinTermLength");
 const CFStringRef kSKMaximumTerms = CFSTR("kSKMaximumTerms");
 const CFStringRef kSKProximityIndexing = CFSTR("kSKProximityIndexing");
+const CFStringRef kSKStopWords = CFSTR("kSKStopWords");
+const CFStringRef kSKTermChars = CFSTR("kSKTermChars");
+const CFStringRef kSKStartTermChars = CFSTR("kSKStartTermChars");
+const CFStringRef kSKEndTermChars = CFSTR("kSKEndTermChars");