diff --git a/LiDARToolbox/src/WToolkit.cpp b/LiDARToolbox/src/WToolkit.cpp
index e357c52d299308e6b05ff5b699ec7434c63140ee..f82e0b2339cb5a3b2e2cf8cb9a6a2f32e1f1b068 100644
--- a/LiDARToolbox/src/WToolkit.cpp
+++ b/LiDARToolbox/src/WToolkit.cpp
@@ -45,8 +45,7 @@
 #include "tempLeastSquaresTest/WMTempLeastSquaresTest.h"
 #include "tempRandomPoints/WMTempRandomPoints.h"
 
-
-// #include "WToolkit.h"
+#include "WToolkit.h"
 
 /**
  * This function is called by OpenWalnut, when loading your library to learn about the modules you provide. The function is called with a given
diff --git a/LiDARToolbox/src/buildingsDetection/WMBuildingsDetection.cpp b/LiDARToolbox/src/buildingsDetection/WMBuildingsDetection.cpp
index 725855fcafa9c396b6da0ba495dc7500747187b0..dbe1bd2a5605237bbd0bf198e583dc5f6d37a886 100644
--- a/LiDARToolbox/src/buildingsDetection/WMBuildingsDetection.cpp
+++ b/LiDARToolbox/src/buildingsDetection/WMBuildingsDetection.cpp
@@ -44,10 +44,6 @@
 #include "WBuildingDetector.h"
 #include "../common/datastructures/octree/WOctree.h"
 
-// This line is needed by the module loader to actually find your module.
-//W_LOADABLE_MODULE( WMBuildingsDetection )
-//TODO(aschwarzkopf): Reenable above after solving the toolbox problem
-
 WMBuildingsDetection::WMBuildingsDetection():
     WModule(),
     m_propCondition( new WCondition() )
diff --git a/LiDARToolbox/src/elevationImageExport/WMElevationImageExport.cpp b/LiDARToolbox/src/elevationImageExport/WMElevationImageExport.cpp
index f45b48e9fe581df096354b4534ffc82da66bf15b..e97117986f6137ca7242846b7d47bb6026c49020 100644
--- a/LiDARToolbox/src/elevationImageExport/WMElevationImageExport.cpp
+++ b/LiDARToolbox/src/elevationImageExport/WMElevationImageExport.cpp
@@ -42,10 +42,6 @@
 #include "WMElevationImageExport.xpm"
 #include "WMElevationImageExport.h"
 
-// This line is needed by the module loader to actually find your module.
-//W_LOADABLE_MODULE( WMElevationImageExport )
-//TODO(aschwarzkopf): Reenable above after solving the toolbox problem
-
 WMElevationImageExport::WMElevationImageExport():
     WModule(),
     m_propCondition( new WCondition() )
diff --git a/LiDARToolbox/src/pointGroupsTransform/WMPointGroupsTransform.cpp b/LiDARToolbox/src/pointGroupsTransform/WMPointGroupsTransform.cpp
index 9661fc9d80eaa0f0dcd17e0b85e4520bfdc06a96..944e054e4c269f491287847af63af025a831094a 100644
--- a/LiDARToolbox/src/pointGroupsTransform/WMPointGroupsTransform.cpp
+++ b/LiDARToolbox/src/pointGroupsTransform/WMPointGroupsTransform.cpp
@@ -43,10 +43,6 @@
 #include "WMPointGroupsTransform.h"
 #include "../common/datastructures/octree/WOctree.h"
 
-// This line is needed by the module loader to actually find your module.
-//W_LOADABLE_MODULE( WMPointGroupsTransform )
-//TODO(aschwarzkopf): Reenable above after solving the toolbox problem
-
 WMPointGroupsTransform::WMPointGroupsTransform():
     WModule(),
     m_propCondition( new WCondition() )
diff --git a/LiDARToolbox/src/pointGroupsValidator/WMPointGroupsValidator.cpp b/LiDARToolbox/src/pointGroupsValidator/WMPointGroupsValidator.cpp
index 5dd5169eefeb8339bd41ccd18e642abfeae1bb0a..5e98d06b8a11eeef25af087dbc5d92ac5872541a 100644
--- a/LiDARToolbox/src/pointGroupsValidator/WMPointGroupsValidator.cpp
+++ b/LiDARToolbox/src/pointGroupsValidator/WMPointGroupsValidator.cpp
@@ -43,10 +43,6 @@
 #include "WMPointGroupsValidator.h"
 #include "../common/datastructures/octree/WOctree.h"
 
-// This line is needed by the module loader to actually find your module.
-//W_LOADABLE_MODULE( WMPointGroupsValidator )
-//TODO(aschwarzkopf): Reenable above after solving the toolbox problem
-
 WMPointGroupsValidator::WMPointGroupsValidator():
     WModule(),
     m_propCondition( new WCondition() )
diff --git a/LiDARToolbox/src/pointsCutOutliers/WMPointsCutOutliers.cpp b/LiDARToolbox/src/pointsCutOutliers/WMPointsCutOutliers.cpp
index 874bf0543786fa3d8f37db6734acabcadfc29be3..4780464d66be3ae135c179130e5545e2af73853f 100644
--- a/LiDARToolbox/src/pointsCutOutliers/WMPointsCutOutliers.cpp
+++ b/LiDARToolbox/src/pointsCutOutliers/WMPointsCutOutliers.cpp
@@ -43,10 +43,6 @@
 #include "../common/datastructures/octree/WOctree.h"
 #include "WCutOutliersDeamon.h"
 
-// This line is needed by the module loader to actually find your module.
-//W_LOADABLE_MODULE( WMPointsCutOutliers )
-//TODO(aschwarzkopf): Reenable above after solving the toolbox problem
-
 WMPointsCutOutliers::WMPointsCutOutliers():
     WModule(),
     m_propCondition( new WCondition() )
diff --git a/LiDARToolbox/src/pointsTransform/WMPointsTransform.cpp b/LiDARToolbox/src/pointsTransform/WMPointsTransform.cpp
index b7316976ba8406cfd1a458a896d26507eae36214..f2330bd949a198b043e04dbc24529f15a4357b06 100644
--- a/LiDARToolbox/src/pointsTransform/WMPointsTransform.cpp
+++ b/LiDARToolbox/src/pointsTransform/WMPointsTransform.cpp
@@ -44,10 +44,6 @@
 #include "WMPointsTransform.h"
 #include "../common/datastructures/octree/WOctree.h"
 
-// This line is needed by the module loader to actually find your module.
-//W_LOADABLE_MODULE( WMPointsTransform )
-//TODO(aschwarzkopf): Reenable above after solving the toolbox problem
-
 WMPointsTransform::WMPointsTransform():
     WModule(),
     m_propCondition( new WCondition() )
diff --git a/LiDARToolbox/src/readLAS/WMReadLAS.cpp b/LiDARToolbox/src/readLAS/WMReadLAS.cpp
index c904d881b8521d1f14683615a825f1f6293a36f5..b71b42561655612d7ca0503903080f1f6a212959 100644
--- a/LiDARToolbox/src/readLAS/WMReadLAS.cpp
+++ b/LiDARToolbox/src/readLAS/WMReadLAS.cpp
@@ -43,10 +43,6 @@
 #include "WMReadLAS.h"
 #include "WLasReader.h"
 
-// This line is needed by the module loader to actually find your module.
-//W_LOADABLE_MODULE( WMReadLAS )
-//TODO(aschwarzkopf): Reenable above after solving the toolbox problem
-
 WMReadLAS::WMReadLAS():
     WModule(),
     m_propCondition( new WCondition() )
diff --git a/LiDARToolbox/src/surfaceDetectionByLari/WMSurfaceDetectionByLari.cpp b/LiDARToolbox/src/surfaceDetectionByLari/WMSurfaceDetectionByLari.cpp
index dd139a72e1dcbb5e0e50948e6a4ce3bd0d5c01ce..7f5e8c42b20a19544a2a48b735a4f6386145556f 100644
--- a/LiDARToolbox/src/surfaceDetectionByLari/WMSurfaceDetectionByLari.cpp
+++ b/LiDARToolbox/src/surfaceDetectionByLari/WMSurfaceDetectionByLari.cpp
@@ -43,10 +43,6 @@
 #include "WMSurfaceDetectionByLari.h"
 #include "WLariPointClassifier.h"
 
-// This line is needed by the module loader to actually find your module.
-//W_LOADABLE_MODULE( WMSurfaceDetectionByLari )
-//TODO(aschwarzkopf): Reenable above after solving the toolbox problem
-
 WMSurfaceDetectionByLari::WMSurfaceDetectionByLari():
     WModule(),
     m_propCondition( new WCondition() )
diff --git a/LiDARToolbox/src/surfaceDetectionByPCL/WMSurfaceDetectionByPCL.cpp b/LiDARToolbox/src/surfaceDetectionByPCL/WMSurfaceDetectionByPCL.cpp
index 0239905b6424cfdf8e47be8552a5c127ca21f203..4380d198d3cee39b8a738d35f13f15f1c55dfca1 100644
--- a/LiDARToolbox/src/surfaceDetectionByPCL/WMSurfaceDetectionByPCL.cpp
+++ b/LiDARToolbox/src/surfaceDetectionByPCL/WMSurfaceDetectionByPCL.cpp
@@ -43,10 +43,6 @@
 #include "WMSurfaceDetectionByPCL.h"
 #include "WSurfaceDetectorPCL.h"
 
-// This line is needed by the module loader to actually find your module.
-//W_LOADABLE_MODULE( WMSurfaceDetectionByPCL )
-//TODO(aschwarzkopf): Reenable above after solving the toolbox problem
-
 WMSurfaceDetectionByPCL::WMSurfaceDetectionByPCL():
     WModule(),
     m_propCondition( new WCondition() )
diff --git a/LiDARToolbox/src/tempLeastSquaresTest/WMTempLeastSquaresTest.cpp b/LiDARToolbox/src/tempLeastSquaresTest/WMTempLeastSquaresTest.cpp
index 80e450dc20127af50f48bbee4e12fe9a3bac82a9..2197c299f7a01934aa2a5972cbda39ab62bb04b0 100644
--- a/LiDARToolbox/src/tempLeastSquaresTest/WMTempLeastSquaresTest.cpp
+++ b/LiDARToolbox/src/tempLeastSquaresTest/WMTempLeastSquaresTest.cpp
@@ -43,10 +43,6 @@
 #include "WMTempLeastSquaresTest.h"
 #include "../common/datastructures/octree/WOctree.h"
 
-// This line is needed by the module loader to actually find your module.
-//W_LOADABLE_MODULE( WMTempLeastSquaresTest )
-//TODO(aschwarzkopf): Reenable above after solving the toolbox problem
-
 WMTempLeastSquaresTest::WMTempLeastSquaresTest():
     WModule(),
     m_propCondition( new WCondition() )
diff --git a/LiDARToolbox/src/tempRandomPoints/WMTempRandomPoints.cpp b/LiDARToolbox/src/tempRandomPoints/WMTempRandomPoints.cpp
index 9a4c8608d07740b1cb95251d3523de63ecbd18e2..cd9805d277a966b23ff3943cb20cb9bd25139808 100644
--- a/LiDARToolbox/src/tempRandomPoints/WMTempRandomPoints.cpp
+++ b/LiDARToolbox/src/tempRandomPoints/WMTempRandomPoints.cpp
@@ -43,10 +43,6 @@
 #include "WMTempRandomPoints.h"
 #include "../common/datastructures/octree/WOctree.h"
 
-// This line is needed by the module loader to actually find your module.
-//W_LOADABLE_MODULE( WMTempRandomPoints )
-//TODO(aschwarzkopf): Reenable above after solving the toolbox problem
-
 WMTempRandomPoints::WMTempRandomPoints():
     WModule(),
     m_propCondition( new WCondition() )
diff --git a/LiDARToolbox/src/treeDetectionByPCA/WMTreeDetectionByPCA.cpp b/LiDARToolbox/src/treeDetectionByPCA/WMTreeDetectionByPCA.cpp
index 6634c94a15a7a3f5fb84836208c0fdc780893b72..67bd74134fdd6ef42cd5357071cf64a0e199b1f9 100644
--- a/LiDARToolbox/src/treeDetectionByPCA/WMTreeDetectionByPCA.cpp
+++ b/LiDARToolbox/src/treeDetectionByPCA/WMTreeDetectionByPCA.cpp
@@ -44,10 +44,6 @@
 #include "WPCADetector.h"
 #include "../common/datastructures/octree/WOctree.h"
 
-// This line is needed by the module loader to actually find your module.
-//W_LOADABLE_MODULE( WMTreeDetectionByPCA )
-//TODO(aschwarzkopf): Reenable above after solving the toolbox problem
-
 WMTreeDetectionByPCA::WMTreeDetectionByPCA():
     WModule(),
     m_propCondition( new WCondition() )
diff --git a/LiDARToolbox/src/wallDetectionByPCA/WMWallDetectionByPCA.cpp b/LiDARToolbox/src/wallDetectionByPCA/WMWallDetectionByPCA.cpp
index ae3e2c7b545d0cb8abbfd5e04cf882a3d9784624..2232f613eb63257dfdf9b143cf2257b4bbce7db4 100644
--- a/LiDARToolbox/src/wallDetectionByPCA/WMWallDetectionByPCA.cpp
+++ b/LiDARToolbox/src/wallDetectionByPCA/WMWallDetectionByPCA.cpp
@@ -43,11 +43,6 @@
 #include "WMWallDetectionByPCA.h"
 #include "WPCAWallDetector.h"
 
-
-// This line is needed by the module loader to actually find your module.
-//W_LOADABLE_MODULE( WMWallDetectionByPCA )
-//TODO(aschwarzkopf): Reenable above after solving the toolbox problem
-
 WMWallDetectionByPCA::WMWallDetectionByPCA():
     WModule(),
     m_propCondition( new WCondition() )