diff --git a/Frameworks/OakAppKit/src/OakTabItemView.mm b/Frameworks/OakAppKit/src/OakTabItemView.mm
index a8442add..a2937d60 100644
--- a/Frameworks/OakAppKit/src/OakTabItemView.mm
+++ b/Frameworks/OakAppKit/src/OakTabItemView.mm
@@ -1,7 +1,6 @@
 #import "OakTabItemView.h"
 #import "OakRolloverButton.h"
 #import "NSImage Additions.h"
-#import <oak/compat.h>
 
 @interface OakTabBarStyle ()
 {
@@ -139,7 +138,7 @@
 		_inactiveTabTextStyles = _activeTabTextStyles.mutableCopy;
 		_inactiveTabTextStyles[NSForegroundColorAttributeName] = [NSColor colorWithCalibratedWhite:0.5 alpha:1];
 
-		if(oak::os_tuple() >= std::make_tuple(10, 10, 0))
+		if([[NSProcessInfo processInfo] respondsToSelector:@selector(isOperatingSystemAtLeastVersion:)] && [[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:{ 10, 10, 0 }])
 		{
 			_selectedTabTextStyles = _activeTabTextStyles.mutableCopy;
 			_selectedTabTextStyles[NSForegroundColorAttributeName] = [NSColor blackColor];
diff --git a/Frameworks/OakFileBrowser/src/ui/OFBHeaderView.mm b/Frameworks/OakFileBrowser/src/ui/OFBHeaderView.mm
index 2424d408..95c38eae 100644
--- a/Frameworks/OakFileBrowser/src/ui/OFBHeaderView.mm
+++ b/Frameworks/OakFileBrowser/src/ui/OFBHeaderView.mm
@@ -3,7 +3,6 @@
 #import <OakAppKit/OakTabItemView.h>
 #import <OakAppKit/OakUIConstructionFunctions.h>
 #import <Preferences/Keys.h>
-#import <oak/compat.h>
 
 static NSButton* OakCreateImageButton (NSString* imageName)
 {
@@ -47,7 +46,7 @@ static NSPopUpButton* OakCreateFolderPopUpButton ()
 		NSMutableParagraphStyle* parStyle = [NSMutableParagraphStyle new];
 		[parStyle setLineBreakMode:NSLineBreakByTruncatingMiddle];
 
-		if(oak::os_tuple() >= std::make_tuple(10, 10, 0))
+		if([[NSProcessInfo processInfo] respondsToSelector:@selector(isOperatingSystemAtLeastVersion:)] && [[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:{ 10, 10, 0 }])
 		{
 			NSFont* font = [NSFont systemFontOfSize:12];