diff --git a/src/AbstractImage.h b/src/AbstractImage.h
index 57a02caa4..2ba2279c7 100644
--- a/src/AbstractImage.h
+++ b/src/AbstractImage.h
@@ -32,6 +32,10 @@ namespace Magnum {
 
 See Image, ImageWrapper, BufferImage, Trade::ImageData documentation for
 more information.
+@todo Where to put glClampColor() and glPixelStore() encapsulation? It is
+needed in AbstractFramebuffer::read(), Texture::setImage() etc (i.e. all
+functions operating with images). It also possibly needs to be "stackable" to
+easily revert the state back.
 */
 class MAGNUM_EXPORT AbstractImage {
     AbstractImage(const AbstractImage& other) = delete;
diff --git a/src/AbstractTexture.h b/src/AbstractTexture.h
index d1f468953..2ec6975dc 100644
--- a/src/AbstractTexture.h
+++ b/src/AbstractTexture.h
@@ -63,6 +63,7 @@ performed by OpenGL in order to preserve the data. If running on OpenGL ES or
 extension @extension{ARB,invalidate_subdata} is not available, these functions
 do nothing.
 
+@todo all texture [level] parameters, global texture parameters
 @todo Add glPixelStore encapsulation
 @todo Texture copying
 @todo Move constructor/assignment - how to avoid creation of empty texture and
diff --git a/src/Context.h b/src/Context.h
index d0cb02b45..569ac877f 100644
--- a/src/Context.h
+++ b/src/Context.h
@@ -127,6 +127,8 @@ Provides access to version and extension information. Instance available
 through Context::current() is automatically created during construction of
 *Application classes in Platform namespace so you can safely assume that the
 instance is available during whole lifetime of *Application object.
+@todo @extension{ATI,meminfo}, @extension{NVX,gpu_memory_info}, GPU temperature?
+    (here or where?)
 */
 class MAGNUM_EXPORT Context {
     Context(const Context&) = delete;
diff --git a/src/Physics/AxisAlignedBox.h b/src/Physics/AxisAlignedBox.h
index 2b6eb7f4a..aa4756c49 100644
--- a/src/Physics/AxisAlignedBox.h
+++ b/src/Physics/AxisAlignedBox.h
@@ -31,6 +31,7 @@ namespace Magnum { namespace Physics {
 @brief Axis-aligned box
 
 @see AxisAlignedBox2D, AxisAlignedBox3D
+@todo Assert for rotation
 */
 template<std::uint8_t dimensions> class MAGNUM_PHYSICS_EXPORT AxisAlignedBox: public AbstractShape<dimensions> {
     public:
diff --git a/src/Physics/Box.h b/src/Physics/Box.h
index 67c0b80a0..acb24e091 100644
--- a/src/Physics/Box.h
+++ b/src/Physics/Box.h
@@ -32,6 +32,7 @@ namespace Magnum { namespace Physics {
 
 @todo Use quat + position + size instead?
 @see Box2D, Box3D
+@todo Assert for skew
 */
 template<std::uint8_t dimensions> class MAGNUM_PHYSICS_EXPORT Box: public AbstractShape<dimensions> {
     public:
diff --git a/src/Physics/Capsule.h b/src/Physics/Capsule.h
index 9fd8e15d8..0e0184a08 100644
--- a/src/Physics/Capsule.h
+++ b/src/Physics/Capsule.h
@@ -33,6 +33,7 @@ namespace Magnum { namespace Physics {
 Unlike other elements the capsule doesn't support asymmetric scaling. When
 applying transformation, the scale factor is averaged from all axes.
 @see Capsule2D, Capsule3D
+@todo Assert for asymmetric scaling
 */
 template<std::uint8_t dimensions> class MAGNUM_PHYSICS_EXPORT Capsule: public AbstractShape<dimensions> {
     public:
diff --git a/src/Physics/Sphere.h b/src/Physics/Sphere.h
index 8d95f2512..5c60df747 100644
--- a/src/Physics/Sphere.h
+++ b/src/Physics/Sphere.h
@@ -33,6 +33,7 @@ namespace Magnum { namespace Physics {
 Unlike other elements the sphere doesn't support asymmetric scaling. When
 applying transformation, the scale factor is averaged from all axes.
 @see Sphere2D, Sphere3D
+@todo Assert for asymmetric scaling
 */
 template<std::uint8_t dimensions> class MAGNUM_PHYSICS_EXPORT Sphere: public AbstractShape<dimensions> {
     public:
diff --git a/src/Query.h b/src/Query.h
index ff3f9ca22..f768c8ca7 100644
--- a/src/Query.h
+++ b/src/Query.h
@@ -355,6 +355,7 @@ GLuint timeElapsed2 = q3.result<GLuint>()-tmp;
 Using this query results in fewer OpenGL calls when doing more measures.
 @requires_gl33 %Extension @extension{ARB,timer_query}
 @requires_gl Timer query is not available in OpenGL ES.
+@todo timestamp with glGet + example usage
 */
 class TimeQuery: public AbstractQuery {
     public: