11 files changed, 17 insertions, 11 deletions
diff --git a/gtk2_ardour/keyboard.h b/gtk2_ardour/keyboard.h
index c1351bfaf6..3d9e1c9f41 100644
--- a/gtk2_ardour/keyboard.h
+++ b/gtk2_ardour/keyboard.h
@@ -34,7 +34,7 @@
 using std::vector;
 using std::string;
 
-class Keyboard : public sigc::trackable, Stateful
+class Keyboard : public sigc::trackable, PBD::Stateful
 {
   public:
 	Keyboard ();
diff --git a/libs/ardour/ardour/bundle.h b/libs/ardour/ardour/bundle.h
index 69b8fe1d10..1ed285a118 100644
--- a/libs/ardour/ardour/bundle.h
+++ b/libs/ardour/ardour/bundle.h
@@ -36,7 +36,7 @@ namespace ARDOUR {
  *  JACK ports.
  */
 
-class Bundle : public Stateful, public sigc::trackable {
+class Bundle : public PBD::Stateful, public sigc::trackable {
   public:
 	/**
 	 *  Bundle constructor.
diff --git a/libs/ardour/ardour/configuration.h b/libs/ardour/ardour/configuration.h
index 07d4bb8db3..c63af0a4cf 100644
--- a/libs/ardour/ardour/configuration.h
+++ b/libs/ardour/ardour/configuration.h
@@ -36,7 +36,7 @@ class XMLNode;
 
 namespace ARDOUR {
 
-class Configuration : public Stateful
+class Configuration : public PBD::Stateful
 {
   public:
 	Configuration();
diff --git a/libs/ardour/ardour/control_protocol_manager.h b/libs/ardour/ardour/control_protocol_manager.h
index 73d9b21579..e8dc0bf22c 100644
--- a/libs/ardour/ardour/control_protocol_manager.h
+++ b/libs/ardour/ardour/control_protocol_manager.h
@@ -49,7 +49,7 @@ struct ControlProtocolInfo {
     ~ControlProtocolInfo() { if (state) { delete state; } }
 };
 
- class ControlProtocolManager : public sigc::trackable, public Stateful
+ class ControlProtocolManager : public sigc::trackable, public PBD::Stateful
 {
   public:
 	ControlProtocolManager ();
diff --git a/libs/ardour/ardour/named_selection.h b/libs/ardour/ardour/named_selection.h
index 7636099e1f..39ab524d4f 100644
--- a/libs/ardour/ardour/named_selection.h
+++ b/libs/ardour/ardour/named_selection.h
@@ -33,7 +33,7 @@ namespace ARDOUR
 class Session;
 class Playlist;
 
-struct NamedSelection : public Stateful
+struct NamedSelection : public PBD::Stateful
 {
     NamedSelection (std::string, std::list<boost::shared_ptr<Playlist> >&);
     NamedSelection (Session&, const XMLNode&);
diff --git a/libs/ardour/ardour/panner.h b/libs/ardour/ardour/panner.h
index 9d6a7e7fb6..0e5ab68525 100644
--- a/libs/ardour/ardour/panner.h
+++ b/libs/ardour/ardour/panner.h
@@ -42,7 +42,7 @@ class Panner;
 class BufferSet;
 class AudioBuffer;
 
-class StreamPanner : public sigc::trackable, public Stateful
+class StreamPanner : public sigc::trackable, public PBD::Stateful
 {
   public:
 	StreamPanner (Panner& p);
@@ -226,7 +226,7 @@ class Multi2dPanner : public StreamPanner
 	void update ();
 };
 
-class Panner : public std::vector<StreamPanner*>, public Stateful, public sigc::trackable
+class Panner : public std::vector<StreamPanner*>, public PBD::Stateful, public sigc::trackable
 {
   public:
 	struct Output {
diff --git a/libs/ardour/ardour/route_group.h b/libs/ardour/ardour/route_group.h
index 55448df45b..ae16394289 100644
--- a/libs/ardour/ardour/route_group.h
+++ b/libs/ardour/ardour/route_group.h
@@ -38,7 +38,7 @@ class Track;
 class AudioTrack;
 class Session;
 
-class RouteGroup : public Stateful, public sigc::trackable {
+class RouteGroup : public PBD::Stateful, public sigc::trackable {
   public:
     enum Flag {
 	    Relative = 0x1,
diff --git a/libs/pbd/pbd/stateful.h b/libs/pbd/pbd/stateful.h
index a3cc651eab..fed078c802 100644
--- a/libs/pbd/pbd/stateful.h
+++ b/libs/pbd/pbd/stateful.h
@@ -25,6 +25,8 @@
 
 class XMLNode;
 
+namespace PBD {
+
 class Stateful {
   public:
 	Stateful();
@@ -49,5 +51,7 @@ class Stateful {
 	PBD::ID _id;
 };
 
+} // namespace PBD
+
 #endif /* __pbd_stateful_h__ */
 
diff --git a/libs/pbd/stateful.cc b/libs/pbd/stateful.cc
index 786410e817..175a9c77bd 100644
--- a/libs/pbd/stateful.cc
+++ b/libs/pbd/stateful.cc
@@ -26,7 +26,7 @@
 
 #include "i18n.h"
 
-using namespace PBD;
+namespace PBD {
 
 Stateful::Stateful ()
 {
@@ -134,3 +134,5 @@ Stateful::instant_xml (const string& str, const string& dir)
 
 	return 0;
 }
+
+} // namespace PBD
diff --git a/libs/surfaces/control_protocol/control_protocol/control_protocol.h b/libs/surfaces/control_protocol/control_protocol/control_protocol.h
index b787aeeb8f..7de1054ad2 100644
--- a/libs/surfaces/control_protocol/control_protocol/control_protocol.h
+++ b/libs/surfaces/control_protocol/control_protocol/control_protocol.h
@@ -34,7 +34,7 @@ namespace ARDOUR {
 class Route;
 class Session;
 
-class ControlProtocol : public sigc::trackable, public Stateful, public BasicUI {
+class ControlProtocol : public sigc::trackable, public PBD::Stateful, public BasicUI {
   public:
 	ControlProtocol (Session&, std::string name);
 	virtual ~ControlProtocol();
diff --git a/libs/surfaces/generic_midi/midicontrollable.h b/libs/surfaces/generic_midi/midicontrollable.h
index 4bac325feb..c1ee8c1bb1 100644
--- a/libs/surfaces/generic_midi/midicontrollable.h
+++ b/libs/surfaces/generic_midi/midicontrollable.h
@@ -37,7 +37,7 @@ class Parser;
 
 }
 
-class MIDIControllable : public Stateful
+class MIDIControllable : public PBD::Stateful
 {
   public:
 	MIDIControllable (MIDI::Port&, PBD::Controllable&, bool bistate = false);