diff -uhr fluxbox-0.9.14.orig/src/ClockTool.cc fluxbox-0.9.14/src/ClockTool.cc
--- fluxbox-0.9.14.orig/src/ClockTool.cc	2005-07-03 14:28:08.000000000 +0200
+++ fluxbox-0.9.14/src/ClockTool.cc	2006-03-02 01:14:45.000000000 +0100
@@ -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;
Only in fluxbox-0.9.14/src: defaults.cc
diff -uhr fluxbox-0.9.14.orig/src/IconbarTool.cc fluxbox-0.9.14/src/IconbarTool.cc
--- fluxbox-0.9.14.orig/src/IconbarTool.cc	2005-07-04 20:18:25.000000000 +0200
+++ fluxbox-0.9.14/src/IconbarTool.cc	2006-03-02 01:15:27.000000000 +0100
@@ -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) 
@@ -190,7 +192,7 @@
     // default string
     return string("Icons");
 }
-
+} // end namespace FbTk
 namespace {
 
 class ToolbarModeMenuItem : public FbTk::MenuItem {
Only in fluxbox-0.9.14/src: .IconbarTool.cc.swp
diff -uhr fluxbox-0.9.14.orig/src/MenuTheme.cc fluxbox-0.9.14/src/MenuTheme.cc
--- fluxbox-0.9.14.orig/src/MenuTheme.cc	2005-01-24 19:57:02.000000000 +0100
+++ fluxbox-0.9.14/src/MenuTheme.cc	2006-03-02 01:11:36.000000000 +0100
@@ -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,6 +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") {
diff -uhr fluxbox-0.9.14.orig/src/Resources.cc fluxbox-0.9.14/src/Resources.cc
--- fluxbox-0.9.14.orig/src/Resources.cc	2005-05-07 00:00:29.000000000 +0200
+++ fluxbox-0.9.14/src/Resources.cc	2006-03-02 01:12:54.000000000 +0100
@@ -37,6 +37,8 @@
 //---- accessors for int, bool, and some enums with Resource ------
 //-----------------------------------------------------------------
 
+namespace FbTk {
+
 template<>
 void FbTk::Resource<int>::
 setFromString(const char* strval) {
@@ -250,3 +252,4 @@
     sprintf(tmpstr, "%ld", m_value);
     return string(tmpstr);
 }
+} // end namespace FbTk
diff -uhr fluxbox-0.9.14.orig/src/ScreenResources.cc fluxbox-0.9.14/src/ScreenResources.cc
--- fluxbox-0.9.14.orig/src/ScreenResources.cc	2005-07-26 19:34:45.000000000 +0200
+++ fluxbox-0.9.14/src/ScreenResources.cc	2006-03-02 01:08:37.000000000 +0100
@@ -29,6 +29,8 @@
 #include <string>
 using namespace std;
 
+namespace FbTk {
+
 template <>
 void FbTk::Resource<BScreen::PlacementPolicy>::setDefaultValue() {
     *(*this) = BScreen::ROWSMARTPLACEMENT;
@@ -357,4 +359,4 @@
     else
         setDefaultValue();
 }
-
+} // end namespace FbTk
diff -uhr fluxbox-0.9.14.orig/src/Slit.cc fluxbox-0.9.14/src/Slit.cc
--- fluxbox-0.9.14.orig/src/Slit.cc	2005-06-23 05:09:15.000000000 +0200
+++ fluxbox-0.9.14/src/Slit.cc	2006-03-02 01:09:46.000000000 +0100
@@ -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)
@@ -159,7 +161,7 @@
     // default string
     return string("Vertical");
 }
-
+} // end namespace FbTk
 namespace { 
 
 class SlitClientMenuItem: public FbTk::MenuItem{
diff -uhr fluxbox-0.9.14.orig/src/Toolbar.cc fluxbox-0.9.14/src/Toolbar.cc
--- fluxbox-0.9.14.orig/src/Toolbar.cc	2005-07-03 14:28:08.000000000 +0200
+++ fluxbox-0.9.14/src/Toolbar.cc	2006-03-02 01:14:05.000000000 +0100
@@ -73,6 +73,8 @@
 
 using namespace std;
 
+namespace FbTk {
+
 template<>
 void FbTk::Resource<Toolbar::Placement>::
 setFromString(const char *strval) {
@@ -148,7 +150,7 @@
     //default string
     return string("BottomCenter");
 }
-
+} // end namespace FbTk
 
 namespace {
 class SetToolbarPlacementCmd: public FbTk::Command {
Only in fluxbox-0.9.14.orig/util: Makefile.in