diff --git a/src/lib/ecore_x/Ecore_X.h b/src/lib/ecore_x/Ecore_X.h
index 4764c996f4..06ab94d366 100644
--- a/src/lib/ecore_x/Ecore_X.h
+++ b/src/lib/ecore_x/Ecore_X.h
@@ -33,12 +33,27 @@
  * @file
  * @brief Ecore functions for dealing with the X Windows System
  *
+ * @defgroup Ecore_X_Group Ecore_X - X11 Integration
+ * @ingroup Ecore
+ *
  * Ecore_X provides a wrapper and convenience functions for using the
  * X Windows System.  Function groups for this part of the library
  * include the following:
  * @li @ref Ecore_X_Init_Group
  * @li @ref Ecore_X_Display_Attr_Group
  * @li @ref Ecore_X_Flush_Group
+ * @li @ref Ecore_X_DPMS_Group
+ * @li @ref Ecore_X_Drawable_Group
+ * @li @ref Ecore_X_Pixmap_Group
+ * @li @ref Ecore_X_Window_Create_Group
+ * @li @ref Ecore_X_Window_Properties_Group
+ * @li @ref Ecore_X_Window_Destroy_Group
+ * @li @ref Ecore_X_Window_Visibility_Group
+ * @li @ref Ecore_X_Window_Geometry_Group
+ * @li @ref Ecore_X_Window_Focus_Functions
+ * @li @ref Ecore_X_Window_Z_Order_Group
+ * @li @ref Ecore_X_Window_Parent_Group
+ * @li @ref Ecore_X_Window_Shape
  */
 
 typedef unsigned int   Ecore_X_ID;
diff --git a/src/lib/ecore_x/xcb/ecore_xcb.c b/src/lib/ecore_x/xcb/ecore_xcb.c
index 82b4d4172b..32f7ea407f 100644
--- a/src/lib/ecore_x/xcb/ecore_xcb.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb.c
@@ -28,7 +28,7 @@ double _ecore_xcb_double_click_time = 0.25;
 
 /**
  * @defgroup Ecore_X_Init_Group X Library Init and Shutdown Functions
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * Functions that start and shut down the Ecore X Library.
  */
@@ -321,7 +321,7 @@ ecore_x_disconnect(void)
 
 /**
  * @defgroup Ecore_X_Flush_Group X Synchronization Functions
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * Functions that ensure that all commands that have been issued by the
  * Ecore X library have been sent to the server.
@@ -1191,7 +1191,7 @@ ecore_x_dpi_get(void)
 
 /**
  * @defgroup Ecore_X_Display_Attr_Group X Display Attributes
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * Functions that set and retrieve X display attributes.
  */
diff --git a/src/lib/ecore_x/xcb/ecore_xcb_atoms.c b/src/lib/ecore_x/xcb/ecore_xcb_atoms.c
index a613d8ff75..3b4da1d5bc 100644
--- a/src/lib/ecore_x/xcb/ecore_xcb_atoms.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_atoms.c
@@ -47,8 +47,8 @@ _ecore_xcb_atoms_finalize(void)
 }
 
 /**
- * @defgroup Ecore_X_Atom_Group XCB Atom Functions
- * @ingroup Ecore
+ * @defgroup Ecore_X_Atom_Group X Atom Functions
+ * @ingroup Ecore_X_Group
  *
  * Functions that operate on atoms
  */
diff --git a/src/lib/ecore_x/xcb/ecore_xcb_composite.c b/src/lib/ecore_x/xcb/ecore_xcb_composite.c
index bd6b4b8536..b614d3ca5d 100644
--- a/src/lib/ecore_x/xcb/ecore_xcb_composite.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_composite.c
@@ -62,7 +62,7 @@ _ecore_xcb_composite_finalize(void)
 
 /**
  * @defgroup Ecore_X_Composite_Group X Composite Extension Functions
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * Functions related to the X Composite Extension
  */
diff --git a/src/lib/ecore_x/xcb/ecore_xcb_damage.c b/src/lib/ecore_x/xcb/ecore_xcb_damage.c
index 9e3f02c68b..fdb7a2a6c6 100644
--- a/src/lib/ecore_x/xcb/ecore_xcb_damage.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_damage.c
@@ -54,7 +54,7 @@ _ecore_xcb_damage_finalize(void)
 
 /**
  * @defgroup Ecore_X_Damage_Group X Damage Extension Functions
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * Functions related to the X Damage Extension.
  */
diff --git a/src/lib/ecore_x/xcb/ecore_xcb_dpms.c b/src/lib/ecore_x/xcb/ecore_xcb_dpms.c
index 4be3820132..98dc7d3d8c 100644
--- a/src/lib/ecore_x/xcb/ecore_xcb_dpms.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_dpms.c
@@ -49,7 +49,7 @@ _ecore_xcb_dpms_finalize(void)
 
 /**
  * @defgroup Ecore_X_DPMS_Group X DPMS Extension Functions
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * Functions related to the X DPMS Extension
  */
diff --git a/src/lib/ecore_x/xcb/ecore_xcb_drawable.c b/src/lib/ecore_x/xcb/ecore_xcb_drawable.c
index f9b51c3475..30bb880449 100644
--- a/src/lib/ecore_x/xcb/ecore_xcb_drawable.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_drawable.c
@@ -2,7 +2,7 @@
 
 /**
  * @defgroup Ecore_X_Drawable_Group X Drawable Functions
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * Functions that operate on drawables.
  */
diff --git a/src/lib/ecore_x/xcb/ecore_xcb_mwm.c b/src/lib/ecore_x/xcb/ecore_xcb_mwm.c
index 665ceb5efc..59ab579e58 100644
--- a/src/lib/ecore_x/xcb/ecore_xcb_mwm.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_mwm.c
@@ -17,7 +17,7 @@ typedef struct _mwmhints
 
 /**
  * @defgroup Ecore_X_MWM_Group MWM related functions.
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * Functions related to MWM.
  */
diff --git a/src/lib/ecore_x/xcb/ecore_xcb_pixmap.c b/src/lib/ecore_x/xcb/ecore_xcb_pixmap.c
index e17e537685..0c04a2aaf8 100644
--- a/src/lib/ecore_x/xcb/ecore_xcb_pixmap.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_pixmap.c
@@ -2,7 +2,7 @@
 
 /**
  * @defgroup Ecore_X_Pixmap_Group X Pixmap Functions
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * Functions that operate on pixmaps.
  */
diff --git a/src/lib/ecore_x/xcb/ecore_xcb_window.c b/src/lib/ecore_x/xcb/ecore_xcb_window.c
index 80f1c4716e..087c39182b 100644
--- a/src/lib/ecore_x/xcb/ecore_xcb_window.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_window.c
@@ -46,7 +46,7 @@ void *_ecore_xcb_window_grab_replay_data;
 
 /**
  * @defgroup Ecore_X_Window_Create_Group X Window Creation Functions
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * Functions that can be used to create an X window.
  */
@@ -312,7 +312,7 @@ ecore_x_window_override_argb_new(Ecore_X_Window parent,
 
 /**
  * @defgroup Ecore_X_Window_Destroy_Group X Window Destroy Functions
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * Functions to destroy X windows.
  */
@@ -443,7 +443,7 @@ ecore_x_window_configure(Ecore_X_Window                win,
 
 /**
  * @defgroup Ecore_X_Window_Geometry_Group X Window Geometry Functions
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * Functions that change or retrieve the geometry of X windows.
  */
@@ -588,7 +588,7 @@ ecore_x_window_border_width_set(Ecore_X_Window win,
 
 /**
  * @defgroup Ecore_X_Window_Z_Order_Group X Window Z Order Functions
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * Functions that change the Z order of X windows.
  */
@@ -644,7 +644,7 @@ ecore_x_window_depth_get(Ecore_X_Window win)
 
 /**
  * @defgroup Ecore_X_Window_Properties_Group X Window Property Functions
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * Functions that set window properties.
  */
@@ -684,7 +684,7 @@ ecore_x_window_defaults_set(Ecore_X_Window win)
 
 /**
  * @defgroup Ecore_X_Window_Visibility_Group X Window Visibility Functions
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * Functions to access and change the visibility of X windows.
  */
@@ -759,7 +759,7 @@ ecore_x_window_hide(Ecore_X_Window win)
 
 /**
  * @defgroup Ecore_X_Window_Focus_Functions X Window Focus Functions
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * Functions that give the focus to an X Window.
  */
@@ -803,7 +803,7 @@ ecore_x_window_focus_at_time(Ecore_X_Window win,
 
 /**
  * @defgroup Ecore_X_Window_Parent_Group X Window Parent Functions
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * Functions that retrieve or changes the parent window of a window.
  */
diff --git a/src/lib/ecore_x/xcb/ecore_xcb_window_shape.c b/src/lib/ecore_x/xcb/ecore_xcb_window_shape.c
index 4713656c59..667457abc7 100644
--- a/src/lib/ecore_x/xcb/ecore_xcb_window_shape.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_window_shape.c
@@ -5,7 +5,7 @@
 
 /**
  * @defgroup Ecore_X_Window_Shape X Window Shape Functions
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * These functions use the shape extension of the X server to change
  * shape of given windows.
diff --git a/src/lib/ecore_x/xcb/ecore_xcb_xfixes.c b/src/lib/ecore_x/xcb/ecore_xcb_xfixes.c
index 6c484f93f8..257c61763d 100644
--- a/src/lib/ecore_x/xcb/ecore_xcb_xfixes.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_xfixes.c
@@ -108,7 +108,7 @@ _ecore_xcb_xfixes_avail_get(void)
 
 /**
  * @defgroup Ecore_X_Fixes_Group X Fixes Extension Functions
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * Functions related to the X Fixes extension.
  */
diff --git a/src/lib/ecore_x/xlib/ecore_x_dpms.c b/src/lib/ecore_x/xlib/ecore_x_dpms.c
index cffe548878..beb914d863 100644
--- a/src/lib/ecore_x/xlib/ecore_x_dpms.c
+++ b/src/lib/ecore_x/xlib/ecore_x_dpms.c
@@ -27,7 +27,7 @@ _ecore_x_dpms_init(void)
 
 /**
  * @defgroup Ecore_X_DPMS_Group X DPMS Extension Functions
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * Functions related to the X DPMS extension.
  */
diff --git a/src/lib/ecore_x/xlib/ecore_x_drawable.c b/src/lib/ecore_x/xlib/ecore_x_drawable.c
index cc17772fbb..81815c4d7b 100644
--- a/src/lib/ecore_x/xlib/ecore_x_drawable.c
+++ b/src/lib/ecore_x/xlib/ecore_x_drawable.c
@@ -6,7 +6,7 @@
 
 /**
  * @defgroup Ecore_X_Drawable_Group X Drawable Functions
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * Functions that operate on drawables.
  */
diff --git a/src/lib/ecore_x/xlib/ecore_x_pixmap.c b/src/lib/ecore_x/xlib/ecore_x_pixmap.c
index e0c3563d6c..3b4ff63784 100644
--- a/src/lib/ecore_x/xlib/ecore_x_pixmap.c
+++ b/src/lib/ecore_x/xlib/ecore_x_pixmap.c
@@ -8,7 +8,7 @@
 
 /**
  * @defgroup Ecore_X_Pixmap_Group X Pixmap Functions
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * Functions that operate on pixmaps.
  */
diff --git a/src/lib/ecore_x/xlib/ecore_x_window.c b/src/lib/ecore_x/xlib/ecore_x_window.c
index 97e6a6f757..fbea732db8 100644
--- a/src/lib/ecore_x/xlib/ecore_x_window.c
+++ b/src/lib/ecore_x/xlib/ecore_x_window.c
@@ -16,7 +16,7 @@ static Ecore_X_Window *ignore_list = NULL;
 
 /**
  * @defgroup Ecore_X_Window_Create_Group X Window Creation Functions
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * Functions that can be used to create an X window.
  */
@@ -214,7 +214,7 @@ ecore_x_window_input_new(Ecore_X_Window parent,
 
 /**
  * @defgroup Ecore_X_Window_Properties_Group X Window Property Functions
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * Functions that set window properties.
  */
@@ -298,7 +298,7 @@ ecore_x_window_configure(Ecore_X_Window win,
 
 /**
  * @defgroup Ecore_X_Window_Destroy_Group X Window Destroy Functions
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * Functions to destroy X windows.
  */
@@ -422,7 +422,7 @@ ecore_x_window_delete_request_send(Ecore_X_Window win)
 
 /**
  * @defgroup Ecore_X_Window_Visibility_Group X Window Visibility Functions
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * Functions to access and change the visibility of X windows.
  */
@@ -488,7 +488,7 @@ ecore_x_window_hide(Ecore_X_Window win)
 
 /**
  * @defgroup Ecore_X_Window_Geometry_Group X Window Geometry Functions
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * Functions that change or retrieve the geometry of X windows.
  */
@@ -563,7 +563,7 @@ ecore_x_window_move_resize(Ecore_X_Window win,
 
 /**
  * @defgroup Ecore_X_Window_Focus_Functions X Window Focus Functions
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * Functions that give the focus to an X Window.
  */
@@ -621,7 +621,7 @@ ecore_x_window_focus_get(void)
 
 /**
  * @defgroup Ecore_X_Window_Z_Order_Group X Window Z Order Functions
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * Functions that change the Z order of X windows.
  */
@@ -652,7 +652,7 @@ ecore_x_window_lower(Ecore_X_Window win)
 
 /**
  * @defgroup Ecore_X_Window_Parent_Group X Window Parent Functions
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * Functions that retrieve or changes the parent window of a window.
  */
diff --git a/src/lib/ecore_x/xlib/ecore_x_window_shape.c b/src/lib/ecore_x/xlib/ecore_x_window_shape.c
index d7ee9a677e..df3e76b1d1 100644
--- a/src/lib/ecore_x/xlib/ecore_x_window_shape.c
+++ b/src/lib/ecore_x/xlib/ecore_x_window_shape.c
@@ -10,7 +10,7 @@
 
 /**
  * @defgroup Ecore_X_Window_Shape X Window Shape Functions
- * @ingroup Ecore
+ * @ingroup Ecore_X_Group
  *
  * These functions use the shape extension of the X server to change
  * shape of given windows.