Remove most using declarations from header files.

git-svn-id: svn://localhost/ardour2/branches/3.0@5069 d708f5d6-7413-0410-9779-e7cbd77b26cf

68 files changed, 193 insertions, 183 deletions

diff --git a/gtk2_ardour/ardour_dialog.cc b/gtk2_ardour/ardour_dialog.cc
index c3d238a9c0..7c78677d3e 100644
--- a/gtk2_ardour/ardour_dialog.cc
+++ b/gtk2_ardour/ardour_dialog.cc
@@ -29,6 +29,7 @@
 #include "public_editor.h"
 #include "utils.h"
 
+using namespace std;
 using namespace sigc;
 using namespace Gtk;
 
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 370f1ff701..b8478d222a 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -2325,7 +2325,7 @@ ARDOUR_UI::get_session_parameters (bool should_be_new)
 
 			if (likely_new) {
 
-				ustring existing = Glib::build_filename (session_path, session_name);
+				Glib::ustring existing = Glib::build_filename (session_path, session_name);
 				
 				if (!ask_about_loading_existing_session (existing)) {
 					ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index f87e007ddd..81e0e0da5c 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -156,8 +156,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 	int unload_session (bool hide_stuff = false);
 	void close_session();
 
-	int  save_state_canfail (string state_name = "");
-	void save_state (const string & state_name = "");
+	int  save_state_canfail (std::string state_name = "");
+	void save_state (const std::string & state_name = "");
 
 	static double gain_to_slider_position (ARDOUR::gain_t g);
 	static ARDOUR::gain_t slider_position_to_gain (double pos);
@@ -185,7 +185,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 	static sigc::signal<void>      SuperRapidScreenUpdate;
 	static sigc::signal<void,nframes_t, bool, nframes_t> Clock;
 
-	void name_io_setup (ARDOUR::AudioEngine&, string&, ARDOUR::IO& io, bool in);
+	void name_io_setup (ARDOUR::AudioEngine&, std::string&, ARDOUR::IO& io, bool in);
 
 	XMLNode* editor_settings() const;
 	XMLNode* mixer_settings () const;
@@ -283,7 +283,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 	void startup ();
 	void shutdown ();
 
-	int  ask_about_saving_session (const string & why);
+	int  ask_about_saving_session (const std::string & why);
 
 	/* periodic safety backup, to be precise */
 	gint autosave_session();
@@ -483,7 +483,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 	void recent_session_row_activated (const Gtk::TreePath& path, Gtk::TreeViewColumn* col);
 
 	struct RecentSessionsSorter {
-	    bool operator() (std::pair<string,string> a, std::pair<string,string> b) const {
+		bool operator() (std::pair<std::string,std::string> a, std::pair<std::string,std::string> b) const {
 		    return cmp_nocase(a.first, b.first) == -1;
 	    }
 	};
@@ -627,7 +627,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 
 	Gtk::MenuItem *cleanup_item;
 
-	void display_cleanup_results (ARDOUR::Session::cleanup_report& rep, const gchar* list_title, const string & msg);
+	void display_cleanup_results (ARDOUR::Session::cleanup_report& rep, const gchar* list_title, const std::string & msg);
 	void cleanup ();
 	void flush_trash ();
 
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index df44b3a4aa..86ddbeff83 100644
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -56,6 +56,7 @@
 
 #define MUTED_ALPHA 10
 
+using namespace std;
 using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
diff --git a/gtk2_ardour/audio_region_view.h b/gtk2_ardour/audio_region_view.h
index 7c40a5a4e5..33d7c2ac1e 100644
--- a/gtk2_ardour/audio_region_view.h
+++ b/gtk2_ardour/audio_region_view.h
@@ -125,8 +125,8 @@ class AudioRegionView : public RegionView
 	    WaveformLogScaled = 0x10,
     };
 
-    vector<ArdourCanvas::WaveView *> waves;
-    vector<ArdourCanvas::WaveView *> tmp_waves; ///< see ::create_waves()
+    std::vector<ArdourCanvas::WaveView *> waves;
+    std::vector<ArdourCanvas::WaveView *> tmp_waves; ///< see ::create_waves()
     ArdourCanvas::Polygon*           sync_mark; ///< polgyon for sync position 
     ArdourCanvas::SimpleLine*        zero_line;
     ArdourCanvas::Polygon*           fade_in_shape;
@@ -168,7 +168,7 @@ class AudioRegionView : public RegionView
 
     void color_handler ();
 
-    vector<GnomeCanvasWaveViewCache*> wave_caches;
+    std::vector<GnomeCanvasWaveViewCache*> wave_caches;
 
   private:
 
diff --git a/gtk2_ardour/audio_streamview.h b/gtk2_ardour/audio_streamview.h
index e8a2c64a03..9c1335042b 100644
--- a/gtk2_ardour/audio_streamview.h
+++ b/gtk2_ardour/audio_streamview.h
@@ -106,14 +106,14 @@ class AudioStreamView : public StreamView
 	
 	double _amplitude_above_axis;
 	
-	typedef list<CrossfadeView*> CrossfadeViewList;
+	typedef std::list<CrossfadeView*> CrossfadeViewList;
 	CrossfadeViewList crossfade_views;
 	bool              crossfades_visible;
 
 
 	std::list<sigc::connection>                  rec_data_ready_connections;
 	nframes_t                                    last_rec_data_frame;
-	map<boost::shared_ptr<ARDOUR::Source>, bool> rec_data_ready_map;
+	std::map<boost::shared_ptr<ARDOUR::Source>, bool> rec_data_ready_map;
 
 	bool outline_region;
 
diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index 6f8acc9651..6ce54f7882 100644
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -69,6 +69,7 @@
 
 #include "i18n.h"
 
+using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
diff --git a/gtk2_ardour/audio_time_axis.h b/gtk2_ardour/audio_time_axis.h
index bd2fa6b5d6..d3fe93fdc6 100644
--- a/gtk2_ardour/audio_time_axis.h
+++ b/gtk2_ardour/audio_time_axis.h
@@ -86,7 +86,7 @@ class AudioTimeAxisView : public RouteTimeAxisView
 	
 	void first_idle ();
 
-	XMLNode* get_child_xml_node (const string & childname);
+	XMLNode* get_child_xml_node (const std::string & childname);
 
 	void set_waveform_shape (Editing::WaveformShape);
 	void set_waveform_scale (Editing::WaveformScale);
diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index b312cbd685..136196cd72 100644
--- a/gtk2_ardour/automation_line.h
+++ b/gtk2_ardour/automation_line.h
@@ -55,7 +55,7 @@ namespace Gnome {
 class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoingAway
 {
   public:
-	AutomationLine (const string& name, TimeAxisView&, ArdourCanvas::Group&,
+	AutomationLine (const std::string& name, TimeAxisView&, ArdourCanvas::Group&,
 			boost::shared_ptr<ARDOUR::AutomationList>,
 			const Evoral::TimeConverter<double, ARDOUR::sframes_t>* converter = 0);
 	virtual ~AutomationLine ();
@@ -82,7 +82,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin
 	ControlPoint* nth (uint32_t);
 	uint32_t npoints() const { return control_points.size(); }
 
-	string  name()    const { return _name; }
+	std::string  name()    const { return _name; }
 	bool    visible() const { return _visible; }
 	guint32 height()  const { return _height; }
 
@@ -106,9 +106,9 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin
 	void show_selection();
 	void hide_selection ();
 
-	string get_verbose_cursor_string (double) const;
-	string fraction_to_string (double) const;
-	double string_to_fraction (string const &) const;
+	std::string get_verbose_cursor_string (double) const;
+	std::string fraction_to_string (double) const;
+	double string_to_fraction (std::string const &) const;
 	void   view_to_model_coord (double& x, double& y) const;
 	void   model_to_view_coord (double& x, double& y) const;
 
@@ -132,7 +132,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin
 	
   protected:
 
-	string    _name;
+	std::string    _name;
 	guint32   _height;
 	uint32_t  _line_color;
 	
diff --git a/gtk2_ardour/automation_selection.h b/gtk2_ardour/automation_selection.h
index fb19c0b5e0..f132ea95d8 100644
--- a/gtk2_ardour/automation_selection.h
+++ b/gtk2_ardour/automation_selection.h
@@ -26,6 +26,6 @@ namespace ARDOUR {
 	class AutomationList;
 }
 
-struct AutomationSelection : list< boost::shared_ptr<ARDOUR::AutomationList> > {};
+struct AutomationSelection : std::list<boost::shared_ptr<ARDOUR::AutomationList> > {};
 
 #endif /* __ardour_gtk_automation_selection_h__ */
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index bd0da7caf8..78faf66944 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -40,6 +40,7 @@
 
 #include "i18n.h"
 
+using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
diff --git a/gtk2_ardour/automation_time_axis.h b/gtk2_ardour/automation_time_axis.h
index 6df4536ca6..b323d1d3bf 100644
--- a/gtk2_ardour/automation_time_axis.h
+++ b/gtk2_ardour/automation_time_axis.h
@@ -20,7 +20,6 @@
 #ifndef __ardour_gtk_automation_time_axis_h__
 #define __ardour_gtk_automation_time_axis_h__
 
-#include <vector>
 #include <list>
 #include <string>
 #include <utility>
@@ -36,10 +35,6 @@
 #include "simplerect.h"
 #include "automation_controller.h"
 
-using std::vector;
-using std::list;
-using std::string;
-
 namespace ARDOUR {
 	class Session;
 	class Route;
@@ -67,8 +62,8 @@ class AutomationTimeAxisView : public TimeAxisView {
 				TimeAxisView& parent,
 				bool show_regions,
 				ArdourCanvas::Canvas& canvas,
-				const string & name, /* translatable */
-				const string & plug_name = "");
+				const std::string & name, /* translatable */
+				const std::string & plug_name = "");
 
 	~AutomationTimeAxisView();
 	
@@ -82,8 +77,8 @@ class AutomationTimeAxisView : public TimeAxisView {
 	boost::shared_ptr<AutomationLine> line() { return _line; }
 
 	void set_selected_points (PointSelection&);
-	void get_selectables (nframes_t start, nframes_t end, double top, double bot, list<Selectable *>&);
-	void get_inverted_selectables (Selection&, list<Selectable*>& results);
+	void get_selectables (nframes_t start, nframes_t end, double top, double bot, std::list<Selectable *>&);
+	void get_inverted_selectables (Selection&, std::list<Selectable*>& results);
 
 	void show_timestretch (nframes_t start, nframes_t end) {}
 	void hide_timestretch () {}
@@ -100,7 +95,7 @@ class AutomationTimeAxisView : public TimeAxisView {
 	guint32 show_at (double y, int& nth, Gtk::VBox *parent);
 	void hide ();
 	
-	static const string state_node_name;
+	static const std::string state_node_name;
 	XMLNode* get_state_node();
 	
 	boost::shared_ptr<ARDOUR::AutomationControl> control()    { return _control; }
@@ -117,7 +112,7 @@ class AutomationTimeAxisView : public TimeAxisView {
 	boost::shared_ptr<AutomationLine> _line;
 	AutomationStreamView*             _view;
 	
-	string _name;
+	std::string _name;
 	bool    ignore_toggle;
 
 	bool    first_call_to_set_height;
diff --git a/gtk2_ardour/axis_view.cc b/gtk2_ardour/axis_view.cc
index e4632dc9ca..8e817c435c 100644
--- a/gtk2_ardour/axis_view.cc
+++ b/gtk2_ardour/axis_view.cc
@@ -38,10 +38,10 @@
 #include "axis_view.h"
 #include "i18n.h"
 
+using namespace std;
 using namespace Gtk;
 using namespace Gtkmm2ext;
 
-
 list<Gdk::Color> AxisView::used_colors;
 
 AxisView::AxisView (ARDOUR::Session& sess) : _session(sess)
diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h
index 187443dab6..9bd39eec3e 100644
--- a/gtk2_ardour/axis_view.h
+++ b/gtk2_ardour/axis_view.h
@@ -49,7 +49,7 @@ class AxisView : public virtual Selectable
 
 	ARDOUR::Session& session() const { return _session; }
 
-	virtual string name() const = 0;
+	virtual std::string name() const = 0;
 
 	virtual bool marked_for_display() const { return _marked_for_display; }
 	virtual void set_marked_for_display (bool yn) {
@@ -79,7 +79,7 @@ class AxisView : public virtual Selectable
 	ARDOUR::Session& _session;
 	Gdk::Color _color;
 
-	static list<Gdk::Color> used_colors;
+	static std::list<Gdk::Color> used_colors;
 
 	Gtk::Label name_label;
 
diff --git a/gtk2_ardour/crossfade_edit.h b/gtk2_ardour/crossfade_edit.h
index 4b905a85c2..694625a9b5 100644
--- a/gtk2_ardour/crossfade_edit.h
+++ b/gtk2_ardour/crossfade_edit.h
@@ -61,14 +61,14 @@ class CrossfadeEditor : public ArdourDialog
 		    : x (a), y (b) {}
 	};
 	
-	struct Preset : public list<PresetPoint> {
+	struct Preset : public std::list<PresetPoint> {
 	    const char* name;
 	    const char* image_name;
 
 	    Preset (const char* n, const char* x) : name (n), image_name (x) {}
 	};
 	
-	typedef list<Preset*> Presets;
+	typedef std::list<Preset*> Presets;
 	
 	static Presets* fade_in_presets;
 	static Presets* fade_out_presets;
@@ -108,10 +108,10 @@ class CrossfadeEditor : public ArdourDialog
 	struct Half {
 	    ArdourCanvas::Line*     line;
 	    ArdourCanvas::Polygon*  shading;
-	    list<Point*>            points;
+	    std::list<Point*>       points;
 	    ARDOUR::AutomationList  normative_curve; /* 0 - 1.0, linear */
 	    ARDOUR::AutomationList  gain_curve;      /* 0 - 2.0, gain mapping */
-	    vector<ArdourCanvas::WaveView*>  waves;
+	    std::vector<ArdourCanvas::WaveView*>  waves;
 	    
 	    Half();
 	};
@@ -125,8 +125,8 @@ class CrossfadeEditor : public ArdourDialog
 	WhichFade current;
 	
 	bool point_grabbed;
-	vector<Gtk::Button*> fade_out_buttons;
-	vector<Gtk::Button*> fade_in_buttons;
+	std::vector<Gtk::Button*> fade_out_buttons;
+	std::vector<Gtk::Button*> fade_in_buttons;
 
 	Gtk::VBox vpacker2;
 
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 167ad65b1f..87e738fc76 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -507,7 +507,7 @@ class Editor : public PublicEditor
 
 	    void hide();
 	    void show ();
-	    void set_name (const string&);
+	    void set_name (const std::string&);
 	    void set_position (nframes64_t start, nframes64_t end = 0);
 	    void set_color_rgba (uint32_t);
 	};
@@ -522,7 +522,7 @@ class Editor : public PublicEditor
 	void hide_marker (ArdourCanvas::Item*, GdkEvent*);
 	void clear_marker_display ();
 	void mouse_add_new_marker (nframes64_t where, bool is_cd=false, bool is_xrun=false);
-	bool choose_new_marker_name(string &name);
+	bool choose_new_marker_name(std::string &name);
 	void update_cd_marker_display ();
 	void ensure_cd_marker_updated (LocationMarkers * lam, ARDOUR::Location * location);
 
@@ -546,9 +546,9 @@ class Editor : public PublicEditor
 
 	/* functions to be passed to mapover_tracks(), possibly with sigc::bind()-supplied arguments */
 
-	void mapped_get_equivalent_regions (RouteTimeAxisView&, uint32_t, RegionView*, vector<RegionView*>*) const;
-	void mapped_use_new_playlist (RouteTimeAxisView&, uint32_t, vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
-	void mapped_use_copy_playlist (RouteTimeAxisView&, uint32_t, vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
+	void mapped_get_equivalent_regions (RouteTimeAxisView&, uint32_t, RegionView*, std::vector<RegionView*>*) const;
+	void mapped_use_new_playlist (RouteTimeAxisView&, uint32_t, std::vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
+	void mapped_use_copy_playlist (RouteTimeAxisView&, uint32_t, std::vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
 	void mapped_clear_playlist (RouteTimeAxisView&, uint32_t);
 
 	/* end */
@@ -624,8 +624,8 @@ class Editor : public PublicEditor
 	
 	bool track_canvas_motion (GdkEvent*);
 
-	void set_verbose_canvas_cursor (const string &, double x, double y);
-	void set_verbose_canvas_cursor_text (const string &);
+	void set_verbose_canvas_cursor (const std::string &, double x, double y);
+	void set_verbose_canvas_cursor_text (const std::string &);
 	void show_verbose_canvas_cursor();
 	void hide_verbose_canvas_cursor();
 
@@ -866,7 +866,7 @@ class Editor : public PublicEditor
 	boost::shared_ptr<ARDOUR::Region> find_next_region (nframes64_t, ARDOUR::RegionPoint, int32_t dir, TrackViewList&, TimeAxisView ** = 0);
 	nframes64_t find_next_region_boundary (nframes64_t, int32_t dir, const TrackViewList&);
 
-	vector<nframes64_t> region_boundary_cache;
+	std::vector<nframes64_t> region_boundary_cache;
 	void build_region_boundary_cache ();
 
 	Gtk::HBox           top_hbox;
@@ -1127,7 +1127,7 @@ class Editor : public PublicEditor
 	int ensure_cursor (nframes64_t* pos);
 
 	void handle_new_region (boost::weak_ptr<ARDOUR::Region>);
-	void handle_new_regions (vector<boost::weak_ptr<ARDOUR::Region> >& );
+	void handle_new_regions (std::vector<boost::weak_ptr<ARDOUR::Region> >& );
 	void handle_region_removed (boost::weak_ptr<ARDOUR::Region>);
 	void add_region_to_region_display (boost::shared_ptr<ARDOUR::Region>);
 	void add_regions_to_region_display (std::vector<boost::weak_ptr<ARDOUR::Region> > & );
@@ -1141,7 +1141,7 @@ class Editor : public PublicEditor
 	bool no_region_list_redisplay;
 	void insert_into_tmp_regionlist(boost::shared_ptr<ARDOUR::Region>);
 
-	list<boost::shared_ptr<ARDOUR::Region> > tmp_region_list;
+	std::list<boost::shared_ptr<ARDOUR::Region> > tmp_region_list;
 
 	void cut_copy (Editing::CutCopyOp);
 	bool can_cut_copy () const;
@@ -1246,7 +1246,7 @@ class Editor : public PublicEditor
 	bool zoomed_to_region;
 	void temporal_zoom_session ();
 	void temporal_zoom (gdouble scale);
-	void temporal_zoom_by_frame (nframes64_t start, nframes64_t end, const string & op);
+	void temporal_zoom_by_frame (nframes64_t start, nframes64_t end, const std::string & op);
 	void temporal_zoom_to_frame (bool coarser, nframes64_t frame);
 
 	void amplitude_zoom (gdouble scale);
@@ -1263,7 +1263,7 @@ class Editor : public PublicEditor
 	void external_audio_dialog ();
 	void session_import_dialog ();
 
-	int  check_whether_and_how_to_import(string, bool all_or_nothing = true);
+	int  check_whether_and_how_to_import(std::string, bool all_or_nothing = true);
 	bool check_multichannel_status (const std::vector<Glib::ustring>& paths);
 
 	SoundFileOmega* sfbrowser;
@@ -1273,15 +1273,15 @@ class Editor : public PublicEditor
 	bool  idle_drop_paths  (std::vector<Glib::ustring> paths, nframes64_t frame, double ypos);
 	void  drop_paths_part_two  (const std::vector<Glib::ustring>& paths, nframes64_t frame, double ypos);
 	
-	void do_import (vector<Glib::ustring> paths, Editing::ImportDisposition, Editing::ImportMode mode, ARDOUR::SrcQuality, nframes64_t&);
-	void do_embed (vector<Glib::ustring> paths, Editing::ImportDisposition, Editing::ImportMode mode,  nframes64_t&);
+	void do_import (std::vector<Glib::ustring> paths, Editing::ImportDisposition, Editing::ImportMode mode, ARDOUR::SrcQuality, nframes64_t&);
+	void do_embed (std::vector<Glib::ustring> paths, Editing::ImportDisposition, Editing::ImportMode mode,  nframes64_t&);
 
-	int  import_sndfiles (vector<Glib::ustring> paths, Editing::ImportMode mode,  ARDOUR::SrcQuality, nframes64_t& pos,
+	int  import_sndfiles (std::vector<Glib::ustring> paths, Editing::ImportMode mode,  ARDOUR::SrcQuality, nframes64_t& pos,
 			      int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::Track>, bool, uint32_t total);
-	int  embed_sndfiles (vector<Glib::ustring> paths, bool multiple_files, bool& check_sample_rate, Editing::ImportMode mode, 
+	int  embed_sndfiles (std::vector<Glib::ustring> paths, bool multiple_files, bool& check_sample_rate, Editing::ImportMode mode, 
 			     nframes64_t& pos, int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::Track>&);
 
-	int add_sources (vector<Glib::ustring> paths, ARDOUR::SourceList& sources, nframes64_t& pos, Editing::ImportMode,
+	int add_sources (std::vector<Glib::ustring> paths, ARDOUR::SourceList& sources, nframes64_t& pos, Editing::ImportMode,
 			 int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::Track>&, bool add_channel_suffix);
 	int finish_bringing_in_material (boost::shared_ptr<ARDOUR::Region> region, uint32_t, uint32_t,  nframes64_t& pos, Editing::ImportMode mode,
 				      boost::shared_ptr<ARDOUR::Track>& existing_track);
@@ -1324,7 +1324,7 @@ class Editor : public PublicEditor
 	/* to support this ... */
 
 	void import_audio (bool as_tracks);
-	void do_import (vector<Glib::ustring> paths, bool split, bool as_tracks);
+	void do_import (std::vector<Glib::ustring> paths, bool split, bool as_tracks);
 
 	void move_to_start ();
 	void move_to_end ();
@@ -1412,7 +1412,7 @@ class Editor : public PublicEditor
 	/// Snap threshold in pixels
 	double snap_threshold;
 
-	void handle_gui_changes (const string &, void *);
+	void handle_gui_changes (const std::string &, void *);
 	bool ignore_gui_changes;
 
 	void    hide_all_tracks (bool with_select);
@@ -1653,7 +1653,7 @@ public:
 	Gtk::Menu* cd_marker_menu;
 	ArdourCanvas::Item* marker_menu_item;
 
-	typedef list<Marker*> Marks;
+	typedef std::list<Marker*> Marks;
 	Marks metric_marks;
 
 	void remove_metric_marks ();
@@ -2074,23 +2074,23 @@ public:
 	/* audio export */
 
 	int  write_region_selection(RegionSelection&);
-	bool write_region (string path, boost::shared_ptr<ARDOUR::AudioRegion>);
+	bool write_region (std::string path, boost::shared_ptr<ARDOUR::AudioRegion>);
 	void bounce_region_selection ();
 	void bounce_range_selection (bool replace, bool enable_processing);
 	void external_edit_region ();
 
 	int write_audio_selection (TimeSelection&);
-	bool write_audio_range (ARDOUR::AudioPlaylist&, const ARDOUR::ChanCount& channels, list<ARDOUR::AudioRange>&);
+	bool write_audio_range (ARDOUR::AudioPlaylist&, const ARDOUR::ChanCount& channels, std::list<ARDOUR::AudioRange>&);
 
 	void write_selection ();
 
 	XMLNode *before; /* used in *_reversible_command */
 
-	void begin_reversible_command (string cmd_name);
+	void begin_reversible_command (std::string cmd_name);
 	void commit_reversible_command ();
 
 	void update_title ();	
-	void update_title_s (const string & snapshot_name);
+	void update_title_s (const std::string & snapshot_name);
 
 	struct State {
 	    Selection* selection;
@@ -2172,8 +2172,8 @@ public:
 	bool _xfade_visibility;
 	
 #ifdef WITH_CMT
-	void handle_new_imageframe_time_axis_view(const string & track_name, void* src) ;
-	void handle_new_imageframe_marker_time_axis_view(const string & track_name, TimeAxisView* marked_track) ;
+	void handle_new_imageframe_time_axis_view(const std::string & track_name, void* src) ;
+	void handle_new_imageframe_marker_time_axis_view(const std::string & track_name, TimeAxisView* marked_track) ;
 
 	void start_imageframe_grab(ArdourCanvas::Item*, GdkEvent*) ;
 	void start_markerview_grab(ArdourCanvas::Item*, GdkEvent*) ;
@@ -2236,13 +2236,13 @@ public:
 	
 	/* audio filters */
 
-	void apply_filter (ARDOUR::Filter&, string cmd);
+	void apply_filter (ARDOUR::Filter&, std::string cmd);
 
 	/* handling cleanup */
 
 	int playlist_deletion_dialog (boost::shared_ptr<ARDOUR::Playlist>);
 
-	vector<sigc::connection> session_connections;
+	std::vector<sigc::connection> session_connections;
 
 	/* tracking step changes of track height */
 
@@ -2274,7 +2274,7 @@ public:
 	bool on_key_press_event (GdkEventKey*);
 	bool on_key_release_event (GdkEventKey*);
 
-	void session_state_saved (string);
+	void session_state_saved (std::string);
 
 	Glib::RefPtr<Gtk::Action>              undo_action;
 	Glib::RefPtr<Gtk::Action>              redo_action;
diff --git a/gtk2_ardour/editor_edit_groups.cc b/gtk2_ardour/editor_edit_groups.cc
index 55b264f87f..a0e7372ded 100644
--- a/gtk2_ardour/editor_edit_groups.cc
+++ b/gtk2_ardour/editor_edit_groups.cc
@@ -35,6 +35,7 @@
 
 #include "i18n.h"
 
+using namespace std;
 using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index 1b9b2a85df..25c195dcb1 100644
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -34,6 +34,7 @@
 
 #include "i18n.h"
 
+using namespace std;
 using namespace Gtkmm2ext;
 using namespace PBD;
 
diff --git a/gtk2_ardour/editor_region_list.cc b/gtk2_ardour/editor_region_list.cc
index 9d7aa86e5d..46ad668f4d 100644
--- a/gtk2_ardour/editor_region_list.cc
+++ b/gtk2_ardour/editor_region_list.cc
@@ -45,6 +45,7 @@
 
 #include "i18n.h"
 
+using namespace std;
 using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
diff --git a/gtk2_ardour/editor_route_list.cc b/gtk2_ardour/editor_route_list.cc
index 4765050ba5..00b4a3656d 100644
--- a/gtk2_ardour/editor_route_list.cc
+++ b/gtk2_ardour/editor_route_list.cc
@@ -39,6 +39,7 @@
 
 #include "i18n.h"
 
+using namespace std;
 using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
diff --git a/gtk2_ardour/editor_selection_list.cc b/gtk2_ardour/editor_selection_list.cc
index 7f818ebe2b..fab22e8f89 100644
--- a/gtk2_ardour/editor_selection_list.cc
+++ b/gtk2_ardour/editor_selection_list.cc
@@ -38,6 +38,7 @@
 
 #include "i18n.h"
 
+using namespace std;
 using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
diff --git a/gtk2_ardour/engine_dialog.h b/gtk2_ardour/engine_dialog.h
index d9741e3765..a6ebf1e8e6 100644
--- a/gtk2_ardour/engine_dialog.h
+++ b/gtk2_ardour/engine_dialog.h
@@ -83,7 +83,7 @@ class EngineControl : public Gtk::VBox {
 
 	std::map<std::string,std::vector<std::string> > devices;
 	std::vector<std::string> backend_devs;
-	void enumerate_devices (const string& driver);
+	void enumerate_devices (const std::string& driver);
 
 #ifdef __APPLE__
 	std::vector<std::string> enumerate_coreaudio_devices ();
diff --git a/gtk2_ardour/export_channel_selector.cc b/gtk2_ardour/export_channel_selector.cc
index 5700aaa929..2f66e58fe5 100644
--- a/gtk2_ardour/export_channel_selector.cc
+++ b/gtk2_ardour/export_channel_selector.cc
@@ -37,6 +37,8 @@
 
 #include "i18n.h"
 
+using namespace std;
+using namespace Glib;
 using namespace ARDOUR;
 using namespace PBD;
 
diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index a6a6b8dfcc..fd39aca335 100644
--- a/gtk2_ardour/export_dialog.cc
+++ b/gtk2_ardour/export_dialog.cc
@@ -234,7 +234,7 @@ ExportDialog::update_warnings ()
 	if (!warnings->conflicting_filenames.empty()) {
 		list_files_hbox.show ();
 		for (std::list<Glib::ustring>::iterator it = warnings->conflicting_filenames.begin(); it != warnings->conflicting_filenames.end(); ++it) {
-			ustring::size_type pos = it->find_last_of ("/");
+			Glib::ustring::size_type pos = it->find_last_of ("/");
 			list_files_string += "\n" + it->substr (0, pos + 1) + "<b>" + it->substr (pos + 1) + "</b>";
 		}
 	}
diff --git a/gtk2_ardour/export_multiplicator.h b/gtk2_ardour/export_multiplicator.h
index 60c6914bf5..679c6bc1d3 100644
--- a/gtk2_ardour/export_multiplicator.h
+++ b/gtk2_ardour/export_multiplicator.h
@@ -35,7 +35,6 @@
 #include <gtkmm.h>
 #include <boost/shared_ptr.hpp>
 
-using std::list;
 using ARDOUR::ExportProfileManager;
 
 class ExportMultiplicator : public Gtk::EventBox {
diff --git a/gtk2_ardour/export_timespan_selector.cc b/gtk2_ardour/export_timespan_selector.cc
index 2ed01715fd..e716e47be1 100644
--- a/gtk2_ardour/export_timespan_selector.cc
+++ b/gtk2_ardour/export_timespan_selector.cc
@@ -36,6 +36,7 @@
 
 #include "i18n.h"
 
+using namespace Glib;
 using namespace ARDOUR;
 using namespace PBD;
 
diff --git a/gtk2_ardour/ghostregion.cc b/gtk2_ardour/ghostregion.cc
index 27de656089..cfd9d3ea43 100644
--- a/gtk2_ardour/ghostregion.cc
+++ b/gtk2_ardour/ghostregion.cc
@@ -29,6 +29,7 @@
 #include "simplerect.h"
 #include "waveview.h"
 
+using namespace std;
 using namespace Editing;
 using namespace ArdourCanvas;
 using namespace ARDOUR;
diff --git a/gtk2_ardour/keyboard.h b/gtk2_ardour/keyboard.h
index a10fdbd6ba..2905299334 100644
--- a/gtk2_ardour/keyboard.h
+++ b/gtk2_ardour/keyboard.h
@@ -33,8 +33,6 @@
 
 #include "selection.h"
 
-using std::string;
-
 class Keyboard : public sigc::trackable, PBD::Stateful
 {
   public:
diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc
index 64c551f0d1..31c9da1552 100644
--- a/gtk2_ardour/location_ui.cc
+++ b/gtk2_ardour/location_ui.cc
@@ -38,6 +38,7 @@
 
 #include "i18n.h"
 
+using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 0a95b9a94b..7c57b7535b 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -50,6 +50,7 @@
 
 #include "i18n.h"
 
+using namespace std;
 using namespace Gtk;
 using namespace ARDOUR_COMMAND_LINE;
 using namespace ARDOUR;
diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index 7e0a846ec9..9bc475214a 100644
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -29,6 +29,7 @@
 
 #include "i18n.h"
 
+using namespace std;
 using namespace ARDOUR;
 
 Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, const string& annotation, 
diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h
index 8a82a90271..d1bc12561f 100644
--- a/gtk2_ardour/marker.h
+++ b/gtk2_ardour/marker.h
@@ -50,7 +50,7 @@ class Marker : public PBD::Destructible
 	};
 
 
-	Marker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, Type, 
+	Marker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const std::string& text, Type, 
 		nframes_t frame = 0, bool handle_events = true);
 
 	virtual ~Marker ();
@@ -63,7 +63,7 @@ class Marker : public PBD::Destructible
 	void set_line_vpos (double y_origin, double height);
 
 	void set_position (nframes_t);
-	void set_name (const string&);
+	void set_name (const std::string&);
 	void set_color_rgba (uint32_t rgba);
 	
 	nframes64_t position() const { return frame_position; }
@@ -98,7 +98,7 @@ class Marker : public PBD::Destructible
 class TempoMarker : public Marker
 {
   public:
-        TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, ARDOUR::TempoSection&);
+        TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const std::string& text, ARDOUR::TempoSection&);
 	~TempoMarker ();
 
 	ARDOUR::TempoSection& tempo() const { return _tempo; }
@@ -110,7 +110,7 @@ class TempoMarker : public Marker
 class MeterMarker : public Marker
 {
   public:
-        MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, ARDOUR::MeterSection&);
+        MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const std::string& text, ARDOUR::MeterSection&);
 	~MeterMarker ();
 
 	ARDOUR::MeterSection& meter() const { return _meter; }
diff --git a/gtk2_ardour/midi_streamview.h b/gtk2_ardour/midi_streamview.h
index 2780cfa3da..a844d8d505 100644
--- a/gtk2_ardour/midi_streamview.h
+++ b/gtk2_ardour/midi_streamview.h
@@ -58,8 +58,8 @@ class MidiStreamView : public StreamView
 	~MidiStreamView ();
 
 	void set_selected_regionviews (RegionSelection&);
-	void get_selectables (jack_nframes_t start, jack_nframes_t end, list<Selectable* >&);
-	void get_inverted_selectables (Selection&, list<Selectable* >& results);
+	void get_selectables (jack_nframes_t start, jack_nframes_t end, std::list<Selectable* >&);
+	void get_inverted_selectables (Selection&, std::list<Selectable* >& results);
 
 	enum VisibleNoteRange {
 		FullRange,
diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h
index 228e05176b..acf9c32ea5 100644
--- a/gtk2_ardour/midi_time_axis.h
+++ b/gtk2_ardour/midi_time_axis.h
@@ -82,12 +82,12 @@ class MidiTimeAxisView : public RouteTimeAxisView
 		return _channel_selector.mode_changed; 
 	}
 	
-	sigc::signal<void, string, string>& signal_midi_patch_settings_changed() {
+	sigc::signal<void, std::string, std::string>& signal_midi_patch_settings_changed() {
 		return _midi_patch_settings_changed;
 	}
 	
   private:
-	sigc::signal<void, string, string>  _midi_patch_settings_changed;
+	sigc::signal<void, std::string, std::string>  _midi_patch_settings_changed;
 	  		
 	void model_changed();
 	void custom_device_mode_changed();
diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index fdd5692111..e2fa2e52d5 100644
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -231,7 +231,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 
 	Gtk::Style *passthru_style;
 
-	void route_gui_changed (string, void*);
+	void route_gui_changed (std::string, void*);
 	void show_route_color ();
 	void show_passthru_color ();
 
diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index b445cc99db..932f828404 100644
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -115,7 +115,7 @@ class Mixer_UI : public Gtk::Window
 
 	void pane_allocation_handler (Gtk::Allocation&, Gtk::Paned*);
 	
-	list<MixerStrip *> strips;
+	std::list<MixerStrip *> strips;
 
 	bool strip_scroller_button_release (GdkEventButton*);
 
diff --git a/gtk2_ardour/option_editor.h b/gtk2_ardour/option_editor.h
index 5fc0dd02b0..802a088e20 100644
--- a/gtk2_ardour/option_editor.h
+++ b/gtk2_ardour/option_editor.h
@@ -189,8 +189,8 @@ class OptionEditor : public ArdourDialog
 	void setup_click_editor ();
 	void clear_click_editor ();
 
-	void click_chosen (const string & paths);
-	void click_emphasis_chosen (const string & paths);
+	void click_chosen (const std::string & paths);
+	void click_emphasis_chosen (const std::string & paths);
 
 	void click_browse_clicked ();
 	void click_emphasis_browse_clicked ();
diff --git a/gtk2_ardour/opts.h b/gtk2_ardour/opts.h
index 08e38be88d..71cd687b8b 100644
--- a/gtk2_ardour/opts.h
+++ b/gtk2_ardour/opts.h
@@ -23,21 +23,19 @@
 #include <string>
 #include <glibmm/ustring.h>
 
-using std::string;
-
 namespace ARDOUR_COMMAND_LINE {
 
-extern string session_name;
+extern std::string session_name;
 extern bool   show_key_actions;
 extern bool   no_splash;
 extern bool   just_version;
-extern string jack_client_name;
+extern std::string jack_client_name;
 extern bool   use_vst;
 extern bool   new_session;
 extern char*  curvetest_file;
 extern bool   try_hw_optimization;
 extern bool   use_gtk_theme;
-extern string keybindings_path;
+extern std::string keybindings_path;
 extern Glib::ustring menus_file;
 extern bool   finder_invoked_ardour;
 
diff --git a/gtk2_ardour/panner2d.h b/gtk2_ardour/panner2d.h
index 1abac7fe5a..e70f9faea5 100644
--- a/gtk2_ardour/panner2d.h
+++ b/gtk2_ardour/panner2d.h
@@ -22,7 +22,6 @@
 
 #include <sys/types.h>
 #include <map>
-#include <string>
 #include <vector>
 
 #include <glibmm/refptr.h>
@@ -33,9 +32,6 @@
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/adjustment.h>
 
-using std::map;
-using std::string;
-
 namespace ARDOUR {
 	class Panner;
 }
diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc
index 4777c82479..c8c933348b 100644
--- a/gtk2_ardour/panner_ui.cc
+++ b/gtk2_ardour/panner_ui.cc
@@ -39,6 +39,7 @@
 
 #include "i18n.h"
 
+using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtkmm2ext;
diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h
index 3fb4632d13..fa0b7ce2e8 100644
--- a/gtk2_ardour/panner_ui.h
+++ b/gtk2_ardour/panner_ui.h
@@ -70,7 +70,7 @@ class PannerUI : public Gtk::HBox
 
 	void effective_pan_display ();
 
-	void set_meter_strip_name (string name);
+	void set_meter_strip_name (std::string name);
 	boost::shared_ptr<PBD::Controllable> get_controllable();
 
   private:
diff --git a/gtk2_ardour/playlist_selection.h b/gtk2_ardour/playlist_selection.h
index 14366418e6..a29be49793 100644
--- a/gtk2_ardour/playlist_selection.h
+++ b/gtk2_ardour/playlist_selection.h
@@ -27,6 +27,6 @@ namespace ARDOUR {
 	class Playlist;
 }
 
-struct PlaylistSelection : list<boost::shared_ptr<ARDOUR::Playlist> > {};
+struct PlaylistSelection : std::list<boost::shared_ptr<ARDOUR::Playlist> > {};
 
 #endif /* __ardour_gtk_playlist_selection_h__ */
diff --git a/gtk2_ardour/plugin_ui.h b/gtk2_ardour/plugin_ui.h
index 1e0498212c..4ad7c213ac 100644
--- a/gtk2_ardour/plugin_ui.h
+++ b/gtk2_ardour/plugin_ui.h
@@ -178,9 +178,9 @@ class GenericPluginUI : public PlugUIBase, public Gtk::VBox
 	    /* input */
 	    
 	    Gtk::ComboBoxText* 	      combo;
-  	    std::map<string, float>*  combo_map;
+	    std::map<std::string, float>*  combo_map;
 	    Gtk::ToggleButton*        button;
-		boost::shared_ptr<AutomationController>  controller;
+	    boost::shared_ptr<AutomationController>  controller;
 	    Gtkmm2ext::ClickBox*       clickbox;
 	    Gtk::Label         label;
 	    bool               logarithmic;
@@ -207,7 +207,7 @@ class GenericPluginUI : public PlugUIBase, public Gtk::VBox
 	
 	void build ();
 	ControlUI* build_control_ui (guint32 port_index, boost::shared_ptr<ARDOUR::AutomationControl>);
-	std::vector<string> setup_scale_values(guint32 port_index, ControlUI* cui);
+	std::vector<std::string> setup_scale_values(guint32 port_index, ControlUI* cui);
 	void parameter_changed (ControlUI* cui);
 	void toggle_parameter_changed (ControlUI* cui);
 	void update_control_display (ControlUI* cui);
diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index 3c2de7edd7..f9b4cc0e6e 100644
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -74,6 +74,7 @@
 class AUPluginUI;
 #endif
 
+using namespace std;
 using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
diff --git a/gtk2_ardour/processor_box.h b/gtk2_ardour/processor_box.h
index 37c442d283..3286c14e6c 100644
--- a/gtk2_ardour/processor_box.h
+++ b/gtk2_ardour/processor_box.h
@@ -141,7 +141,7 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject
 	Gtk::Menu *processor_menu;
 	gint processor_menu_map_handler (GdkEventAny *ev);
 	Gtk::Menu * build_processor_menu ();
-	void build_processor_tooltip (Gtk::EventBox&, string);
+	void build_processor_tooltip (Gtk::EventBox&, std::string);
 	void show_processor_menu (gint arg);
 
 	void choose_send ();
@@ -162,7 +162,7 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject
 	void row_deleted (const Gtk::TreeModel::Path& path);
 	void show_processor_active (boost::weak_ptr<ARDOUR::Processor>);
 	void show_processor_name (boost::weak_ptr<ARDOUR::Processor>);
-	string processor_name (boost::weak_ptr<ARDOUR::Processor>);
+	std::string processor_name (boost::weak_ptr<ARDOUR::Processor>);
 
 	void remove_processor_gui (boost::shared_ptr<ARDOUR::Processor>);
 
@@ -185,7 +185,7 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject
 	void clear_processors ();
 	void rename_processors ();
 
-	typedef vector<boost::shared_ptr<ARDOUR::Processor> > ProcSelection;
+	typedef std::vector<boost::shared_ptr<ARDOUR::Processor> > ProcSelection;
 
 	void for_selected_processors (void (ProcessorBox::*pmf)(boost::shared_ptr<ARDOUR::Processor>));
 	void get_selected_processors (ProcSelection&);
diff --git a/gtk2_ardour/region_gain_line.h b/gtk2_ardour/region_gain_line.h
index dc24e6a5a6..7950c9b0e7 100644
--- a/gtk2_ardour/region_gain_line.h
+++ b/gtk2_ardour/region_gain_line.h
@@ -35,7 +35,7 @@ class AudioRegionView;
 class AudioRegionGainLine : public AutomationLine
 {
   public:
-  AudioRegionGainLine (const string & name, ARDOUR::Session&, AudioRegionView&, ArdourCanvas::Group& parent, boost::shared_ptr<ARDOUR::AutomationList>);
+	AudioRegionGainLine (const std::string & name, ARDOUR::Session&, AudioRegionView&, ArdourCanvas::Group& parent, boost::shared_ptr<ARDOUR::AutomationList>);
 	
 	void start_drag (ControlPoint*, nframes_t x, float fraction);
 	void end_drag (ControlPoint*);
diff --git a/gtk2_ardour/region_selection.cc b/gtk2_ardour/region_selection.cc
index ac8a783a41..13e2bdb7f4 100644
--- a/gtk2_ardour/region_selection.cc
+++ b/gtk2_ardour/region_selection.cc
@@ -24,6 +24,7 @@
 #include "region_selection.h"
 #include "time_axis_view.h"
 
+using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace sigc;
diff --git a/gtk2_ardour/region_selection.h b/gtk2_ardour/region_selection.h
index ee0cdab008..305fc69afd 100644
--- a/gtk2_ardour/region_selection.h
+++ b/gtk2_ardour/region_selection.h
@@ -24,9 +24,6 @@
 #include <sigc++/signal.h>
 #include "ardour/types.h"
 
-using std::list;
-using std::set;
-
 class RegionView;
 class TimeAxisView;
 
@@ -71,7 +68,7 @@ class RegionSelection : public std::list<RegionView*>, public sigc::trackable
 	nframes_t _current_start; ///< start position for the selection
 	nframes_t _current_end; ///< end position for the selection
 
-	list<RegionView *> _bylayer; ///< list of regions sorted by layer
+	std::list<RegionView *> _bylayer; ///< list of regions sorted by layer
 };
 
 #endif /* __ardour_gtk_region_selection_h__ */
diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index 7efde0ddf2..0ae2db4463 100644
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -49,6 +49,7 @@
 
 #include "i18n.h"
 
+using namespace std;
 using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
diff --git a/gtk2_ardour/return_ui.cc b/gtk2_ardour/return_ui.cc
index 5423415bd2..ac06529d38 100644
--- a/gtk2_ardour/return_ui.cc
+++ b/gtk2_ardour/return_ui.cc
@@ -28,6 +28,7 @@
 #include "ardour_ui.h"
 #include "gui_thread.h"
 
+using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
@@ -114,8 +115,8 @@ ReturnUIWindow::ReturnUIWindow (boost::shared_ptr<Return> s, Session& ss)
 			mem_fun (*this, &ReturnUIWindow::return_going_away));
 
 	signal_delete_event().connect (bind (
-			ptr_fun (just_hide_it),
-			reinterpret_cast<Window *> (this)));
+					       sigc::ptr_fun (just_hide_it),
+					       reinterpret_cast<Window *> (this)));
 }
 
 ReturnUIWindow::~ReturnUIWindow ()
diff --git a/gtk2_ardour/route_processor_selection.cc b/gtk2_ardour/route_processor_selection.cc
index 0b02a2837a..243a32b0c5 100644
--- a/gtk2_ardour/route_processor_selection.cc
+++ b/gtk2_ardour/route_processor_selection.cc
@@ -29,6 +29,7 @@
 
 #include "i18n.h"
 
+using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace sigc;
diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index 9c386bafa3..cc0e46548e 100644
--- a/gtk2_ardour/route_time_axis.h
+++ b/gtk2_ardour/route_time_axis.h
@@ -83,8 +83,8 @@ public:
 	void selection_click (GdkEventButton*);
 	void set_selected_points (PointSelection&);
 	void set_selected_regionviews (RegionSelection&);
-	void get_selectables (nframes_t start, nframes_t end, double top, double bot, list<Selectable *>&);
-	void get_inverted_selectables (Selection&, list<Selectable*>&);
+	void get_selectables (nframes_t start, nframes_t end, double top, double bot, std::list<Selectable *>&);
+	void get_inverted_selectables (Selection&, std::list<Selectable*>&);
 	bool show_automation(Evoral::Parameter param);
 	void set_layer_display (LayerDisplay d);
 	LayerDisplay layer_display () const;
@@ -99,12 +99,12 @@ public:
 	TimeAxisView::Children get_child_list();
 
 	/* The editor calls these when mapping an operation across multiple tracks */
-	void use_new_playlist (bool prompt, vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
-	void use_copy_playlist (bool prompt, vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
+	void use_new_playlist (bool prompt, std::vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
+	void use_copy_playlist (bool prompt, std::vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
 	void clear_playlist ();
 
 	/* group playlist name resolving */
-	std::string resolve_new_group_playlist_name(std::string &, vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
+	std::string resolve_new_group_playlist_name(std::string &, std::vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
 
 	
 	void build_playlist_menu (Gtk::Menu *);
@@ -118,7 +118,7 @@ public:
 	/* This is a bit nasty to expose :/ */
 	struct RouteAutomationNode {
 		Evoral::Parameter                         param;
-	    Gtk::CheckMenuItem*                       menu_item;
+		Gtk::CheckMenuItem*                       menu_item;
 		boost::shared_ptr<AutomationTimeAxisView> track;
 	    
 		RouteAutomationNode (Evoral::Parameter par, Gtk::CheckMenuItem* mi, boost::shared_ptr<AutomationTimeAxisView> tr)
@@ -131,12 +131,12 @@ public:
 
 	XMLNode* get_automation_child_xml_node (Evoral::Parameter param) { return RouteUI::get_automation_child_xml_node (param); }
 	
-	typedef map<Evoral::Parameter, RouteAutomationNode*> AutomationTracks;
+	typedef std::map<Evoral::Parameter, RouteAutomationNode*> AutomationTracks;
 	AutomationTracks automation_tracks() { return _automation_tracks; }
 
 	boost::shared_ptr<AutomationTimeAxisView> automation_child(Evoral::Parameter param);
 	
-	string              name() const;
+	std::string         name() const;
 	StreamView*         view() const { return _view; }
 	ARDOUR::RouteGroup* edit_group() const;
 	boost::shared_ptr<ARDOUR::Playlist> playlist() const;
@@ -157,9 +157,9 @@ protected:
 
 	struct ProcessorAutomationNode {
 		Evoral::Parameter                         what;
-	    Gtk::CheckMenuItem*                       menu_item;
+		Gtk::CheckMenuItem*                       menu_item;
 		boost::shared_ptr<AutomationTimeAxisView> view;
-	    RouteTimeAxisView&                        parent;
+		RouteTimeAxisView&                        parent;
 
 	    ProcessorAutomationNode (Evoral::Parameter w, Gtk::CheckMenuItem* mitem, RouteTimeAxisView& p)
 		    : what (w), menu_item (mitem), parent (p) {}
@@ -171,7 +171,7 @@ protected:
 	    boost::shared_ptr<ARDOUR::Processor> processor;
 	    bool                                 valid;
 	    Gtk::Menu*                           menu;
-	    vector<ProcessorAutomationNode*>     lines;
+	    std::vector<ProcessorAutomationNode*>     lines;
 
 	    ProcessorAutomationInfo (boost::shared_ptr<ARDOUR::Processor> i) 
 		    : processor (i), valid (true), menu (0) {}
@@ -302,9 +302,9 @@ protected:
 	void _set_track_mode (ARDOUR::Track* track, ARDOUR::TrackMode mode, Gtk::RadioMenuItem* reset_item, Gtk::RadioMenuItem* reset_item_2);
 	void track_mode_changed ();
 
-	list<ProcessorAutomationInfo*> processor_automation;
+	std::list<ProcessorAutomationInfo*> processor_automation;
 
-	typedef vector<boost::shared_ptr<AutomationLine> > ProcessorAutomationCurves;
+	typedef std::vector<boost::shared_ptr<AutomationLine> > ProcessorAutomationCurves;
 	ProcessorAutomationCurves processor_automation_curves;
 	
 	// Set from XML so context menu automation buttons can be correctly initialized
@@ -323,9 +323,9 @@ protected:
 	XMLNode* underlay_xml_node;
 	bool set_underlay_state();
 
-	typedef list<StreamView*> UnderlayList;
+	typedef std::list<StreamView*> UnderlayList;
 	UnderlayList _underlay_streams;
-	typedef list<RouteTimeAxisView*> UnderlayMirrorList;
+	typedef std::list<RouteTimeAxisView*> UnderlayMirrorList;
 	UnderlayMirrorList _underlay_mirrors;
 };
 
diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h
index 320dab9dae..4ec6fd3ce8 100644
--- a/gtk2_ardour/route_ui.h
+++ b/gtk2_ardour/route_ui.h
@@ -65,7 +65,7 @@ class RouteUI : public virtual AxisView
 	
 	boost::shared_ptr<ARDOUR::Diskstream> get_diskstream() const;
 
-	string name() const;
+	std::string name() const;
 
 	// protected: XXX sigh this should be here
 
@@ -83,8 +83,8 @@ class RouteUI : public virtual AxisView
 	BindableToggleButton* solo_button;
 	BindableToggleButton* rec_enable_button;
 	
-	virtual string solo_button_name () const { return "SoloButton"; }
-	virtual string safe_solo_button_name () const { return "SafeSoloButton"; }
+	virtual std::string solo_button_name () const { return "SoloButton"; }
+	virtual std::string safe_solo_button_name () const { return "SafeSoloButton"; }
 	
 	Gtk::Menu* mute_menu;
 	Gtk::Menu* solo_menu;
@@ -164,8 +164,8 @@ class RouteUI : public virtual AxisView
 
 	void set_remote_control_id (uint32_t id, Gtk::CheckMenuItem* item);
 
-	void reversibly_apply_route_boolean (string name, void (ARDOUR::Route::*func)(bool, void*), bool, void *);
-	void reversibly_apply_track_boolean (string name, void (ARDOUR::Track::*func)(bool, void*), bool, void *);
+	void reversibly_apply_route_boolean (std::string name, void (ARDOUR::Route::*func)(bool, void*), bool, void *);
+	void reversibly_apply_track_boolean (std::string name, void (ARDOUR::Track::*func)(bool, void*), bool, void *);
 
 	void adjust_latency ();
 	void save_as_template ();
diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc
index da0047eefc..92546e5ef4 100644
--- a/gtk2_ardour/selection.cc
+++ b/gtk2_ardour/selection.cc
@@ -33,6 +33,7 @@
 
 #include "i18n.h"
 
+using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace sigc;
diff --git a/gtk2_ardour/selection.h b/gtk2_ardour/selection.h
index 1e2257fc15..f0af31eafe 100644
--- a/gtk2_ardour/selection.h
+++ b/gtk2_ardour/selection.h
@@ -148,7 +148,7 @@ class Selection : public sigc::trackable
 	void remove (boost::shared_ptr<ARDOUR::AutomationList>);
 	void remove (boost::shared_ptr<ARDOUR::Playlist>);
 	void remove (const std::list<boost::shared_ptr<ARDOUR::Playlist> >&);
-	void remove (const list<Selectable*>&);
+	void remove (const std::list<Selectable*>&);
 	void remove (Marker*);
 
 	void replace (uint32_t time_index, nframes_t start, nframes_t end);
diff --git a/gtk2_ardour/send_ui.cc b/gtk2_ardour/send_ui.cc
index 664092d39f..672d5f3d20 100644
--- a/gtk2_ardour/send_ui.cc
+++ b/gtk2_ardour/send_ui.cc
@@ -28,6 +28,7 @@
 #include "ardour_ui.h"
 #include "gui_thread.h"
 
+using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
@@ -132,8 +133,8 @@ SendUIWindow::SendUIWindow (boost::shared_ptr<Send> s, Session& ss)
 			mem_fun (*this, &SendUIWindow::send_going_away));
 
 	signal_delete_event().connect (bind (
-			ptr_fun (just_hide_it),
-			reinterpret_cast<Window *> (this)));
+					       sigc::ptr_fun (just_hide_it),
+					       reinterpret_cast<Window *> (this)));
 }
 
 SendUIWindow::~SendUIWindow ()
diff --git a/gtk2_ardour/session_import_dialog.cc b/gtk2_ardour/session_import_dialog.cc
index 2d1f6a1007..d79f977b3e 100644
--- a/gtk2_ardour/session_import_dialog.cc
+++ b/gtk2_ardour/session_import_dialog.cc
@@ -34,6 +34,7 @@
 #include "prompter.h"
 #include "i18n.h"
 
+using namespace std;
 using namespace ARDOUR;
 
 SessionImportDialog::SessionImportDialog (ARDOUR::Session & target) :
diff --git a/gtk2_ardour/session_import_dialog.h b/gtk2_ardour/session_import_dialog.h
index cf1f5b0a4e..74da13855a 100644
--- a/gtk2_ardour/session_import_dialog.h
+++ b/gtk2_ardour/session_import_dialog.h
@@ -34,8 +34,6 @@
 
 #include "ardour_dialog.h"
 
-using std::string;
-
 namespace ARDOUR {
 	class Session;
 }
@@ -56,16 +54,16 @@ class SessionImportDialog : public ArdourDialog
 	
   private:
 
-	void load_session (const string& filename);
+	void load_session (const std::string& filename);
 	void fill_list ();
 	void browse ();
 	void do_merge ();
 	void end_dialog ();
-	void update (string path);
+	void update (std::string path);
 	void show_info(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* column);
 	
-	std::pair<bool, string> open_rename_dialog (string text, string name);
-	bool open_prompt_dialog (string text);
+	std::pair<bool, std::string> open_rename_dialog (std::string text, std::string name);
+	bool open_prompt_dialog (std::string text);
 
 	// Data
 	HandlerList        handlers;
diff --git a/gtk2_ardour/session_metadata_dialog.cc b/gtk2_ardour/session_metadata_dialog.cc
index 6038b8b5ae..18d5eaf1aa 100644
--- a/gtk2_ardour/session_metadata_dialog.cc
+++ b/gtk2_ardour/session_metadata_dialog.cc
@@ -30,6 +30,9 @@
 #include "ardour/session_directory.h"
 #include "ardour/session_utils.h"
 
+using namespace std;
+using namespace Glib;
+
 #define CALL_MEMBER_FN(object,ptrToMember)  ((object).*(ptrToMember))
 
 /*** MetadataField ***/
diff --git a/gtk2_ardour/session_metadata_dialog.h b/gtk2_ardour/session_metadata_dialog.h
index e06dbe010c..defd540618 100644
--- a/gtk2_ardour/session_metadata_dialog.h
+++ b/gtk2_ardour/session_metadata_dialog.h
@@ -30,24 +30,21 @@
 
 #include "ardour/session_metadata.h"
 
-using std::string;
-using Glib::ustring;
-
 class MetadataField;
 typedef boost::shared_ptr<MetadataField> MetadataPtr; 
 
 /// Wraps a metadata field to be used in a GUI
 class MetadataField {
   public:
-	MetadataField (ustring const & field_name);
+	MetadataField (Glib::ustring const & field_name);
 	virtual ~MetadataField();
 	virtual MetadataPtr copy () = 0;
 	
 	virtual void save_data (ARDOUR::SessionMetadata & data) const = 0;
 	virtual void load_data (ARDOUR::SessionMetadata const & data) = 0;
 	
-	virtual ustring name() { return _name; }
-	virtual ustring value() { return _value; }
+	virtual Glib::ustring name() { return _name; }
+	virtual Glib::ustring value() { return _value; }
 	
 	/// Get widget containing name of field
 	virtual Gtk::Widget & name_widget () = 0;
@@ -56,17 +53,17 @@ class MetadataField {
 	/// Get widget for editing value
 	virtual Gtk::Widget & edit_widget () = 0;
   protected:
-	ustring _name;
-	ustring _value;
+	Glib::ustring _name;
+	Glib::ustring _value;
 };
 
 /// MetadataField that contains text
 class TextMetadataField : public MetadataField {
   private:
-	typedef ustring (ARDOUR::SessionMetadata::*Getter) () const;
-	typedef void (ARDOUR::SessionMetadata::*Setter) (ustring const &);
+	typedef Glib::ustring (ARDOUR::SessionMetadata::*Getter) () const;
+	typedef void (ARDOUR::SessionMetadata::*Setter) (Glib::ustring const &);
   public:
-	TextMetadataField (Getter getter, Setter setter, ustring const & field_name, guint width = 50);
+	TextMetadataField (Getter getter, Setter setter, Glib::ustring const & field_name, guint width = 50);
 	MetadataPtr copy ();
 	
 	void save_data (ARDOUR::SessionMetadata & data) const;
@@ -94,7 +91,7 @@ class NumberMetadataField : public MetadataField {
 	typedef uint32_t (ARDOUR::SessionMetadata::*Getter) () const;
 	typedef void (ARDOUR::SessionMetadata::*Setter) (uint32_t);
   public:
-	NumberMetadataField (Getter getter, Setter setter, ustring const & field_name, guint numbers, guint width = 50);
+	NumberMetadataField (Getter getter, Setter setter, Glib::ustring const & field_name, guint numbers, guint width = 50);
 	MetadataPtr copy ();
 	
 	void save_data (ARDOUR::SessionMetadata & data) const;
@@ -105,8 +102,8 @@ class NumberMetadataField : public MetadataField {
 	Gtk::Widget & edit_widget ();
   private:
 	void update_value ();
-	ustring uint_to_str (uint32_t i) const;
-	uint32_t str_to_uint (ustring const & str) const;
+	Glib::ustring uint_to_str (uint32_t i) const;
+	uint32_t str_to_uint (Glib::ustring const & str) const;
 	
 	Getter getter;
 	Setter setter;
@@ -122,7 +119,7 @@ class NumberMetadataField : public MetadataField {
 /// Interface for MetadataFields
 class SessionMetadataSet {
   public:
-	SessionMetadataSet (ustring const & name);
+	SessionMetadataSet (Glib::ustring const & name);
 	virtual ~SessionMetadataSet () {};
 	
 	void add_data_field (MetadataPtr field);
@@ -140,14 +137,14 @@ class SessionMetadataSet {
   protected:
 	typedef std::list<MetadataPtr> DataList;
 	DataList list;
-	ustring name;
+	Glib::ustring name;
 	ARDOUR::Session *session;
 };
 
 /// Contains MetadataFields for editing
 class SessionMetadataSetEditable : public SessionMetadataSet {
   public:
-	SessionMetadataSetEditable (ustring const & name);
+	SessionMetadataSetEditable (Glib::ustring const & name);
 	
 	Gtk::Widget & get_widget () { return table; }
 	Gtk::Widget & get_tab_widget ();
@@ -165,7 +162,7 @@ class SessionMetadataSetEditable : public SessionMetadataSet {
 /// Contains MetadataFields for importing
 class SessionMetadataSetImportable : public SessionMetadataSet {
   public:
-	SessionMetadataSetImportable (ustring const & name);
+	SessionMetadataSetImportable (Glib::ustring const & name);
 	
 	Gtk::Widget & get_widget () { return tree_view; }
 	Gtk::Widget & get_tab_widget ();
@@ -183,8 +180,8 @@ class SessionMetadataSetImportable : public SessionMetadataSet {
 	struct Columns : public Gtk::TreeModel::ColumnRecord
 	{
 	  public:
-		Gtk::TreeModelColumn<ustring>     field;
-		Gtk::TreeModelColumn<ustring>     values;
+		Gtk::TreeModelColumn<Glib::ustring>     field;
+		Gtk::TreeModelColumn<Glib::ustring>     values;
 		Gtk::TreeModelColumn<bool>        import;
 		Gtk::TreeModelColumn<MetadataPtr> data;
 	
@@ -199,7 +196,7 @@ class SessionMetadataSetImportable : public SessionMetadataSet {
 	Gtk::CheckButton              select_all_check;
 	
 	void select_all ();
-	void selection_changed (ustring const & path);
+	void selection_changed (Glib::ustring const & path);
 };
 
 /// Metadata dialog interface
@@ -211,7 +208,7 @@ template <typename DataSet>
 class SessionMetadataDialog : public ArdourDialog
 {
   public:
-	SessionMetadataDialog (ustring const & name);
+	SessionMetadataDialog (Glib::ustring const & name);
 
   protected:
 	void init_data ();
@@ -222,7 +219,7 @@ class SessionMetadataDialog : public ArdourDialog
 	virtual void save_and_close ();
 	virtual void end_dialog ();
 	
-	void warn_user (ustring const & string);
+	void warn_user (Glib::ustring const & string);
 	
 	typedef std::list<Gtk::Widget *> WidgetList;
 	typedef boost::shared_ptr<WidgetList> WidgetListPtr;
diff --git a/gtk2_ardour/splash.cc b/gtk2_ardour/splash.cc
index e81a987aa1..bf4d9bc27f 100644
--- a/gtk2_ardour/splash.cc
+++ b/gtk2_ardour/splash.cc
@@ -12,6 +12,7 @@
 
 using namespace Gtk;
 using namespace Glib;
+using namespace PBD;
 using namespace std;
 using namespace ARDOUR;
 
diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index 27131fa3e3..3251e748f5 100644
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -41,6 +41,7 @@
 #include "gui_thread.h"
 #include "utils.h"
 
+using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Editing;
diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index caea5487ee..546d51dee2 100644
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -89,8 +89,8 @@ public:
 	void         foreach_regionview (sigc::slot<void,RegionView*> slot);
 
 	void set_selected_regionviews (RegionSelection&);
-	void get_selectables (nframes_t start, nframes_t end, list<Selectable* >&);
-	void get_inverted_selectables (Selection&, list<Selectable* >& results);
+	void get_selectables (nframes_t start, nframes_t end, std::list<Selectable* >&);
+	void get_inverted_selectables (Selection&, std::list<Selectable* >& results);
 
 	virtual void update_contents_metrics(boost::shared_ptr<ARDOUR::Region> r) {}
 	void add_region_view (boost::shared_ptr<ARDOUR::Region>);
@@ -135,14 +135,14 @@ protected:
 	ArdourCanvas::Group*      canvas_group;
 	ArdourCanvas::SimpleRect* canvas_rect; /* frame around the whole thing */
 
-	typedef list<RegionView* > RegionViewList;
+	typedef std::list<RegionView* > RegionViewList;
 	RegionViewList  region_views;
 
 	double _samples_per_unit;
 
 	sigc::connection       screen_update_connection;
-	vector<RecBoxInfo>     rec_rects;
-	list< std::pair<boost::shared_ptr<ARDOUR::Region>,RegionView* > > rec_regions;
+	std::vector<RecBoxInfo>     rec_rects;
+	std::list< std::pair<boost::shared_ptr<ARDOUR::Region>,RegionView* > > rec_regions;
 	bool                   rec_updating;
 	bool                   rec_active;
 	bool                   use_rec_regions;
@@ -150,7 +150,7 @@ protected:
 	Gdk::Color region_color;      ///< Contained region color
 	uint32_t   stream_base_color; ///< Background color
 
-	vector<sigc::connection> playlist_connections;
+	std::vector<sigc::connection> playlist_connections;
 	sigc::connection         playlist_change_connection;
 
 	ARDOUR::layer_t _layers;
@@ -158,7 +158,7 @@ protected:
 	
 	double height;
 
-	list<sigc::connection> rec_data_ready_connections;
+	std::list<sigc::connection> rec_data_ready_connections;
 	jack_nframes_t         last_rec_data_frame;
 
 private:
diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc
index 7a59fe9ab0..6bb50469dd 100644
--- a/gtk2_ardour/tempo_dialog.cc
+++ b/gtk2_ardour/tempo_dialog.cc
@@ -27,6 +27,7 @@
 
 #include "i18n.h"
 
+using namespace std;
 using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace ARDOUR;
diff --git a/gtk2_ardour/tempo_dialog.h b/gtk2_ardour/tempo_dialog.h
index 3cdc29a347..5f014ecbfb 100644
--- a/gtk2_ardour/tempo_dialog.h
+++ b/gtk2_ardour/tempo_dialog.h
@@ -38,7 +38,7 @@
 struct TempoDialog : public ArdourDialog 
 {
 	Gtk::ComboBoxText note_types;
-	vector<string> strings;
+	std::vector<std::string> strings;
 	Gtk::Adjustment   bpm_adjustment;
 	Gtk::SpinButton   bpm_spinner;
 	Gtk::Frame        bpm_frame;
@@ -54,8 +54,8 @@ struct TempoDialog : public ArdourDialog
 	Gtk::Frame   when_frame;
 	char buf[64];
     
-	TempoDialog (ARDOUR::TempoMap&, nframes_t, const string & action);
-	TempoDialog (ARDOUR::TempoSection&, const string & action);
+	TempoDialog (ARDOUR::TempoMap&, nframes_t, const std::string & action);
+	TempoDialog (ARDOUR::TempoSection&, const std::string & action);
 
 	double get_bpm ();
 	double get_note_type ();
@@ -74,7 +74,7 @@ struct MeterDialog : public ArdourDialog
 {
 	Gtk::Entry   bpb_entry;
 	Gtk::ComboBoxText note_types;
-	vector<string> strings;
+	std::vector<std::string> strings;
 	Gtk::Frame   bpb_frame;
 	Gtk::Button  ok_button;
 	Gtk::Button  cancel_button;
@@ -82,8 +82,8 @@ struct MeterDialog : public ArdourDialog
 	Gtk::Frame   when_frame;
 	char buf[64];
     
-	MeterDialog (ARDOUR::TempoMap&, nframes_t, const string & action);
-	MeterDialog (ARDOUR::MeterSection&, const string & action);
+	MeterDialog (ARDOUR::TempoMap&, nframes_t, const std::string & action);
+	MeterDialog (ARDOUR::MeterSection&, const std::string & action);
 
 	double get_bpb ();
 	double get_note_type ();
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index f62895c6f7..b2b0bde460 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -54,6 +54,7 @@
 
 #include "i18n.h"
 
+using namespace std;
 using namespace Gtk;
 using namespace Gdk;
 using namespace sigc; 
diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index 6f0b3310eb..56e7042548 100644
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -193,8 +193,8 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
 
   	void order_selection_trims (ArdourCanvas::Item *item, bool put_start_on_top);
 
-	virtual void get_selectables (nframes_t start, nframes_t end, double top, double bot, list<Selectable*>& results);
-	virtual void get_inverted_selectables (Selection&, list<Selectable *>& results);
+	virtual void get_selectables (nframes_t start, nframes_t end, double top, double bot, std::list<Selectable*>& results);
+	virtual void get_inverted_selectables (Selection&, std::list<Selectable *>& results);
 
 	void add_ghost (RegionView*);
 	void remove_ghost (RegionView*);
@@ -233,8 +233,8 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
 
 	uint32_t height;  /* in canvas units */
 
-	string controls_base_unselected_name;
-	string controls_base_selected_name;
+	std::string controls_base_unselected_name;
+	std::string controls_base_selected_name;
 
 	bool name_entry_button_press (GdkEventButton *ev);
 	bool name_entry_button_release (GdkEventButton *ev);
@@ -310,10 +310,10 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
 
 	ArdourCanvas::Group      *selection_group;
 
-	list<GhostRegion*> ghosts;
+	std::list<GhostRegion*> ghosts;
 
-	list<SelectionRect*> free_selection_rects;
-	list<SelectionRect*> used_selection_rects;
+	std::list<SelectionRect*> free_selection_rects;
+	std::list<SelectionRect*> used_selection_rects;
 
 	SelectionRect* get_selection_rect(uint32_t id);
 
diff --git a/gtk2_ardour/track_selection.h b/gtk2_ardour/track_selection.h
index 53f59e67cf..57b8469afb 100644
--- a/gtk2_ardour/track_selection.h
+++ b/gtk2_ardour/track_selection.h
@@ -24,6 +24,6 @@
 
 class TimeAxisView;
 
-struct TrackSelection : public list<TimeAxisView*> {};
+struct TrackSelection : public std::list<TimeAxisView*> {};
 
 #endif /* __ardour_gtk_track_selection_h__ */