diff --git a/headers/os/interface/Font.h b/headers/os/interface/Font.h
index 846c7f0af6..bf13f32898 100644
--- a/headers/os/interface/Font.h
+++ b/headers/os/interface/Font.h
@@ -140,9 +140,11 @@ class BFontPrivate;
 class BFont {
 public:
 							BFont(void);
-							BFont(const BFont &font);	
-							BFont(const BFont *font);			
+							BFont(const BFont &font);
+							BFont(const BFont *font);
+							/* /* XXX TODO: R5 doesn't have a destructor, so we get linking errors when objects compiled with old headers with the new library
 							~BFont(void);
+							*/
 
 		status_t			SetFamilyAndStyle(const font_family family, 
 											  const font_style style);
diff --git a/src/kits/interface/Font.cpp b/src/kits/interface/Font.cpp
index b2484974e5..e0605bc7eb 100644
--- a/src/kits/interface/Font.cpp
+++ b/src/kits/interface/Font.cpp
@@ -135,10 +135,13 @@ BFont::BFont(const BFont *font)
 	
 }
 
+/* XXX TODO: R5 doesn't have a destructor, so we get linking errors when objects compiled with old headers with the new library
+			 (but now we leak memory here)
 BFont::~BFont(void)
 {
 	delete private_data;
 }
+*/
 
 status_t BFont::SetFamilyAndStyle(const font_family family, const font_style style)
 {