diff --git a/mozilla/camino/src/application/SessionManager.mm b/mozilla/camino/src/application/SessionManager.mm
index 7cd6777867c..da574fb5e58 100644
--- a/mozilla/camino/src/application/SessionManager.mm
+++ b/mozilla/camino/src/application/SessionManager.mm
@@ -43,17 +43,18 @@
 #import "BrowserTabView.h"
 #import "BrowserWindowController.h"
 #import "BrowserTabViewItem.h"
+#import "BookmarkToolbar.h"
 
-const NSString* kBrowserWindowListKey = @"BrowserWindows";
-const NSString* kDownloadWindowKey = @"DownloadWindow";
-const NSString* kTabListKey = @"Tabs";
-const NSString* kSelectedTabKey = @"SelectedTab";
-const NSString* kFrameKey = @"Frame";
-const NSString* kIsVisibleKey = @"Visible";
-const NSString* kIsKeyWindowKey = @"Key";
-const NSString* kIsMiniaturizedKey = @"Miniaturized";
-const NSString* kToolbarIsVisibleKey = @"ToolbarVisible";
-const NSString* kBookmarkBarIsVisibleKey = @"BookmarkBarVisible";
+static NSString* const kBrowserWindowListKey = @"BrowserWindows";
+static NSString* const kDownloadWindowKey = @"DownloadWindow";
+static NSString* const kTabListKey = @"Tabs";
+static NSString* const kSelectedTabKey = @"SelectedTab";
+static NSString* const kFrameKey = @"Frame";
+static NSString* const kIsVisibleKey = @"Visible";
+static NSString* const kIsKeyWindowKey = @"Key";
+static NSString* const kIsMiniaturizedKey = @"Miniaturized";
+static NSString* const kToolbarIsVisibleKey = @"ToolbarVisible";
+static NSString* const kBookmarkBarIsVisibleKey = @"BookmarkBarVisible";
 
 // Number of seconds to coalesce changes before saving them
 const NSTimeInterval kPersistDelay = 60.0;