diff --git a/Frameworks/HTMLOutput/src/OakHTMLOutputView.mm b/Frameworks/HTMLOutput/src/OakHTMLOutputView.mm
index f68ec3c7..442f34e9 100644
--- a/Frameworks/HTMLOutput/src/OakHTMLOutputView.mm
+++ b/Frameworks/HTMLOutput/src/OakHTMLOutputView.mm
@@ -3,19 +3,20 @@
 #import "helpers/HOAutoScroll.h"
 #import "helpers/HOJSBridge.h"
 #import <OakFoundation/NSString Additions.h>
+#import <oak/debug.h>
 
 extern NSString* const kCommandRunnerURLScheme; // from HTMLOutput.h
 
 @interface OakHTMLOutputView ()
+{
+	OBJC_WATCH_LEAKS(OakHTMLOutputView);
+	std::map<std::string, std::string> environment;
+}
 @property (nonatomic, assign) BOOL runningCommand;
 @property (nonatomic, retain) HOAutoScroll* autoScrollHelper;
 @end
 
 @implementation OakHTMLOutputView
-{
-	std::map<std::string, std::string> environment;
-}
-
 - (id)initWithFrame:(NSRect)frame
 {
 	if(self = [super initWithFrame:frame])
diff --git a/Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.mm b/Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.mm
index e524bca3..bce890e5 100644
--- a/Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.mm
+++ b/Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.mm
@@ -11,6 +11,7 @@ static std::multimap<oak::uuid_t, HTMLOutputWindowController*> Windows;
 
 @interface HTMLOutputWindowController ()
 {
+	OBJC_WATCH_LEAKS(HTMLOutputWindowController);
 	command::runner_ptr runner;
 }
 @property (nonatomic, retain) OakHTMLOutputView* htmlOutputView;
@@ -20,6 +21,7 @@ static std::multimap<oak::uuid_t, HTMLOutputWindowController*> Windows;
 @implementation HTMLOutputWindowController
 - (id)initWithRunner:(command::runner_ptr const&)aRunner
 {
+	D(DBF_HTMLOutputWindow, bug("\n"););
 	if(self = [super init])
 	{
 		self.window         = [[NSWindow alloc] initWithContentRect:NSMakeRect(100, 100, 100, 100) styleMask:(NSTitledWindowMask|NSClosableWindowMask|NSResizableWindowMask|NSMiniaturizableWindowMask) backing:NSBackingStoreBuffered defer:NO];
@@ -120,6 +122,7 @@ static std::multimap<oak::uuid_t, HTMLOutputWindowController*> Windows;
 
 - (void)dealloc
 {
+	D(DBF_HTMLOutputWindow, bug("\n"););
 	self.window.delegate = nil;
 }