Index: uspace/lib/posix/ctype.c
===================================================================
--- uspace/lib/posix/ctype.c	(revision 55b1efdf7543e6d4c2b3b3ddc286283113cfb605)
+++ uspace/lib/posix/ctype.c	(revision 6921178cb94f16c993f442abb278dbce48fe6afe)
@@ -37,6 +37,4 @@
 
 #include "ctype.h"
-
-// TODO: propose for inclusion in libc
 
 /**
Index: uspace/lib/posix/errno.h
===================================================================
--- uspace/lib/posix/errno.h	(revision 55b1efdf7543e6d4c2b3b3ddc286283113cfb605)
+++ uspace/lib/posix/errno.h	(revision 6921178cb94f16c993f442abb278dbce48fe6afe)
@@ -57,5 +57,5 @@
  * redefinition for such error codes.
  *
- * FIXME: maybe all HOS error codes should be redefined
+ * XXX: maybe all HOS error codes should be redefined
  *
  * NOTE: This redefinition is slightly POSIX incompatible, since the
Index: uspace/lib/posix/fnmatch.c
===================================================================
--- uspace/lib/posix/fnmatch.c	(revision 55b1efdf7543e6d4c2b3b3ddc286283113cfb605)
+++ uspace/lib/posix/fnmatch.c	(revision 6921178cb94f16c993f442abb278dbce48fe6afe)
@@ -624,5 +624,5 @@
 }
 
-// FIXME: put the testcases somewhere else
+// FIXME: put the testcases to the app/tester after fnmatch is included into libc
 
 #if 0
Index: uspace/lib/posix/stdbool.h
===================================================================
--- uspace/lib/posix/stdbool.h	(revision 55b1efdf7543e6d4c2b3b3ddc286283113cfb605)
+++ uspace/lib/posix/stdbool.h	(revision 6921178cb94f16c993f442abb278dbce48fe6afe)
@@ -36,7 +36,4 @@
 #define POSIX_STDBOOL_H_
 
-// TODO: propose for inclusion in libc and drop bool.h,
-//       it's a very silly incompatibility with standard C
-
 #ifdef LIBC_BOOL_H_
 	#error "You can't include bool.h and stdbool.h at the same time."
Index: uspace/lib/posix/stdio/scanf.c
===================================================================
--- uspace/lib/posix/stdio/scanf.c	(revision 55b1efdf7543e6d4c2b3b3ddc286283113cfb605)
+++ uspace/lib/posix/stdio/scanf.c	(revision 6921178cb94f16c993f442abb278dbce48fe6afe)
@@ -707,5 +707,5 @@
 							break;
 						case LMOD_t: ;
-							// FIXME: What is unsigned counterpart of the ptrdiff_t?
+							// XXX: What is unsigned counterpart of the ptrdiff_t?
 							size_t *pt = va_arg(arg, size_t *);
 							*pt = (size_t) ures;
@@ -1221,5 +1221,5 @@
 }
 
-// FIXME: put the testcases somewhere else
+// FIXME: put the testcases to the app/tester after scanf is included into libc
 
 #if 0
Index: uspace/lib/posix/string.h
===================================================================
--- uspace/lib/posix/string.h	(revision 55b1efdf7543e6d4c2b3b3ddc286283113cfb605)
+++ uspace/lib/posix/string.h	(revision 6921178cb94f16c993f442abb278dbce48fe6afe)
@@ -51,13 +51,10 @@
  * void *memmove(void *, const void *, size_t);
  *
- * unimplemented due to missing locales
+ * TODO: not implemented due to missing locale support
  *
  * int      strcoll_l(const char *, const char *, locale_t);
  * char    *strerror_l(int, locale_t);
  * size_t   strxfrm_l(char *restrict, const char *restrict, size_t, locale_t);
- *
  */
-
-// TODO: provide *_l once there is locale.h
 
 #ifndef NULL
Index: uspace/lib/posix/strings.h
===================================================================
--- uspace/lib/posix/strings.h	(revision 55b1efdf7543e6d4c2b3b3ddc286283113cfb605)
+++ uspace/lib/posix/strings.h	(revision 6921178cb94f16c993f442abb278dbce48fe6afe)
@@ -48,5 +48,5 @@
 #endif
 
-/* TODO: not implemented due to missing locale.h
+/* TODO: not implemented due to missing locale support
  *
  * int strcasecmp_l(const char *, const char *, locale_t);