diff --git a/sys/include/net/ng_icmpv6.h b/sys/include/net/ng_icmpv6.h
index de076d8de5..8bb2828d59 100644
--- a/sys/include/net/ng_icmpv6.h
+++ b/sys/include/net/ng_icmpv6.h
@@ -20,6 +20,8 @@
  * @brief       Definitions for ICMPv6
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
+ *
+ * @todo build error messages
  */
 
 #ifndef NG_ICMPV6_H_
@@ -77,8 +79,6 @@ void ng_icmpv6_demux(kernel_pid_t iface, ng_pktsnip_t *pkt);
  */
 ng_pktsnip_t *ng_icmpv6_build(ng_pktsnip_t *next, uint8_t type, uint8_t code, size_t size);
 
-/* TODO: build error messages */
-
 /**
  * @brief   Calculates the checksum for an ICMPv6 packet.
  *
diff --git a/sys/include/net/ng_icmpv6/error.h b/sys/include/net/ng_icmpv6/error.h
index dd4f0a2712..634ff80015 100644
--- a/sys/include/net/ng_icmpv6/error.h
+++ b/sys/include/net/ng_icmpv6/error.h
@@ -16,6 +16,8 @@
  * @brief   ICMPv6 error message definitions
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
+ *
+ * @todo implement build and handle functions
  */
 #ifndef NG_ICMPV6_ERROR_H_
 #define NG_ICMPV6_ERROR_H_
@@ -146,8 +148,6 @@ typedef struct __attribute__((packed)) {
     network_uint32_t ptr;   /**< pointer */
 } ng_icmpv6_error_param_prob_t;
 
-/* TODO: implement build and handle functions */
-
 #ifdef __cplusplus
 }
 #endif