diff --git a/README.TXT b/README.TXT
index 32a0e67d4a85c9630e0632bac6ab43f1bb8b2cf0..b111e4fabe45a6a0d27569d0d7d5ac6e2bf695b9 100644
--- a/README.TXT
+++ b/README.TXT
@@ -12,4 +12,6 @@ Included third-party software:
 
 See LICENSE.TXT for licensing information.
 
+Additional documentation: http://www.graphics.rwth-aachen.de/redmine/projects/acgl/wiki
+
 
diff --git a/include/ACGL/Animations/Animation.hh b/include/ACGL/Animations/Animation.hh
index 427eaae8c02590890f39ddb235b75e640d0c1241..a3b51fd3e2ed8f99b47e04691c02c88c564758d1 100644
--- a/include/ACGL/Animations/Animation.hh
+++ b/include/ACGL/Animations/Animation.hh
@@ -4,6 +4,10 @@
  * Distributed under the terms of the MIT License (see LICENSE.TXT).   *
  **********************************************************************/
 
+// See http://www.graphics.rwth-aachen.de/redmine/projects/acgl/wiki/ACGL_compile_time_settings
+// for a comment what unsupported means.
+#ifdef ACGL_INCLUDE_UNSUPPORTED
+
 #ifndef ACGL_ANIMATIONS_ANIMATION_HH
 #define ACGL_ANIMATIONS_ANIMATION_HH
 
@@ -397,3 +401,5 @@ private:
 
 
 #endif // ACGL_ANIMATIONS_ANIMATION_HH
+
+#endif
diff --git a/include/ACGL/Animations/EaseFunctions.hh b/include/ACGL/Animations/EaseFunctions.hh
index 7dba196d1072a78f193e7be7df5402ab851b232b..a8304d5d89dcec9032834c48c9a1f438b4f54ba7 100644
--- a/include/ACGL/Animations/EaseFunctions.hh
+++ b/include/ACGL/Animations/EaseFunctions.hh
@@ -4,6 +4,10 @@
  * Distributed under the terms of the MIT License (see LICENSE.TXT).   *
  **********************************************************************/
 
+// See http://www.graphics.rwth-aachen.de/redmine/projects/acgl/wiki/ACGL_compile_time_settings
+// for a comment what unsupported means.
+#ifdef ACGL_INCLUDE_UNSUPPORTED
+
 #ifndef ACGL_ANIMATIONS_EASEFUNCTIONS_HH
 #define ACGL_ANIMATIONS_EASEFUNCTIONS_HH
 
@@ -168,3 +172,5 @@ public:
 }
 
 #endif // ACGL_ANIMATIONS_EASEFUNCTIONS_HH
+
+#endif
diff --git a/include/ACGL/Animations/Interpolator.hh b/include/ACGL/Animations/Interpolator.hh
index b4023d49e6aa9429c081c10ee7b315402f76b063..969ea9ce8e37453f0b541231796fc21dbd662cc6 100644
--- a/include/ACGL/Animations/Interpolator.hh
+++ b/include/ACGL/Animations/Interpolator.hh
@@ -4,6 +4,10 @@
  * Distributed under the terms of the MIT License (see LICENSE.TXT).   *
  **********************************************************************/
 
+// See http://www.graphics.rwth-aachen.de/redmine/projects/acgl/wiki/ACGL_compile_time_settings
+// for a comment what unsupported means.
+#ifdef ACGL_INCLUDE_UNSUPPORTED
+
 #ifndef ACGL_ANIMATIONS_INTERPOLATOR_HH
 #define ACGL_ANIMATIONS_INTERPOLATOR_HH
 
@@ -293,3 +297,5 @@ private:
 }
 
 #endif // INTERPOLATOR_HH
+
+#endif
diff --git a/include/ACGL/OpenGL/HiLevelObjects/RenderObject.hh b/include/ACGL/OpenGL/HiLevelObjects/RenderObject.hh
index ef4eb33104fc5f2da81de46fedc2f4a1d20a0d15..defd5a8bd291b224cb53c88b500ef270b6bf4eca 100644
--- a/include/ACGL/OpenGL/HiLevelObjects/RenderObject.hh
+++ b/include/ACGL/OpenGL/HiLevelObjects/RenderObject.hh
@@ -4,6 +4,10 @@
  * Distributed under the terms of the MIT License (see LICENSE.TXT).   *
  **********************************************************************/
 
+// See http://www.graphics.rwth-aachen.de/redmine/projects/acgl/wiki/ACGL_compile_time_settings
+// for a comment what deprecated means.
+#ifdef ACGL_INCLUDE_DEPRECATED
+
 #ifndef ACGL_OPENGL_OBJECTS_RENDEROBJECT_HH
 #define ACGL_OPENGL_OBJECTS_RENDEROBJECT_HH
 
@@ -186,3 +190,6 @@ ACGL_SMARTPOINTER_TYPEDEFS(RenderObject)
 #endif
 
 #endif // ACGL_OPENGL_OBJECTS_RENDEROBJECT_HH
+
+
+#endif
diff --git a/include/ACGL/OpenGL/HiLevelObjects/ShaderProgramObject.hh b/include/ACGL/OpenGL/HiLevelObjects/ShaderProgramObject.hh
index 86b81dc354171af68265fa76333eb7d8b010a60d..07dab8249ad0abd4cb48096fb7245ebe049b58e4 100644
--- a/include/ACGL/OpenGL/HiLevelObjects/ShaderProgramObject.hh
+++ b/include/ACGL/OpenGL/HiLevelObjects/ShaderProgramObject.hh
@@ -4,6 +4,10 @@
  * Distributed under the terms of the MIT License (see LICENSE.TXT).   *
  **********************************************************************/
 
+// See http://www.graphics.rwth-aachen.de/redmine/projects/acgl/wiki/ACGL_compile_time_settings
+// for a comment what unsupported means.
+#ifdef deprecated
+
 #ifndef ACGL_OPENGL_OBJECTS_SHADERPROGRAMOBJECT_HH
 #define ACGL_OPENGL_OBJECTS_SHADERPROGRAMOBJECT_HH
 
@@ -115,3 +119,6 @@ ACGL_SMARTPOINTER_TYPEDEFS(ShaderProgramObject)
 } // ACGL
 
 #endif // ACGL_OPENGL_OBJECTS_SHADERPROGRAMOBJECT_HH
+
+
+#endif
diff --git a/include/ACGL/OpenGL/HiLevelObjects/Uniform.hh b/include/ACGL/OpenGL/HiLevelObjects/Uniform.hh
index 27c358c7c7773c5e669d5a45c27803dd3475a17f..e5adbddcf6d58fe28aefc39f8d2b5bb230b508a9 100644
--- a/include/ACGL/OpenGL/HiLevelObjects/Uniform.hh
+++ b/include/ACGL/OpenGL/HiLevelObjects/Uniform.hh
@@ -4,6 +4,10 @@
  * Distributed under the terms of the MIT License (see LICENSE.TXT).   *
  **********************************************************************/
 
+// See http://www.graphics.rwth-aachen.de/redmine/projects/acgl/wiki/ACGL_compile_time_settings
+// for a comment what unsupported means.
+#ifdef deprecated
+
 #ifndef ACGL_OPENGL_OBJECTS_UNIFORM_HH
 #define ACGL_OPENGL_OBJECTS_UNIFORM_HH
 
@@ -220,3 +224,6 @@ ACGL_SMARTPOINTER_TYPEDEFS(UniformTexture)
 } // ACGL
 
 #endif // ACGL_OPENGL_OBJECTS_UNIFORM_HH
+
+
+#endif
diff --git a/include/ACGL/OpenGL/HiLevelObjects/Viewport.hh b/include/ACGL/OpenGL/HiLevelObjects/Viewport.hh
index e56b938273725aafffaf5b0013892ac2d4de45e5..38f4a59da4622013ece4d44c2833f7f97a2d35e8 100644
--- a/include/ACGL/OpenGL/HiLevelObjects/Viewport.hh
+++ b/include/ACGL/OpenGL/HiLevelObjects/Viewport.hh
@@ -94,3 +94,4 @@ ACGL_SMARTPOINTER_TYPEDEFS(Viewport)
 } // ACGL
 
 #endif // ACGL_OPENGL_OBJECTS_STATE_HH
+
diff --git a/include/ACGL/Scene/NURBSControlPoint.hh b/include/ACGL/Scene/NURBSControlPoint.hh
index 4f540e5ce34b3c6547d31024876df50844065559..06ab79306848648d5e8d2717ecd96c43b87af5c2 100755
--- a/include/ACGL/Scene/NURBSControlPoint.hh
+++ b/include/ACGL/Scene/NURBSControlPoint.hh
@@ -4,6 +4,10 @@
  * Distributed under the terms of the MIT License (see LICENSE.TXT).   *
  **********************************************************************/
 
+// See http://www.graphics.rwth-aachen.de/redmine/projects/acgl/wiki/ACGL_compile_time_settings
+// for a comment what unsupported means.
+#ifdef ACGL_INCLUDE_UNSUPPORTED
+
 #ifndef ACGL_SCENE_NURBSCONTROLPOINT_HH
 #define ACGL_SCENE_NURBSCONTROLPOINT_HH
 
@@ -152,3 +156,5 @@ std::ostream& operator<<(std::ostream& _os, const NURBSControlPoint<DATA_DIMENSI
 } // ACGL
 
 #endif // ACGL_SCENE_NURBSCONTROLPOINT_HH
+
+#endif
diff --git a/include/ACGL/Scene/NURBSCurve.hh b/include/ACGL/Scene/NURBSCurve.hh
index 655670ffc74af6b49a64eb50548828e2b649fe67..c8f297d6b7150b9ce1681941dfa8471b284eaf9f 100755
--- a/include/ACGL/Scene/NURBSCurve.hh
+++ b/include/ACGL/Scene/NURBSCurve.hh
@@ -4,6 +4,10 @@
  * Distributed under the terms of the MIT License (see LICENSE.TXT).   *
  **********************************************************************/
 
+// See http://www.graphics.rwth-aachen.de/redmine/projects/acgl/wiki/ACGL_compile_time_settings
+// for a comment what unsupported means.
+#ifdef ACGL_INCLUDE_UNSUPPORTED
+
 #ifndef ACGL_SCENE_NURBSCURVE_HH
 #define ACGL_SCENE_NURBSCURVE_HH
 
@@ -294,3 +298,5 @@ std::ostream& operator<<(std::ostream& _os, const NURBSCurve<DATA_DIMENSION>& _c
 } // ACGL
 
 #endif // ACGL_SCENE_NURBSCURVE_HH
+
+#endif
diff --git a/include/ACGL/Scene/NURBSDataVector.hh b/include/ACGL/Scene/NURBSDataVector.hh
index 58d169a289adb4c41ec26b267de8a43a87c21fcd..53a3a08af97fabde990ee463fce645d6211d3e75 100755
--- a/include/ACGL/Scene/NURBSDataVector.hh
+++ b/include/ACGL/Scene/NURBSDataVector.hh
@@ -4,6 +4,10 @@
  * Distributed under the terms of the MIT License (see LICENSE.TXT).   *
  **********************************************************************/
 
+// See http://www.graphics.rwth-aachen.de/redmine/projects/acgl/wiki/ACGL_compile_time_settings
+// for a comment what unsupported means.
+#ifdef ACGL_INCLUDE_UNSUPPORTED
+
 #ifndef ACGL_SCENE_NURBSDATAVECTOR_HH
 #define ACGL_SCENE_NURBSDATAVECTOR_HH
 
@@ -172,3 +176,5 @@ std::ostream& operator<<(std::ostream& _os, const NURBSDataVector<DATA_DIMENSION
 } // ACGL
 
 #endif // ACGL_SCENE_NURBSDATAVECTOR_HH
+
+#endif
diff --git a/src/ACGL/Animations/Animation.cc b/src/ACGL/Animations/Animation.cc
index 469e25fe5d05d269a3555553359ec78dab49cf01..db6be08f4ef4989d46c905f4655dcb5bc92af279 100644
--- a/src/ACGL/Animations/Animation.cc
+++ b/src/ACGL/Animations/Animation.cc
@@ -4,6 +4,10 @@
  * Distributed under the terms of the MIT License (see LICENSE.TXT).   *
  **********************************************************************/
 
+// See http://www.graphics.rwth-aachen.de/redmine/projects/acgl/wiki/ACGL_compile_time_settings
+// for a comment what unsupported means.
+#ifdef ACGL_INCLUDE_UNSUPPORTED
+
 #include <ACGL/Animations/Animation.hh>
 
 using namespace ACGL;
@@ -269,4 +273,4 @@ void AnimationParallel::push_animation(const SharedAnimation& _animation)
     mAnimations.push_back(_animation);
 }
 
-
+#endif
diff --git a/src/ACGL/OpenGL/HiLevelObjects/RenderObject.cc b/src/ACGL/OpenGL/HiLevelObjects/RenderObject.cc
index 1cbd6b1ccdb6e3e8c845c9a668a4e5c5fa58cc39..4fa2f59d481dde3f0113114e26d87671be0e77c1 100644
--- a/src/ACGL/OpenGL/HiLevelObjects/RenderObject.cc
+++ b/src/ACGL/OpenGL/HiLevelObjects/RenderObject.cc
@@ -4,6 +4,10 @@
  * Distributed under the terms of the MIT License (see LICENSE.TXT).   *
  **********************************************************************/
 
+// See http://www.graphics.rwth-aachen.de/redmine/projects/acgl/wiki/ACGL_compile_time_settings
+// for a comment what unsupported means.
+#ifdef deprecated
+
 #include <ACGL/OpenGL/HiLevelObjects/RenderObject.hh>
 #if (ACGL_OPENGL_VERSION >= 30)
 
@@ -93,3 +97,5 @@ void RenderObject::disableViewport() const
 }
 
 #endif
+
+#endif
diff --git a/src/ACGL/OpenGL/HiLevelObjects/ShaderProgramObject.cc b/src/ACGL/OpenGL/HiLevelObjects/ShaderProgramObject.cc
index bbb90c34b837dee17616ab5041c76d359c049044..24eaa8f082d4488538fa20ea8bf5fefc9fcad552 100644
--- a/src/ACGL/OpenGL/HiLevelObjects/ShaderProgramObject.cc
+++ b/src/ACGL/OpenGL/HiLevelObjects/ShaderProgramObject.cc
@@ -4,6 +4,10 @@
  * Distributed under the terms of the MIT License (see LICENSE.TXT).   *
  **********************************************************************/
 
+// See http://www.graphics.rwth-aachen.de/redmine/projects/acgl/wiki/ACGL_compile_time_settings
+// for a comment what unsupported means.
+#ifdef deprecated
+
 #include <ACGL/OpenGL/HiLevelObjects/ShaderProgramObject.hh>
 
 using namespace ACGL::OpenGL;
@@ -24,3 +28,5 @@ void ShaderProgramObject::updateUniforms(void) const
         //if(mUniformTextureAttachments[i].location != -1) // this test breaks the SWP template
             mUniformTextureAttachments[i].uniformTexture->apply(mUniformTextureAttachments[i].location, i);
 }
+
+#endif