diff -ur ardour-0.9beta17.1.orig/gtk_ardour/audio_time_axis.h ardour-0.9beta17.1/gtk_ardour/audio_time_axis.h
--- ardour-0.9beta17.1.orig/gtk_ardour/audio_time_axis.h	2004-07-11 19:31:11.782836352 -0400
+++ ardour-0.9beta17.1/gtk_ardour/audio_time_axis.h	2004-07-11 19:35:51.593298696 -0400
@@ -252,7 +252,7 @@
 	void show_all_automation ();
 	void show_existing_automation ();
 
-	friend struct RedirectAutomationNode {
+	struct RedirectAutomationNode {
 	    unsigned long     what;
 	    Gtk::CheckMenuItem* menu_item;
 	    AutomationTimeAxisView* view;
@@ -264,7 +264,7 @@
 	    ~RedirectAutomationNode ();
 	};
 
-	friend struct RedirectAutomationInfo {
+	struct RedirectAutomationInfo {
 	    ARDOUR::Redirect* redirect;
 	    bool valid;
 	    Gtk::Menu* menu;
diff -ur ardour-0.9beta17.1.orig/gtk_ardour/editor_ops.cc ardour-0.9beta17.1/gtk_ardour/editor_ops.cc
--- ardour-0.9beta17.1.orig/gtk_ardour/editor_ops.cc	2004-07-11 19:31:11.772837872 -0400
+++ ardour-0.9beta17.1/gtk_ardour/editor_ops.cc	2004-07-11 19:35:51.600297632 -0400
@@ -2814,7 +2814,6 @@
 void
 Editor::paste_named_selection (float times)
 {
-	using Gtk::CList_Helpers;
 	Gtk::CList_Helpers::SelectionList& selected = named_selection_display.selection();
 	TrackSelection::iterator i;
 
diff -ur ardour-0.9beta17.1.orig/gtk_ardour/editor_region_list.cc ardour-0.9beta17.1/gtk_ardour/editor_region_list.cc
--- ardour-0.9beta17.1.orig/gtk_ardour/editor_region_list.cc	2004-07-11 19:31:11.773837720 -0400
+++ ardour-0.9beta17.1/gtk_ardour/editor_region_list.cc	2004-07-11 19:35:51.601297480 -0400
@@ -195,7 +195,6 @@
 void
 Editor::add_audio_region_to_region_display (AudioRegion *region)
 {
-	using Gtk::CTree_Helpers;
 
 	vector<const char*> item;
 	Gtk::CTree_Helpers::RowList::iterator i;
diff -ur ardour-0.9beta17.1.orig/gtk_ardour/mixer_strip.cc ardour-0.9beta17.1/gtk_ardour/mixer_strip.cc
--- ardour-0.9beta17.1.orig/gtk_ardour/mixer_strip.cc	2004-07-11 19:31:11.784836048 -0400
+++ ardour-0.9beta17.1/gtk_ardour/mixer_strip.cc	2004-07-11 19:35:51.611295960 -0400
@@ -1829,7 +1829,6 @@
 gint
 MixerStrip::compute_redirect_sort_keys ()
 {
-	using Gtk::CList_Helpers;
 	CList_Helpers::RowList::iterator i;
 	unsigned long sort_key;
 
diff -ur ardour-0.9beta17.1.orig/gtk_ardour/route_params_ui.cc ardour-0.9beta17.1/gtk_ardour/route_params_ui.cc
--- ardour-0.9beta17.1.orig/gtk_ardour/route_params_ui.cc	2004-07-11 19:31:11.779836808 -0400
+++ ardour-0.9beta17.1/gtk_ardour/route_params_ui.cc	2004-07-11 19:35:51.620294592 -0400
@@ -1037,7 +1037,6 @@
 gint
 RouteParams_UI::compute_redirect_sort_keys ()
 {
-	using Gtk::CList_Helpers;
 	CList_Helpers::RowList::iterator i;
 	unsigned long sort_key;