--- avp/win95/gadgets/trepgadg.hpp.old	2006-05-05 23:06:03.000000000 +0200
+++ avp/win95/gadgets/trepgadg.hpp	2006-05-05 23:06:40.000000000 +0200
@@ -56,12 +56,12 @@
 			int FixP_Alpha
 		);
 
-		struct r2pos TextReportGadget :: GetPos_Rel
+		struct r2pos GetPos_Rel
 		(
 			const struct r2rect& R2Rect_Parent
 		) const;
 
-		r2size TextReportGadget :: GetSize
+		r2size GetSize
 		(
 			const struct r2rect& R2Rect_Parent
 		) const;
--- win95/chunk.hpp.old	2006-05-05 23:18:48.000000000 +0200
+++ win95/chunk.hpp	2006-05-05 23:19:07.000000000 +0200
@@ -365,7 +365,7 @@
 	virtual void fill_data_block_for_process(char * data_start);	
 
 
-	Chunk* Chunk_With_Children::DynCreate(const char* data);
+	Chunk* DynCreate(const char* data);
 
 protected:
 
--- win95/chnkload.hpp.old	2006-05-05 23:21:47.000000000 +0200
+++ win95/chnkload.hpp	2006-05-05 23:22:57.000000000 +0200
@@ -41,6 +41,7 @@
 							const ChunkObject* object=0	  //object used so that conversion from float to int can be done in world coordinates
 							);
 							
+class Sprite_Header_Chunk;
 extern BOOL copy_sprite_to_shapeheader (RIFFHANDLE, SHAPEHEADER *& shphd,Sprite_Header_Chunk* shc, int listpos = GLS_NOTINLIST);
 
 
--- avp/win95/projload.hpp.old	2006-05-05 23:25:49.000000000 +0200
+++ avp/win95/projload.hpp	2006-05-05 23:26:21.000000000 +0200
@@ -54,6 +54,7 @@
 struct hierarchy_variant_data;
 };
 
+class File_Chunk;
 class Global_Hierarchy_Store
 {
 
--- win95/chunkpal.hpp.old	2006-05-05 23:28:24.000000000 +0200
+++ win95/chunkpal.hpp	2006-05-05 23:29:00.000000000 +0200
@@ -549,7 +549,7 @@
 class Environment_Game_Mode_Chunk;
 class Environment_Game_Mode_Header_Chunk;
 
-
+class Environment_Data_Chunk;
 
 class Environment_Game_Mode_Chunk : public Chunk_With_Children
 {