diff --git a/DBPrefsWindowController.h b/DBPrefsWindowController.h
index 417b295..63b7855 100644
--- a/DBPrefsWindowController.h
+++ b/DBPrefsWindowController.h
@@ -42,7 +42,7 @@
 #import <Cocoa/Cocoa.h>
 
 
-@interface DBPrefsWindowController : NSWindowController <NSAnimationDelegate,NSToolbarDelegate>{
+@interface DBPrefsWindowController : NSWindowController /*<NSAnimationDelegate,NSToolbarDelegate>*/{
 	NSMutableArray *toolbarIdentifiers;
 	NSMutableDictionary *toolbarViews;
 	NSMutableDictionary *toolbarItems;
diff --git a/PBGitHistoryController.h b/PBGitHistoryController.h
index fe373f5..f9cf468 100644
--- a/PBGitHistoryController.h
+++ b/PBGitHistoryController.h
@@ -22,7 +22,7 @@
 
 @class PBHistorySearchController;
 
-@interface PBGitHistoryController : PBViewController <NSOutlineViewDelegate>{
+@interface PBGitHistoryController : PBViewController /*<NSOutlineViewDelegate>*/{
 	IBOutlet PBRefController *refController;
 	IBOutlet NSSearchField *searchField;
 	IBOutlet NSArrayController* commitController;
diff --git a/PBGitSidebarController.h b/PBGitSidebarController.h
index 8bacbe2..623c816 100644
--- a/PBGitSidebarController.h
+++ b/PBGitSidebarController.h
@@ -13,7 +13,7 @@
 @class PBGitHistoryController;
 @class PBGitCommitController;
 
-@interface PBGitSidebarController : PBViewController <NSOutlineViewDelegate>{
+@interface PBGitSidebarController : PBViewController /*<NSOutlineViewDelegate>*/{
 	IBOutlet NSWindow *window;
 	IBOutlet NSOutlineView *sourceView;
 	IBOutlet NSView *sourceListControlsView;
diff --git a/PBGitWindowController.h b/PBGitWindowController.h
index 0eb02df..c844bf6 100644
--- a/PBGitWindowController.h
+++ b/PBGitWindowController.h
@@ -14,7 +14,7 @@
 
 @class PBViewController, PBGitSidebarController, PBGitCommitController;
 
-@interface PBGitWindowController : NSWindowController <NSWindowDelegate>{
+@interface PBGitWindowController : NSWindowController /*<NSWindowDelegate>*/{
 	__weak PBGitRepository* repository;
 
 	PBViewController *contentController;
diff --git a/gitx_askpasswd_main.m b/gitx_askpasswd_main.m
index a2d65ba..ae9a43b 100644
--- a/gitx_askpasswd_main.m
+++ b/gitx_askpasswd_main.m
@@ -30,7 +30,7 @@
 #define WINDOWAUTOSAVENAME		@"GitXAskPasswordWindowFrame"
 
 
-@interface GAPAppDelegate : NSObject <NSApplicationDelegate>
+@interface GAPAppDelegate : NSObject /*<NSApplicationDelegate>*/
 {
 	NSPanel*			mPasswordPanel;
 	NSSecureTextField*	mPasswordField;