--- cinelerra-cvs-20051005/guicast/bclistbox.h	2005-10-05 22:45:23.000000000 +0200
+++ cinelerra-cvs-20051005/guicast/bclistbox.h	2006-01-19 18:05:20.000000000 +0100
@@ -354,7 +354,7 @@ 
 
 	int get_title_h();
 	int calculate_item_coords();
-	void BC_ListBox::calculate_last_coords_recursive(
+	void calculate_last_coords_recursive(
 		ArrayList<BC_ListBoxItem*> *data,
 		int *icon_x,
 		int *next_icon_x,
--- cinelerra-cvs-20051005/cinelerra/file.h	2005-10-05 22:45:13.000000000 +0200
+++ cinelerra-cvs-20051005/cinelerra/file.h	2006-01-19 18:11:08.000000000 +0100
@@ -139,7 +139,7 @@ 
 
 
 // Read frame of video into the argument
-	int File::read_frame(VFrame *frame);
+	int read_frame(VFrame *frame);
 
 
 // The following involve no extra copies.
--- cinelerra-cvs-20051005/cinelerra/virtualconsole.h	2006-01-19 18:15:56.000000000 +0100
+++ cinelerra-cvs-20051005/cinelerra/virtualconsole.h	2006-01-19 18:16:02.000000000 +0100
@@ -28,7 +28,7 @@ 
 
 // Called during each process buffer operation to reset the status
 // of the attachments to unprocessed.
-	void VirtualConsole::reset_attachments();
+	void reset_attachments();
 	void dump();
 
 
--- cinelerra-cvs-20051005/cinelerra/zoombar.h	2005-10-05 22:45:17.000000000 +0200
+++ cinelerra-cvs-20051005/cinelerra/zoombar.h	2006-01-19 18:22:20.000000000 +0100
@@ -24,7 +24,7 @@ 
 	~ZoomBar();
 
 	int create_objects();
-	void ZoomBar::resize_event();
+	void resize_event();
 	int draw();
 	int resize_event(int w, int h);
 	void redraw_time_dependancies();
--- cinelerra-cvs-20051005/cinelerra/ffmpeg.h	2005-10-05 22:45:13.000000000 +0200
+++ cinelerra-cvs-20051005/cinelerra/ffmpeg.h	2006-01-19 18:47:52.000000000 +0100
@@ -24,11 +24,11 @@ 
 	static int convert_cmodel_transfer(VFrame *frame_in,VFrame *frame_out);
 	static int init_picture_from_frame(AVPicture *picture, VFrame *frame);
 
-	static CodecID FFMPEG::codec_id(char *codec_string);
+	static CodecID codec_id(char *codec_string);
 
  private:
 	static PixelFormat color_model_to_pix_fmt(int color_model);
-	static int FFMPEG::pix_fmt_to_color_model(PixelFormat pix_fmt);
+	static int pix_fmt_to_color_model(PixelFormat pix_fmt);
 
 	int got_picture;
 	Asset *asset;
--- cinelerra-cvs-20051005/cinelerra/pipe.h	2005-10-05 22:45:14.000000000 +0200
+++ cinelerra-cvs-20051005/cinelerra/pipe.h	2006-01-19 18:53:46.000000000 +0100
@@ -11,16 +11,16 @@ 
 
 class Pipe {
  public:
-	Pipe::Pipe(char *command, char *sub_str = 0, char sub_char = '%');
- 	Pipe::~Pipe() ;		
-	int Pipe::open_read() ;
-	int Pipe::open_write() ;
-	void Pipe::close() ;
+	Pipe(char *command, char *sub_str = 0, char sub_char = '%');
+ 	~Pipe() ;		
+	int open_read() ;
+	int open_write() ;
+	void close() ;
 
 	int fd;
  private:
-	int Pipe::substitute() ;
- 	int Pipe::open(char *mode) ;
+	int substitute() ;
+ 	int open(char *mode) ;
 	
 	char sub_char;
 	char *sub_str;
--- cinelerra-cvs-20051005/cinelerra/framecache.h	2005-10-05 22:45:14.000000000 +0200
+++ cinelerra-cvs-20051005/cinelerra/framecache.h	2006-01-19 18:54:18.000000000 +0100
@@ -72,7 +72,7 @@ 
 		int64_t position,
 		double frame_rate,
 		int *item_return);
-	int FrameCache::frame_exists(int64_t position, 
+	int frame_exists(int64_t position, 
 		double frame_rate,
 		int color_model,
 		int w,
--- cinelerra-cvs-20051005/cinelerra/renderfarmclient.h	2005-10-05 22:45:15.000000000 +0200
+++ cinelerra-cvs-20051005/cinelerra/renderfarmclient.h	2006-01-19 18:59:37.000000000 +0100
@@ -70,7 +70,7 @@ 
 
 
 
-	void RenderFarmClientThread::read_preferences(int socket_fd, 
+	void read_preferences(int socket_fd, 
 		Preferences *preferences);
 	void read_asset(int socket_fd, Asset *asset);
 	void read_edl(int socket_fd, 
--- cinelerra-cvs-20051005/plugins/burn/burn.h	2005-10-05 22:45:27.000000000 +0200
+++ cinelerra-cvs-20051005/plugins/burn/burn.h	2006-01-19 19:07:08.000000000 +0100
@@ -75,7 +75,7 @@ 
 
 
 
-	void BurnMain::HSItoRGB(double H, 
+	void HSItoRGB(double H, 
 		double S, 
 		double I, 
 		int *r, 
--- cinelerra-cvs-20051005/plugins/polar/polar.h	2005-10-05 22:45:35.000000000 +0200
+++ cinelerra-cvs-20051005/plugins/polar/polar.h	2006-01-19 19:07:56.000000000 +0100
@@ -62,7 +62,7 @@ 
 	int wait_process_frame();
 	void run();
 	void get_pixel(const int &x, const int &y, VPixel *pixel, VPixel **input_rows);
-	int PolarEngine::calc_undistorted_coords(int wx,
+	int calc_undistorted_coords(int wx,
 			 int wy,
 			 double &x,
 			 double &y);
--- cinelerra-cvs-20051005/cinelerra/vrender.h	2005-10-05 22:45:16.000000000 +0200
+++ cinelerra-cvs-20051005/cinelerra/vrender.h	2006-01-19 19:06:29.000000000 +0100
@@ -48,7 +48,7 @@ 
 // Flash the output on the display
 	int flash_output();
 // Determine if data can be copied directly from the file to the output device.
-	void VRender::get_render_strategy(Edit* &playable_edit, 
+	void get_render_strategy(Edit* &playable_edit, 
 		int &colormodel, 
 		int &use_vconsole,
 		int64_t position);