diff --git a/src/AbstractShaderProgram.h b/src/AbstractShaderProgram.h
index b768ea334..7f85beeaf 100644
--- a/src/AbstractShaderProgram.h
+++ b/src/AbstractShaderProgram.h
@@ -28,6 +28,8 @@
 
 #include "magnumVisibility.h"
 
+/** @todo early asserts (no bool returns?) */
+
 namespace Magnum {
 
 namespace Math {
diff --git a/src/Physics/Box.h b/src/Physics/Box.h
index d92ab64ab..81959172e 100644
--- a/src/Physics/Box.h
+++ b/src/Physics/Box.h
@@ -30,6 +30,7 @@ namespace Magnum { namespace Physics {
 /**
 @brief Unit-size box with assigned transformation matrix
 
+@todo Use quat + position + size instead?
 @see Box2D, Box3D
 */
 template<std::uint8_t dimensions> class PHYSICS_EXPORT Box: public AbstractShape<dimensions> {
diff --git a/src/SceneGraph/AbstractTransformation.h b/src/SceneGraph/AbstractTransformation.h
index 8b9849ffa..31dc26409 100644
--- a/src/SceneGraph/AbstractTransformation.h
+++ b/src/SceneGraph/AbstractTransformation.h
@@ -63,6 +63,13 @@ class AbstractTransformation {
          * These members must be defined by the implementation.
          */
 
+        /**
+         * @todo Common way to call setClean() on the object after setting
+         *      transformation & disallowing transformation setting on scene,
+         *      so the implementer doesn't forget to do it? It could also
+         *      allow to hide Object::isScene() from unwanted publicity.
+         */
+
         /**
          * @brief Transformation data type
          *
diff --git a/src/SceneGraph/MatrixTransformation2D.h b/src/SceneGraph/MatrixTransformation2D.h
index 31f1e3145..e60dc18a6 100644
--- a/src/SceneGraph/MatrixTransformation2D.h
+++ b/src/SceneGraph/MatrixTransformation2D.h
@@ -69,7 +69,7 @@ class MatrixTransformation2D: public AbstractTranslationRotationScaling2D<T> {
         MatrixTransformation2D<T>* setTransformation(const Math::Matrix3<T>& transformation) {
             /* Setting transformation is forbidden for the scene */
             /** @todo Assert for this? */
-            /** @todo Do this in some common code? */
+            /** @todo Do this in some common code so we don't need to include Object? */
             if(!static_cast<Object<MatrixTransformation2D<T>>*>(this)->isScene()) {
                 _transformation = transformation;
                 static_cast<Object<MatrixTransformation2D<T>>*>(this)->setDirty();
diff --git a/src/SceneGraph/MatrixTransformation3D.h b/src/SceneGraph/MatrixTransformation3D.h
index 13a3a8574..763acbcc3 100644
--- a/src/SceneGraph/MatrixTransformation3D.h
+++ b/src/SceneGraph/MatrixTransformation3D.h
@@ -69,7 +69,7 @@ class MatrixTransformation3D: public AbstractTranslationRotationScaling3D<T> {
         MatrixTransformation3D<T>* setTransformation(const Math::Matrix4<T>& transformation) {
             /* Setting transformation is forbidden for the scene */
             /** @todo Assert for this? */
-            /** @todo Do this in some common code? */
+            /** @todo Do this in some common code so we don't need to include Object? */
             if(!static_cast<Object<MatrixTransformation3D<T>>*>(this)->isScene()) {
                 _transformation = transformation;
                 static_cast<Object<MatrixTransformation3D<T>>*>(this)->setDirty();