diff --git a/headers/private/shared/Toolbar.h b/headers/private/shared/Toolbar.h
index 251e9b4763..d14eaecb67 100644
--- a/headers/private/shared/Toolbar.h
+++ b/headers/private/shared/Toolbar.h
@@ -10,6 +10,7 @@
 
 class BButton;
 
+namespace BPrivate {
 
 class BToolbar : public BGroupView {
 public:
@@ -42,4 +43,8 @@ private:
 			void				_HideToolTips() const;
 };
 
+} // namespace BPrivate
+
+using BPrivate::BToolbar;
+
 #endif // _TOOLBAR_H
diff --git a/src/apps/showimage/ShowImageWindow.h b/src/apps/showimage/ShowImageWindow.h
index f5b8b69ba1..496462ecd5 100644
--- a/src/apps/showimage/ShowImageWindow.h
+++ b/src/apps/showimage/ShowImageWindow.h
@@ -11,6 +11,7 @@
 #define SHOW_IMAGE_WINDOW_H
 
 
+#include <Toolbar.h>
 #include <Window.h>
 
 #include "ImageFileNavigator.h"
@@ -27,7 +28,6 @@ class BScrollView;
 class ProgressWindow;
 class ShowImageView;
 class ShowImageStatusView;
-class BToolbar;
 
 
 // public message constants
diff --git a/src/kits/shared/Toolbar.cpp b/src/kits/shared/Toolbar.cpp
index 764f11df76..4c9fbf5bae 100644
--- a/src/kits/shared/Toolbar.cpp
+++ b/src/kits/shared/Toolbar.cpp
@@ -10,6 +10,10 @@
 #include <SeparatorView.h>
 #include <SpaceLayoutItem.h>
 
+
+namespace BPrivate {
+
+
 class LockableButton: public BButton {
 public:
 			LockableButton(const char* name, const char* label,
@@ -196,3 +200,5 @@ BToolbar::_HideToolTips() const
 		view->HideToolTip();
 }
 
+
+} // namespace BPrivate