diff --git a/legacy/elementary/src/lib/Elementary.h.in b/legacy/elementary/src/lib/Elementary.h.in
index 7afde0597f..7bbc1083bd 100644
--- a/legacy/elementary/src/lib/Elementary.h.in
+++ b/legacy/elementary/src/lib/Elementary.h.in
@@ -172,10 +172,10 @@ EAPI extern Elm_Version *elm_version;
 #include <elc_hoversel.h>
 #include <elc_multibuttonentry.h>
 #include <elc_naviframe.h>
-#include <elm_actionslider.h>
-#include <elm_app.h>
+#include <elm_actionslider.h> //ok
+#include <elm_app.h> //ok
 #include <elm_bg.h>
-#include <elm_box.h>
+#include <elm_box.h> //ok
 
 // Daniel Juyung Seo
 #include <elm_bubble.h> // OK
diff --git a/legacy/elementary/src/lib/elc_anchorblock.h b/legacy/elementary/src/lib/elc_anchorblock.h
index 6d24699c5a..0d49db8360 100644
--- a/legacy/elementary/src/lib/elc_anchorblock.h
+++ b/legacy/elementary/src/lib/elc_anchorblock.h
@@ -37,6 +37,8 @@
  * @{
  */
 
+/* XXX: Remove this awful widget. */
+
 /**
  * @typedef Elm_Entry_Anchorblock_Info
  *
diff --git a/legacy/elementary/src/lib/elc_anchorview.h b/legacy/elementary/src/lib/elc_anchorview.h
index 4a4516ba3b..d70c1e4bdd 100644
--- a/legacy/elementary/src/lib/elc_anchorview.h
+++ b/legacy/elementary/src/lib/elc_anchorview.h
@@ -41,6 +41,8 @@
  */
 typedef struct _Elm_Entry_Anchorview_Info Elm_Entry_Anchorview_Info;
 
+/* XXX: Merge into entry. */
+
 /**
  * @struct _Elm_Entry_Anchorview_Info
  *
diff --git a/legacy/elementary/src/lib/elc_ctxpopup.h b/legacy/elementary/src/lib/elc_ctxpopup.h
index 240501b3f7..1e6ede7d4d 100644
--- a/legacy/elementary/src/lib/elc_ctxpopup.h
+++ b/legacy/elementary/src/lib/elc_ctxpopup.h
@@ -46,6 +46,8 @@
  * @{
  */
 
+/* XXX: Kinda internal, but relevant for the theme: use elm_scroller and not els_scroller. */
+
 typedef enum
 {
    ELM_CTXPOPUP_DIRECTION_DOWN, /**< ctxpopup show appear below clicked area */
diff --git a/legacy/elementary/src/lib/elc_fileselector_button.h b/legacy/elementary/src/lib/elc_fileselector_button.h
index 73c965145a..125c098f22 100644
--- a/legacy/elementary/src/lib/elc_fileselector_button.h
+++ b/legacy/elementary/src/lib/elc_fileselector_button.h
@@ -63,6 +63,7 @@
  */
 EAPI Evas_Object                *elm_fileselector_button_add(Evas_Object *parent);
 
+/* XXX: fileselector/fs_button/fs_entry: elm_fileselector_expandable_set should probably be called: tree_view or something. */
 /**
  * Set the title for a given file selector button widget's window
  *
diff --git a/legacy/elementary/src/lib/elc_hoversel.h b/legacy/elementary/src/lib/elc_hoversel.h
index ca16733b78..827c9736d8 100644
--- a/legacy/elementary/src/lib/elc_hoversel.h
+++ b/legacy/elementary/src/lib/elc_hoversel.h
@@ -77,6 +77,7 @@ EAPI Eina_Bool                    elm_hoversel_horizontal_get(const Evas_Object
  * hoversel is clicked. Should probably be the window that the hoversel is
  * in. See @ref Hover objects for more information.
  */
+/* XXX: Not the best name in my pov. Maybe call it tree_view or something. */
 EAPI void                         elm_hoversel_hover_parent_set(Evas_Object *obj, Evas_Object *parent);
 /**
  * @brief Get the Hover parent
diff --git a/legacy/elementary/src/lib/elc_multibuttonentry.h b/legacy/elementary/src/lib/elc_multibuttonentry.h
index 03e8981590..dcf3f19c58 100644
--- a/legacy/elementary/src/lib/elc_multibuttonentry.h
+++ b/legacy/elementary/src/lib/elc_multibuttonentry.h
@@ -37,6 +37,13 @@
  *
  */
 
+/* XXX:
+ * 1. docs are lacking.
+ * 2. name sucks
+ * 3. should use the elm_object_part_text_set to set guide text.
+ * 4. shrink_mode is an awful name.
+ * 5. bugs: offset bug with the "tap to add recipient" + delete doesn't delete items but backspace does. */
+
 /**
  * @addtogroup Multibuttonentry
  * @{
diff --git a/legacy/elementary/src/lib/elc_naviframe.h b/legacy/elementary/src/lib/elc_naviframe.h
index 063b9ebc45..2a22628306 100644
--- a/legacy/elementary/src/lib/elc_naviframe.h
+++ b/legacy/elementary/src/lib/elc_naviframe.h
@@ -69,6 +69,10 @@
  * @{
  */
 
+/* XXX:     docs are incomplete. for example: pop_to + elm_naviframe_content_preserve_on_pop_set sounds like the hackiest thing ever.
+ *     all the api looks like it was created as workarounds for issues instead of designed from the start. - really, everything should be rewritten. 
+ */
+
 /**
  * @brief Add a new Naviframe object to the parent.
  *
diff --git a/legacy/elementary/src/lib/elm_bg.h b/legacy/elementary/src/lib/elm_bg.h
index 0feff07539..a378117c03 100644
--- a/legacy/elementary/src/lib/elm_bg.h
+++ b/legacy/elementary/src/lib/elm_bg.h
@@ -141,6 +141,7 @@ EAPI void                         elm_bg_color_get(const Evas_Object *obj, int *
  *
  * @ingroup Bg
  */
+/* XXX: Sounds awfully hackish - there must be a better way than hardcoding pixel sizes. Do they at least scale with the config? */
 EAPI void                         elm_bg_load_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
 
 /**
diff --git a/legacy/elementary/src/lib/elm_entry.h b/legacy/elementary/src/lib/elm_entry.h
index 261ee98198..b9ca59e9e0 100644
--- a/legacy/elementary/src/lib/elm_entry.h
+++ b/legacy/elementary/src/lib/elm_entry.h
@@ -253,6 +253,8 @@ typedef enum
    ELM_TEXT_FORMAT_MARKUP_UTF8  /**< Markup UTF8 type */
 } Elm_Text_Format;
 
+/* XXX: Filter_Limit_Size and Filter_Accept_Set are awful in my pov. The API looks bad. */
+
 /**
  * @enum _Elm_Wrap_Type
  * @typedef Elm_Wrap_Type