diff --git a/HexFiend/HFHexTextView.h b/HexFiend/HFHexTextView.h
deleted file mode 100644
index 3222b65e7..000000000
--- a/HexFiend/HFHexTextView.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-//  HFHexTextView.h
-//  HexFiend_2
-//
-//  Copyright 2007 __MyCompanyName__. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
-
-@interface HFHexTextView : NSTextView {
-
-}
-
-@end
diff --git a/HexFiend/HFHexTextView.m b/HexFiend/HFHexTextView.m
deleted file mode 100644
index 9e6ae47b3..000000000
--- a/HexFiend/HFHexTextView.m
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  HFHexTextView.m
-//  HexFiend_2
-//
-//  Copyright 2007 __MyCompanyName__. All rights reserved.
-//
-
-#import "HFHexTextView.h"
-
-
-@implementation HFHexTextView
-
-@end
diff --git a/HexFiend/HFLineCountingView.m b/HexFiend/HFLineCountingView.m
index 080599b00..d65e3692f 100644
--- a/HexFiend/HFLineCountingView.m
+++ b/HexFiend/HFLineCountingView.m
@@ -672,4 +672,10 @@ + (NSUInteger)digitsRequiredToDisplayLineNumber:(unsigned long long)lineNumber i
     }
 }
 
+/* Compatibility with Sonoma */
++ (bool)clipsToBounds
+{
+    return true;
+}
+
 @end
diff --git a/HexFiend/HFRepresenterTextView.m b/HexFiend/HFRepresenterTextView.m
index 89c50a1d7..463a6fdd5 100644
--- a/HexFiend/HFRepresenterTextView.m
+++ b/HexFiend/HFRepresenterTextView.m
@@ -1761,4 +1761,10 @@ - (BOOL)validateMenuItem:(NSMenuItem *)item {
     else return YES;
 }
 
+/* Compatibility with Sonoma */
++ (bool)clipsToBounds
+{
+    return true;
+}
+
 @end