diff --git a/legacy/elementary/src/lib/Elementary.h.in b/legacy/elementary/src/lib/Elementary.h.in
index 6ac1bec719..1202866cf2 100644
--- a/legacy/elementary/src/lib/Elementary.h.in
+++ b/legacy/elementary/src/lib/Elementary.h.in
@@ -208,19 +208,19 @@ EAPI extern Elm_Version *elm_version;
 #include <elm_grid.h> //Done
 
 // Woohyun Jung
-#include <elm_hover.h> // OK
-#include <elm_image.h> // OK
-#include <elm_index.h> // OK
-#include <elm_label.h> // OK
+#include <elm_hover.h> // XXX: needs to change one API 
+#include <elm_image.h> // XXX: some API names are ambiguous
+#include <elm_index.h> // XXX: all elm_index_item_xxx functions should be modifield
+#include <elm_label.h> // XXX: some APIs should be checked again for deprecating
 #include <elm_layout.h> // OK
 #include <elm_macros.h> // OK
-#include <elm_mapbuf.h> //  OK
+#include <elm_mapbuf.h> // OK
 #include <elm_map.h>
-#include <elm_menu.h> // OK
+#include <elm_menu.h> // XXX: one API's name is ambiguous
 #include <elm_mirroring.h> // OK
-#include <elm_need.h>
-#include <elm_notify.h>
-#include <elm_object.h>
+#include <elm_need.h> // OK
+#include <elm_notify.h> // OK
+#include <elm_object.h> // OK
 
 // SanjeevBA
 #include <elm_panel.h>
diff --git a/legacy/elementary/src/lib/elm_object.h b/legacy/elementary/src/lib/elm_object.h
index 474a8dabd1..bb540ebaa5 100644
--- a/legacy/elementary/src/lib/elm_object.h
+++ b/legacy/elementary/src/lib/elm_object.h
@@ -282,7 +282,7 @@ EAPI void         elm_object_signal_callback_add(Evas_Object *obj, const char *e
  * Remove a signal-triggered callback from a widget edje object.
  *
  * This function removes a callback, previously attached to a
- * signal emitted by the edje object of the obj.  The parameters
+ * signal emitted by the edje object of the obj. The parameters
  * emission, source and func must match exactly those passed to a
  * previous call to elm_object_signal_callback_add(). The data
  * pointer that was passed to this call will be returned.