diff --git a/legacy/elementary/src/lib/Elementary.h.in b/legacy/elementary/src/lib/Elementary.h.in
index ab8827c8c4..fd60c62967 100644
--- a/legacy/elementary/src/lib/Elementary.h.in
+++ b/legacy/elementary/src/lib/Elementary.h.in
@@ -178,17 +178,17 @@ EAPI extern Elm_Version *elm_version;
 #include <elm_box.h>
 
 // Daniel Juyung Seo
-#include <elm_bubble.h> // comments in elm_bubble.h
+#include <elm_bubble.h> // XXX: comments in elm_bubble.h
 #include <elm_button.h> // OK
-#include <elm_cache.h>
+#include <elm_cache.h> // XXX: comments in elm_cache.h
 #include <elm_calendar.h>
 #include <elm_check.h>
 #include <elm_clock.h>
-#include <elm_cnp.h> // comments in elm_cnp.h
+#include <elm_cnp.h> // XXX: comments in elm_cnp.h
 #include <elm_colorselector.h>
 #include <elm_config.h>
 #include <elm_conform.h>
-#include <elm_cursor.h> // comments in elm_cursor.h. review was not finished.
+#include <elm_cursor.h> // XXX: comments in elm_cursor.h. review was not finished.
 #include <elm_debug.h> // OK
 #include <elm_diskselector.h>
 
diff --git a/legacy/elementary/src/lib/elm_cache.h b/legacy/elementary/src/lib/elm_cache.h
index 0a5e808f35..39a02c95cc 100644
--- a/legacy/elementary/src/lib/elm_cache.h
+++ b/legacy/elementary/src/lib/elm_cache.h
@@ -34,7 +34,7 @@ EAPI void      elm_cache_all_flush(void);
  * @return The cache flush interval time
  * @ingroup Caches
  *
- * @see elm_all_flush()
+ * @see elm_cache_all_flush()
  */
 EAPI int       elm_cache_flush_interval_get(void);
 
@@ -46,7 +46,7 @@ EAPI int       elm_cache_flush_interval_get(void);
  * @param size The cache flush interval time
  * @ingroup Caches
  *
- * @see elm_all_flush()
+ * @see elm_cache_all_flush()
  */
 EAPI void      elm_cache_flush_interval_set(int size);
 
@@ -64,7 +64,7 @@ EAPI void      elm_cache_flush_interval_set(int size);
  * @return The cache flush state
  * @ingroup Caches
  *
- * @see elm_all_flush()
+ * @see elm_cache_all_flush()
  */
 EAPI Eina_Bool elm_cache_flush_enabled_get(void);
 
@@ -76,7 +76,7 @@ EAPI Eina_Bool elm_cache_flush_enabled_get(void);
  * @param enabled The cache flush enabled state
  * @ingroup Caches
  *
- * @see elm_all_flush()
+ * @see elm_cache_all_flush()
  */
 EAPI void      elm_cache_flush_enabled_set(Eina_Bool enabled);
 
@@ -88,6 +88,7 @@ EAPI void      elm_cache_flush_enabled_set(Eina_Bool enabled);
  * @return The font cache size
  * @ingroup Caches
  */
+// XXX: how about using elm_cache prefix for all following APIs???
 EAPI int       elm_font_cache_get(void);
 
 /**