diff --git a/src/lib/elementary/elm_calendar.eo b/src/lib/elementary/elm_calendar.eo
index 3b14fa5fd4..7587310ce6 100644
--- a/src/lib/elementary/elm_calendar.eo
+++ b/src/lib/elementary/elm_calendar.eo
@@ -1,6 +1,6 @@
 import efl_types;
 
-type Elm_Calendar_Format_Cb: __undefined_type;
+type Elm_Calendar_Format_Cb: __undefined_type; [[Elementary calendar format callback type]]
 
 enum Elm.Calendar.Mark.Repeat.Type
 {
diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo
index 31832e7ec6..9ae2f85878 100644
--- a/src/lib/elementary/elm_entry.eo
+++ b/src/lib/elementary/elm_entry.eo
@@ -1,8 +1,8 @@
 import elm_general;
 import elm_icon;
 
-type Elm_Entry_Item_Provider_Cb: __undefined_type;
-type Elm_Entry_Filter_Cb: __undefined_type;
+type Elm_Entry_Item_Provider_Cb: __undefined_type; [[Elementary entry item provider callback type]]
+type Elm_Entry_Filter_Cb: __undefined_type; [[Elementary entry filter callback type]]
 
 enum Elm.Text_Format
 {
diff --git a/src/lib/elementary/elm_general.eot b/src/lib/elementary/elm_general.eot
index 5e2fb0dbc8..1a85387b6b 100644
--- a/src/lib/elementary/elm_general.eot
+++ b/src/lib/elementary/elm_general.eot
@@ -7,17 +7,17 @@ struct Elm.Event.Policy_Changed
 }
 
 /* FIXME: These shouldn't be here, we don't do functions in eolian!!! */
-type Elm_Gen_Item_Text_Get_Cb: __undefined_type;
-type Elm_Gen_Item_Content_Get_Cb: __undefined_type;
-type Elm_Gen_Item_State_Get_Cb: __undefined_type;
-type Elm_Gen_Item_Del_Cb: __undefined_type;
-type Elm_Gen_Item_Filter_Get_Cb: __undefined_type;
-type Elm_Gen_Item_Reusable_Content_Get_Cb: __undefined_type;
-type Elm_Tooltip_Item_Content_Cb: __undefined_type;
-type Elm_Object_Item_Signal_Cb: __undefined_type;
-type Elm_Event_Cb: __undefined_type;
-type Evas_Smart_Cb: __undefined_type;
-type Eina_Compare_Cb: __undefined_type;
+type Elm_Gen_Item_Text_Get_Cb: __undefined_type; [[Elementary genlist/gengrid item text callback type]]
+type Elm_Gen_Item_Content_Get_Cb: __undefined_type; [[Elementary genlist/gengrid item content callback type]]
+type Elm_Gen_Item_State_Get_Cb: __undefined_type; [[Elementary genlist/gengrid item state callback type]]
+type Elm_Gen_Item_Del_Cb: __undefined_type; [[Elementary genlist/gengrid item del callback type]]
+type Elm_Gen_Item_Filter_Get_Cb: __undefined_type; [[Elementary genlist/gengrid item filter callback type]]
+type Elm_Gen_Item_Reusable_Content_Get_Cb: __undefined_type; [[Elementary genlist/gengrid item reusable content callback type]]
+type Elm_Tooltip_Item_Content_Cb: __undefined_type; [[Elementary tooltip item content callback type]]
+type Elm_Object_Item_Signal_Cb: __undefined_type; [[Elementary object item signal callback type]]
+type Elm_Event_Cb: __undefined_type; [[Elementary event callback type]]
+type Evas_Smart_Cb: __undefined_type; [[Evas smart callback type]]
+type Eina_Compare_Cb: __undefined_type; [[Eina compare callback type]]
 
 /* FIXME: This shouldn't be here, we don't do functions in eolian!!! */
 struct Elm.Gen.Item.Class.Functions
diff --git a/src/lib/elementary/elm_gesture_layer.eo b/src/lib/elementary/elm_gesture_layer.eo
index edd715a188..94f86eb932 100644
--- a/src/lib/elementary/elm_gesture_layer.eo
+++ b/src/lib/elementary/elm_gesture_layer.eo
@@ -1,4 +1,4 @@
-type Elm_Gesture_Event_Cb: __undefined_type;
+type Elm_Gesture_Event_Cb: __undefined_type; [[Elementary gesture event callback type]]
 
 enum Elm.Gesture.Type
 {
diff --git a/src/lib/elementary/elm_glview.eo b/src/lib/elementary/elm_glview.eo
index 2198e788f3..ae39cca247 100644
--- a/src/lib/elementary/elm_glview.eo
+++ b/src/lib/elementary/elm_glview.eo
@@ -1,6 +1,6 @@
-type Evas_GL: __undefined_type;
-type Evas_GL_API: __undefined_type;
-type Evas_GL_Context_Version: __undefined_type;
+type Evas_GL: __undefined_type; [[Evas GL type]]
+type Evas_GL_API: __undefined_type; [[Evas GL API type]]
+type Evas_GL_Context_Version: __undefined_type; [[Evas GL context version type]]
 
 enum Elm.GLView.Mode
 {
diff --git a/src/lib/elementary/elm_interface_atspi_accessible.eo b/src/lib/elementary/elm_interface_atspi_accessible.eo
index 912c7eced8..8928ee0524 100644
--- a/src/lib/elementary/elm_interface_atspi_accessible.eo
+++ b/src/lib/elementary/elm_interface_atspi_accessible.eo
@@ -1,5 +1,5 @@
 /* FIXME: This definitely shouldn't be here. */
-type Efl_Event_Cb: __undefined_type;
+type Efl_Event_Cb: __undefined_type; [[Efl event callback type]]
 
 enum Elm.Atspi.Type
 {
@@ -233,7 +233,7 @@ struct Elm.Atspi.Relation
    objects: list<Efl.Object>; [[List with relation objects]]
 }
 
-type Elm.Atspi.Relation_Set: list<Elm.Atspi.Relation *>;
+type Elm.Atspi.Relation_Set: list<Elm.Atspi.Relation *>; [[Elementary ATSPI relation set type]]
 
 mixin Elm.Interface.Atspi_Accessible ()
 {
diff --git a/src/lib/elementary/elm_interface_atspi_widget_action.eo b/src/lib/elementary/elm_interface_atspi_widget_action.eo
index b422d11e74..3fb24dec4f 100644
--- a/src/lib/elementary/elm_interface_atspi_widget_action.eo
+++ b/src/lib/elementary/elm_interface_atspi_widget_action.eo
@@ -1,4 +1,4 @@
-type Elm_Atspi_Action: __undefined_type;
+type Elm_Atspi_Action: __undefined_type; [[Elementary ATSPI action type]]
 
 mixin Elm.Interface.Atspi_Widget_Action (Elm.Interface.Atspi_Action)
 {
diff --git a/src/lib/elementary/elm_interface_fileselector.eo b/src/lib/elementary/elm_interface_fileselector.eo
index 9366e84168..c603b18000 100644
--- a/src/lib/elementary/elm_interface_fileselector.eo
+++ b/src/lib/elementary/elm_interface_fileselector.eo
@@ -1,6 +1,6 @@
 import evas_types;
 
-type Elm_Fileselector_Filter_Func: __undefined_type;
+type Elm_Fileselector_Filter_Func: __undefined_type; [[Elementary fileselector filter function type]]
 
 enum Elm.Fileselector.Mode
 {
diff --git a/src/lib/elementary/elm_interface_scrollable.eo b/src/lib/elementary/elm_interface_scrollable.eo
index adaf5cacf6..e784ebe626 100644
--- a/src/lib/elementary/elm_interface_scrollable.eo
+++ b/src/lib/elementary/elm_interface_scrollable.eo
@@ -1,8 +1,8 @@
 import elm_general;
 
-type Elm_Interface_Scrollable_Cb: __undefined_type;
-type Elm_Interface_Scrollable_Resize_Cb: __undefined_type;
-type Elm_Interface_Scrollable_Min_Limit_Cb: __undefined_type;
+type Elm_Interface_Scrollable_Cb: __undefined_type; [[Elementary interface scrollable callback type]]
+type Elm_Interface_Scrollable_Resize_Cb: __undefined_type; [[Elementary interface scrollable resize callback type]]
+type Elm_Interface_Scrollable_Min_Limit_Cb: __undefined_type; [[Elementary interface scrollable minimal limit callback type]]
 
 /* FIXME: Rename the namespace of the types. */
 enum Elm.Scroller.Policy
diff --git a/src/lib/elementary/elm_map.eo b/src/lib/elementary/elm_map.eo
index 7f47ff80de..298326ae6d 100644
--- a/src/lib/elementary/elm_map.eo
+++ b/src/lib/elementary/elm_map.eo
@@ -1,10 +1,10 @@
 /* FIXME: Handle properly. */
-type Elm_Map_Route: __undefined_type;
-type Elm_Map_Route_Cb: __undefined_type;
-type Elm_Map_Overlay: __undefined_type;
-type Elm_Map_Name: __undefined_type;
-type Elm_Map_Name_Cb: __undefined_type;
-type Elm_Map_Name_List_Cb: __undefined_type;
+type Elm_Map_Route: __undefined_type; [[Elementary map route type]]
+type Elm_Map_Route_Cb: __undefined_type; [[Elementary map route callback type]]
+type Elm_Map_Overlay: __undefined_type; [[Elementary map overlay type]]
+type Elm_Map_Name: __undefined_type; [[Elementary map name type]]
+type Elm_Map_Name_Cb: __undefined_type; [[Elementary map name callback type]]
+type Elm_Map_Name_List_Cb: __undefined_type; [[Elementary map name list callback type]]
 
 enum Elm.Map.Zoom_Mode
 {
diff --git a/src/lib/elementary/elm_multibuttonentry.eo b/src/lib/elementary/elm_multibuttonentry.eo
index 61492e9612..a2dc65a0e7 100644
--- a/src/lib/elementary/elm_multibuttonentry.eo
+++ b/src/lib/elementary/elm_multibuttonentry.eo
@@ -1,5 +1,5 @@
-type Elm_Multibuttonentry_Item_Filter_Cb: __undefined_type;
-type Elm_Multibuttonentry_Format_Cb: __undefined_type;
+type Elm_Multibuttonentry_Item_Filter_Cb: __undefined_type; [[Elementary multibuttonentry item filter callback type]]
+type Elm_Multibuttonentry_Format_Cb: __undefined_type; [[Elementary multibuttonentry format callback type]]
 
 class Elm.Multibuttonentry (Elm.Layout)
 {
diff --git a/src/lib/elementary/elm_naviframe_item.eo b/src/lib/elementary/elm_naviframe_item.eo
index 9b4cf94fb7..26df27bcef 100644
--- a/src/lib/elementary/elm_naviframe_item.eo
+++ b/src/lib/elementary/elm_naviframe_item.eo
@@ -1,4 +1,4 @@
-type Elm_Naviframe_Item_Pop_Cb: __undefined_type;
+type Elm_Naviframe_Item_Pop_Cb: __undefined_type; [[Elementary naviframe item pop callback type]]
 
 class Elm.Naviframe.Item(Elm.Widget.Item)
 {
diff --git a/src/lib/elementary/elm_prefs.eo b/src/lib/elementary/elm_prefs.eo
index dea1603c50..9df14d337f 100644
--- a/src/lib/elementary/elm_prefs.eo
+++ b/src/lib/elementary/elm_prefs.eo
@@ -1,7 +1,7 @@
 import eina_types;
 
-type Elm_Prefs_Data: __undefined_type;
-type Elm_Prefs_Reset_Mode: __undefined_type;
+type Elm_Prefs_Data: __undefined_type; [[Elementary preferences data type]]
+type Elm_Prefs_Reset_Mode: __undefined_type; [[Elementary preferences reset mode type]]
 
 class Elm.Prefs (Elm.Widget, Efl.File)
 {
diff --git a/src/lib/elementary/elm_slider.eo b/src/lib/elementary/elm_slider.eo
index e60fc3fc3c..14f25f77ed 100644
--- a/src/lib/elementary/elm_slider.eo
+++ b/src/lib/elementary/elm_slider.eo
@@ -1,5 +1,5 @@
-type slider_func_type: __undefined_type;
-type slider_freefunc_type: __undefined_type;
+type slider_func_type: __undefined_type; [[Elementary slider function type]]
+type slider_freefunc_type: __undefined_type; [[Elementary slider free function type]]
 
 class Elm.Slider (Elm.Layout, Efl.Ui.Progress,
                   Efl.Orientation,
diff --git a/src/lib/elementary/elm_slideshow.eo b/src/lib/elementary/elm_slideshow.eo
index ea0ce2b970..f072a18c58 100644
--- a/src/lib/elementary/elm_slideshow.eo
+++ b/src/lib/elementary/elm_slideshow.eo
@@ -1,4 +1,4 @@
-type Elm_Slideshow_Item_Class: __undefined_type;
+type Elm_Slideshow_Item_Class: __undefined_type; [[Elementary slideshow item class type]]
 
 class Elm.Slideshow (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
 {
diff --git a/src/lib/elementary/elm_sys_notify_interface.eo b/src/lib/elementary/elm_sys_notify_interface.eo
index 0ad9d3221e..bc3fc53c5b 100644
--- a/src/lib/elementary/elm_sys_notify_interface.eo
+++ b/src/lib/elementary/elm_sys_notify_interface.eo
@@ -1,4 +1,4 @@
-type Elm_Sys_Notify_Send_Cb: __undefined_type;
+type Elm_Sys_Notify_Send_Cb: __undefined_type; [[elementary system notify send callback type]] 
 
 enum Elm.Sys_Notify.Urgency
 {
diff --git a/src/lib/elementary/elm_web.eo b/src/lib/elementary/elm_web.eo
index 56c0881310..5e9dc5f43a 100644
--- a/src/lib/elementary/elm_web.eo
+++ b/src/lib/elementary/elm_web.eo
@@ -1,9 +1,9 @@
-type Elm_Web_Console_Message: __undefined_type;
-type Elm_Web_Window_Open: __undefined_type;
-type Elm_Web_Dialog_File_Selector: __undefined_type;
-type Elm_Web_Dialog_Confirm: __undefined_type;
-type Elm_Web_Dialog_Prompt: __undefined_type;
-type Elm_Web_Dialog_Alert: __undefined_type;
+type Elm_Web_Console_Message: __undefined_type; [[Elementary web console message type]]
+type Elm_Web_Window_Open: __undefined_type; [[Elementary web window open type]]
+type Elm_Web_Dialog_File_Selector: __undefined_type; [[Elementary web dialog file selector type]]
+type Elm_Web_Dialog_Confirm: __undefined_type; [[Elementary web dialog confirm type]]
+type Elm_Web_Dialog_Prompt: __undefined_type; [[Elementary web dialog prompt type]]
+type Elm_Web_Dialog_Alert: __undefined_type; [[Elementary web dialog alert type]]
 
 enum Elm.Web.Zoom_Mode
 {
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index fb6f7f1c32..52ff80e759 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -3,8 +3,8 @@ import elm_general;
 import efl_input_types;
 
 /* FIXME: This shouldn't be here. */
-type list_data_get_func_type: __undefined_type;
-type region_hook_func_type: __undefined_type;
+type list_data_get_func_type: __undefined_type; [[Elementary list data get function type]]
+type region_hook_func_type: __undefined_type; [[Elementary region hook function type]]
 
 enum Elm.Activate
 {