Index: osgVisual/src/cluster/dataIO_clusterENet.cpp
===================================================================
--- osgVisual/src/cluster/dataIO_clusterENet.cpp	(revision 87)
+++ osgVisual/src/cluster/dataIO_clusterENet.cpp	(revision 88)
@@ -22,5 +22,4 @@
 {
 	OSG_NOTIFY( osg::ALWAYS ) << "clusterENet constructed" << std::endl;
-	#include <leakDetection.h>
 
 	serverToConnect = "unknown";
Index: osgVisual/src/cluster/dataIO_clusterENet_implementation.cpp
===================================================================
--- osgVisual/src/cluster/dataIO_clusterENet_implementation.cpp	(revision 87)
+++ osgVisual/src/cluster/dataIO_clusterENet_implementation.cpp	(revision 88)
@@ -25,5 +25,5 @@
 {
 	std::cout << "Instantiated server class# "<< activeENetInstances << std::endl;
-	#include <leakDetection.h>
+
 	enetInitialized = false;
 	host = NULL;
Index: osgVisual/src/core/osgVisual.cpp
===================================================================
--- osgVisual/src/core/osgVisual.cpp	(revision 87)
+++ osgVisual/src/core/osgVisual.cpp	(revision 88)
@@ -26,4 +26,5 @@
 #endif 
 
+
 //#include <windows.h>
 
@@ -42,6 +43,5 @@
 #ifdef _DEBUG
 	#ifdef WIN32
-		#include <leakDetection.h>	// ugly but must be included inside the class
-
+		#include <leakDetection.h>	// for main: must be inside function. In classes: headerfile inside calss is sufficient
 		int tmp_flag;
 
@@ -55,5 +55,5 @@
 			_CRTDBG_MODE_DEBUG);
 
-		// output to the file if not under VS
+		// output to the file
 		_CrtSetReportFile(_CRT_ASSERT, log_file);
 		_CrtSetReportFile(_CRT_WARN, log_file);
Index: osgVisual/src/core/visual_core.cpp
===================================================================
--- osgVisual/src/core/visual_core.cpp	(revision 87)
+++ osgVisual/src/core/visual_core.cpp	(revision 88)
@@ -23,5 +23,4 @@
 {
 	OSG_NOTIFY( osg::ALWAYS ) << "visual_core instantiated." << std::endl;
-	#include <leakDetection.h>
 }
 
@@ -49,5 +48,5 @@
 
 	// Test memory leak (todo)
-	//double* test = new double[1000];
+	double* test = new double[1000];
 
 	#ifdef USE_SPACENAVIGATOR
Index: osgVisual/src/dataIO/visual_dataIO.cpp
===================================================================
--- osgVisual/src/dataIO/visual_dataIO.cpp	(revision 87)
+++ osgVisual/src/dataIO/visual_dataIO.cpp	(revision 88)
@@ -22,5 +22,5 @@
 {
 	OSG_NOTIFY( osg::ALWAYS ) << "visual_dataIO constructed" << std::endl;
-	#include <leakDetection.h>
+
 	initialized = false;
 }
Index: osgVisual/src/distortion/visual_distortion.cpp
===================================================================
--- osgVisual/src/distortion/visual_distortion.cpp	(revision 87)
+++ osgVisual/src/distortion/visual_distortion.cpp	(revision 88)
@@ -22,5 +22,4 @@
 {
 	OSG_NOTIFY (osg::ALWAYS ) << "visual_distortion instantiated." << std::endl;
-	#include <leakDetection.h>
 
 	initialized = false;
Index: osgVisual/src/draw2D/visual_debug_hud.cpp
===================================================================
--- osgVisual/src/draw2D/visual_debug_hud.cpp	(revision 87)
+++ osgVisual/src/draw2D/visual_debug_hud.cpp	(revision 88)
@@ -21,5 +21,4 @@
 visual_debug_hud::visual_debug_hud(void)
 {
-	#include <leakDetection.h>
 }
 
Index: osgVisual/src/draw2D/visual_draw2D.cpp
===================================================================
--- osgVisual/src/draw2D/visual_draw2D.cpp	(revision 87)
+++ osgVisual/src/draw2D/visual_draw2D.cpp	(revision 88)
@@ -22,5 +22,4 @@
 {
 	OSG_NOTIFY( osg::ALWAYS ) << "visual_draw2D constructed" << std::endl;
-	#include <leakDetection.h>
 	initialized = false;
 }
Index: osgVisual/src/draw2D/visual_hud.cpp
===================================================================
--- osgVisual/src/draw2D/visual_hud.cpp	(revision 87)
+++ osgVisual/src/draw2D/visual_hud.cpp	(revision 88)
@@ -21,5 +21,4 @@
 visual_hud::visual_hud(void)
 {
-	#include <leakDetection.h>
 }
 
Index: osgVisual/src/draw3D/visual_draw3D.cpp
===================================================================
--- osgVisual/src/draw3D/visual_draw3D.cpp	(revision 87)
+++ osgVisual/src/draw3D/visual_draw3D.cpp	(revision 88)
@@ -21,5 +21,4 @@
 visual_draw3D::visual_draw3D(void)
 {
-	#include <leakDetection.h>
 }
 
Index: osgVisual/src/extLink/dataIO_extLinkVCL.cpp
===================================================================
--- osgVisual/src/extLink/dataIO_extLinkVCL.cpp	(revision 87)
+++ osgVisual/src/extLink/dataIO_extLinkVCL.cpp	(revision 88)
@@ -24,5 +24,4 @@
 {
 	OSG_NOTIFY( osg::ALWAYS ) << "extLinkVCL constructed" << std::endl;
-	#include <leakDetection.h>
 }
 
Index: osgVisual/src/extLink/manip_extLink.cpp
===================================================================
--- osgVisual/src/extLink/manip_extLink.cpp	(revision 87)
+++ osgVisual/src/extLink/manip_extLink.cpp	(revision 88)
@@ -24,5 +24,4 @@
 extLinkManipulator::extLinkManipulator()
 {
-	#include <leakDetection.h>
 }
 
Index: osgVisual/src/manip_ObjectMounted/manip_objectMounted.cpp
===================================================================
--- osgVisual/src/manip_ObjectMounted/manip_objectMounted.cpp	(revision 87)
+++ osgVisual/src/manip_ObjectMounted/manip_objectMounted.cpp	(revision 88)
@@ -25,5 +25,4 @@
 objectMountedManipulator::objectMountedManipulator()
 {
-	#include <leakDetection.h>
 }
 
Index: osgVisual/src/manip_Spacemouse/manip_freeSpaceMouse.cpp
===================================================================
--- osgVisual/src/manip_Spacemouse/manip_freeSpaceMouse.cpp	(revision 87)
+++ osgVisual/src/manip_Spacemouse/manip_freeSpaceMouse.cpp	(revision 88)
@@ -25,5 +25,4 @@
 FreeManipulator::FreeManipulator(SpaceMouse* spacemouse) : _spaceMouse(spacemouse)
 {
-	#include <leakDetection.h>
 }
 
Index: osgVisual/src/manip_Spacemouse/manip_nodeTrackerSpaceMouse.cpp
===================================================================
--- osgVisual/src/manip_Spacemouse/manip_nodeTrackerSpaceMouse.cpp	(revision 87)
+++ osgVisual/src/manip_Spacemouse/manip_nodeTrackerSpaceMouse.cpp	(revision 88)
@@ -25,5 +25,4 @@
 NodeTrackerSpaceMouse::NodeTrackerSpaceMouse(SpaceMouse* spacemouse) : _spaceMouse(spacemouse)
 {
-	#include <leakDetection.h>
     _trackerMode = NODE_CENTER_AND_ROTATION; 
     _rotationMode = TRACKBALL; 
Index: osgVisual/src/manip_Spacemouse/manip_spaceMouse.cpp
===================================================================
--- osgVisual/src/manip_Spacemouse/manip_spaceMouse.cpp	(revision 87)
+++ osgVisual/src/manip_Spacemouse/manip_spaceMouse.cpp	(revision 88)
@@ -168,5 +168,4 @@
 SpaceMouse::SpaceMouse() : _spaceMouseImpl(new SpaceMouseImpl)
 {
-	#include <leakDetection.h>
 }
 
Index: osgVisual/src/object/object_updater.cpp
===================================================================
--- osgVisual/src/object/object_updater.cpp	(revision 87)
+++ osgVisual/src/object/object_updater.cpp	(revision 88)
@@ -21,5 +21,4 @@
 object_updater::object_updater(osgVisual::visual_object* object_ )
 {
-	#include <leakDetection.h>
 }
 
Index: osgVisual/src/object/visual_object.cpp
===================================================================
--- osgVisual/src/object/visual_object.cpp	(revision 87)
+++ osgVisual/src/object/visual_object.cpp	(revision 88)
@@ -21,6 +21,4 @@
 visual_object::visual_object( osg::CoordinateSystemNode* sceneRoot_, std::string nodeName_)
 {
-	#include <leakDetection.h>
-
 	// Add this node to Scenegraph
 	sceneRoot_->addChild( this );
Index: osgVisual/src/sky_Silverlining/skySilverLining_cloudsDrawable.cpp
===================================================================
--- osgVisual/src/sky_Silverlining/skySilverLining_cloudsDrawable.cpp	(revision 87)
+++ osgVisual/src/sky_Silverlining/skySilverLining_cloudsDrawable.cpp	(revision 88)
@@ -33,5 +33,4 @@
         : osg::Drawable()
 {
-	#include <leakDetection.h>
     setDataVariance(osg::Object::DYNAMIC);
     setUseVertexBufferObjects(false);
Index: osgVisual/src/sky_Silverlining/skySilverLining_skyDrawable.cpp
===================================================================
--- osgVisual/src/sky_Silverlining/skySilverLining_skyDrawable.cpp	(revision 87)
+++ osgVisual/src/sky_Silverlining/skySilverLining_skyDrawable.cpp	(revision 88)
@@ -36,6 +36,4 @@
 		, _skyboxSize(0)
 {
-	#include <leakDetection.h>
-	
     setDataVariance(osg::Object::DYNAMIC);
     setUseVertexBufferObjects(false);
Index: osgVisual/src/sky_Silverlining/visual_skySilverLining.cpp
===================================================================
--- osgVisual/src/sky_Silverlining/visual_skySilverLining.cpp	(revision 87)
+++ osgVisual/src/sky_Silverlining/visual_skySilverLining.cpp	(revision 88)
@@ -22,5 +22,4 @@
 {
 	OSG_NOTIFY( osg::ALWAYS ) << "Initialize visual_skySilverlining..." << std::endl;
-	#include <leakDetection.h>
 
 	atmosphereInitialized = false;
