diff -ur /var/tmp/portage/fluxbox-0.9.14/src/ClockTool.cc fluxbox-0.9.14/src/ClockTool.cc
--- /var/tmp/portage/fluxbox-0.9.14/src/ClockTool.cc	2005-07-03 05:28:08.000000000 -0700
+++ fluxbox-0.9.14/src/ClockTool.cc	2006-03-12 16:22:24.000000000 -0800
@@ -50,7 +50,7 @@
 
 class ClockMenuItem: public FbTk::MenuItem {
 public:
-    explicit ClockMenuItem::ClockMenuItem(ClockTool &tool):
+    explicit ClockMenuItem(ClockTool &tool):
         FbTk::MenuItem(""), m_tool(tool) { 
         // determine 12/24 hour format
         _FB_USES_NLS;
diff -ur /var/tmp/portage/fluxbox-0.9.14/src/IconbarTool.cc fluxbox-0.9.14/src/IconbarTool.cc
--- /var/tmp/portage/fluxbox-0.9.14/src/IconbarTool.cc	2005-07-04 11:18:25.000000000 -0700
+++ fluxbox-0.9.14/src/IconbarTool.cc	2006-03-12 16:22:24.000000000 -0800
@@ -49,6 +49,8 @@
 #include <iterator>
 using namespace std;
 
+namespace FbTk {
+
 template<>
 void FbTk::Resource<IconbarTool::Mode>::setFromString(const char *strval) {
     if (strcasecmp(strval, "None") == 0) 
@@ -191,6 +193,8 @@
     return string("Icons");
 }
 
+}
+
 namespace {
 
 class ToolbarModeMenuItem : public FbTk::MenuItem {
diff -ur /var/tmp/portage/fluxbox-0.9.14/src/MenuTheme.cc fluxbox-0.9.14/src/MenuTheme.cc
--- /var/tmp/portage/fluxbox-0.9.14/src/MenuTheme.cc	2005-01-24 10:57:02.000000000 -0800
+++ fluxbox-0.9.14/src/MenuTheme.cc	2006-03-12 16:22:24.000000000 -0800
@@ -26,6 +26,8 @@
 #include <iostream>
 using namespace std;
 
+namespace FbTk {
+
 template <>
 void FbTk::ThemeItem<Shape::ShapePlace>::load(const std::string *name, const std::string *altname) { }
 
@@ -49,7 +51,7 @@
 
     *(*this) = static_cast<Shape::ShapePlace>(places);
 }
-
+} // end namespace FbTk
 MenuTheme::MenuTheme(int screen_num):FbTk::MenuTheme(screen_num),
                                      m_shapeplace(*this, "menu.roundCorners", "Menu.RoundCorners") {
     *m_shapeplace = Shape::NONE;
diff -ur /var/tmp/portage/fluxbox-0.9.14/src/Resources.cc fluxbox-0.9.14/src/Resources.cc
--- /var/tmp/portage/fluxbox-0.9.14/src/Resources.cc	2005-05-06 15:00:29.000000000 -0700
+++ fluxbox-0.9.14/src/Resources.cc	2006-03-12 16:22:24.000000000 -0800
@@ -36,6 +36,7 @@
 //-----------------------------------------------------------------
 //---- accessors for int, bool, and some enums with Resource ------
 //-----------------------------------------------------------------
+namespace FbTk {
 
 template<>
 void FbTk::Resource<int>::
@@ -250,3 +251,4 @@
     sprintf(tmpstr, "%ld", m_value);
     return string(tmpstr);
 }
+} // end namespace FbTk
diff -ur /var/tmp/portage/fluxbox-0.9.14/src/ScreenResources.cc fluxbox-0.9.14/src/ScreenResources.cc
--- /var/tmp/portage/fluxbox-0.9.14/src/ScreenResources.cc	2005-07-26 10:34:45.000000000 -0700
+++ fluxbox-0.9.14/src/ScreenResources.cc	2006-03-12 16:22:24.000000000 -0800
@@ -21,13 +21,14 @@
 
 // $Id: ScreenResources.cc 4084 2005-07-20 18:29:01Z mathias $
 
+#include "Screen.hh"
+#include <string>
+using namespace std;
 
+namespace FbTk {
 
 // holds screen resource handling
 
-#include "Screen.hh"
-#include <string>
-using namespace std;
 
 template <>
 void FbTk::Resource<BScreen::PlacementPolicy>::setDefaultValue() {
@@ -357,4 +358,4 @@
     else
         setDefaultValue();
 }
-
+} // end namespace FbTk
diff -ur /var/tmp/portage/fluxbox-0.9.14/src/Slit.cc fluxbox-0.9.14/src/Slit.cc
--- /var/tmp/portage/fluxbox-0.9.14/src/Slit.cc	2005-06-22 20:09:15.000000000 -0700
+++ fluxbox-0.9.14/src/Slit.cc	2006-03-12 16:22:24.000000000 -0800
@@ -80,6 +80,8 @@
 #include <algorithm>
 using namespace std;
 
+namespace FbTk {
+
 template<>
 void FbTk::Resource<Slit::Placement>::setFromString(const char *strval) {
     if (strcasecmp(strval, "TopLeft")==0)
@@ -160,6 +162,8 @@
     return string("Vertical");
 }
 
+}
+
 namespace { 
 
 class SlitClientMenuItem: public FbTk::MenuItem{
diff -ur /var/tmp/portage/fluxbox-0.9.14/src/Toolbar.cc fluxbox-0.9.14/src/Toolbar.cc
--- /var/tmp/portage/fluxbox-0.9.14/src/Toolbar.cc	2005-07-03 05:28:08.000000000 -0700
+++ fluxbox-0.9.14/src/Toolbar.cc	2006-03-12 16:22:24.000000000 -0800
@@ -73,6 +73,8 @@
 
 using namespace std;
 
+namespace FbTk {
+
 template<>
 void FbTk::Resource<Toolbar::Placement>::
 setFromString(const char *strval) {
@@ -149,6 +151,7 @@
     return string("BottomCenter");
 }
 
+}
 
 namespace {
 class SetToolbarPlacementCmd: public FbTk::Command {