--- Tools/XMLConverter/include/tinyxml.h.old	2006-03-18 13:33:54.544098104 +0100
+++ Tools/XMLConverter/include/tinyxml.h	2006-03-18 13:34:24.639522904 +0100
@@ -790,7 +790,7 @@
 #endif
 
 	/// Construct.
-	TiXmlDeclaration::TiXmlDeclaration( const char * _version,
+	TiXmlDeclaration( const char * _version,
 										const char * _encoding,
 										const char * _standalone );
 
--- PlugIns/OctreeSceneManager/include/OgreOctreeSceneManager.h.old	2006-03-18 13:13:19.180901856 +0100
+++ PlugIns/OctreeSceneManager/include/OgreOctreeSceneManager.h	2006-03-18 13:13:44.503052304 +0100
@@ -196,8 +196,8 @@
     /** Overridden from SceneManager */
     void clearScene(void);
 
-    AxisAlignedBoxSceneQuery* OctreeSceneManager::createAABBQuery(const AxisAlignedBox& box, unsigned long mask);
-    SphereSceneQuery* OctreeSceneManager::createSphereQuery(const Sphere& sphere, unsigned long mask);
+    AxisAlignedBoxSceneQuery* createAABBQuery(const AxisAlignedBox& box, unsigned long mask);
+    SphereSceneQuery* createSphereQuery(const Sphere& sphere, unsigned long mask);
     PlaneBoundedVolumeListSceneQuery* createPlaneBoundedVolumeQuery(const PlaneBoundedVolumeList& volumes, unsigned long mask);
     RaySceneQuery* createRayQuery(const Ray& ray, unsigned long mask);
     IntersectionSceneQuery* createIntersectionQuery(unsigned long mask);
--- OgreMain/include/OgreHardwareOcclusionQuery.h.old	2006-03-18 13:03:00.084018888 +0100
+++ OgreMain/include/OgreHardwareOcclusionQuery.h	2006-03-18 13:03:46.593948304 +0100
@@ -101,7 +101,7 @@
 	  * Lets you know when query is done, or still be processed by the Hardware
 	  * @return true if query isn't finished.
 	  */
-	 virtual bool HardwareOcclusionQuery::isStillOutstanding(void) = 0; 
+	 virtual bool isStillOutstanding(void) = 0; 
 
 
     //----------------------------------------------------------------------