Index: console/console.c
===================================================================
--- console/console.c	(revision 41269bd669f79d1564691a6402c89c83bb19b44c)
+++ console/console.c	(revision ce5bcb413a8c55593b5061d45b69514b22d9ff47)
@@ -26,4 +26,12 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+/** @defgroup console Console
+ * @brief	HelenOS console.
+ * @{ 
+ */
+/** @file
+ */
+
 /* TODO: remove */
 #include <stdio.h>
@@ -508,3 +516,6 @@
 	return 0;	
 }
-
+ 
+/** @}
+ */
+
Index: console/console.h
===================================================================
--- console/console.h	(revision 41269bd669f79d1564691a6402c89c83bb19b44c)
+++ console/console.h	(revision ce5bcb413a8c55593b5061d45b69514b22d9ff47)
@@ -27,4 +27,10 @@
  */
 
+/** @addtogroup console
+ * @{ 
+ */
+/** @file
+ */
+
 #ifndef __CONSOLE_H__
 #define __CONSOLE_H__
@@ -45,2 +51,6 @@
 #endif
 
+ 
+/** @}
+ */
+
Index: console/gcons.c
===================================================================
--- console/gcons.c	(revision 41269bd669f79d1564691a6402c89c83bb19b44c)
+++ console/gcons.c	(revision ce5bcb413a8c55593b5061d45b69514b22d9ff47)
@@ -27,4 +27,10 @@
  */
 
+/** @addtogroup console
+ * @{ 
+ */
+/** @file
+ */
+
 #include <ipc/fb.h>
 #include <ipc/ipc.h>
@@ -423,2 +429,6 @@
 	gcons_redraw_console();
 }
+ 
+/** @}
+ */
+
Index: console/gcons.h
===================================================================
--- console/gcons.h	(revision 41269bd669f79d1564691a6402c89c83bb19b44c)
+++ console/gcons.h	(revision ce5bcb413a8c55593b5061d45b69514b22d9ff47)
@@ -27,4 +27,10 @@
  */
 
+/** @addtogroup console
+ * @{ 
+ */
+/** @file
+ */
+
 #ifndef _GCONS_H_
 #define _GCONS_H_
@@ -38,2 +44,6 @@
 
 #endif
+ 
+/** @}
+ */
+
Index: console/screenbuffer.c
===================================================================
--- console/screenbuffer.c	(revision 41269bd669f79d1564691a6402c89c83bb19b44c)
+++ console/screenbuffer.c	(revision ce5bcb413a8c55593b5061d45b69514b22d9ff47)
@@ -25,4 +25,10 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup console
+ * @{ 
+ */
+/** @file
  */
 
@@ -134,2 +140,6 @@
 }
 
+ 
+/** @}
+ */
+
Index: console/screenbuffer.h
===================================================================
--- console/screenbuffer.h	(revision 41269bd669f79d1564691a6402c89c83bb19b44c)
+++ console/screenbuffer.h	(revision ce5bcb413a8c55593b5061d45b69514b22d9ff47)
@@ -25,4 +25,10 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup console
+ * @{ 
+ */
+/** @file
  */
 
@@ -58,5 +64,5 @@
 /** Returns keyfield for position on screen. Screenbuffer->buffer is cyclic buffer so we must couted in index of the topmost line.
  * @param scr	screenbuffer
- * @oaram x	position on screen
+ * @param x	position on screen
  * @param y	position on screen
  * @return	keyfield structure with character and its attributes on x,y
@@ -89,2 +95,6 @@
 #endif
 
+ 
+/** @}
+ */
+
Index: fb/ega.c
===================================================================
--- fb/ega.c	(revision 41269bd669f79d1564691a6402c89c83bb19b44c)
+++ fb/ega.c	(revision ce5bcb413a8c55593b5061d45b69514b22d9ff47)
@@ -26,4 +26,14 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+/** @defgroup egafb EGA framebuffer
+ * @brief	HelenOS EGA framebuffer.
+ * @ingroup fbs
+ * @{
+ */ 
+/** @file
+ */
+
+
 #include <stdlib.h>
 #include <unistd.h>
@@ -353,2 +363,6 @@
 }
 
+
+/** 
+ * @}
+ */
Index: fb/ega.h
===================================================================
--- fb/ega.h	(revision 41269bd669f79d1564691a6402c89c83bb19b44c)
+++ fb/ega.h	(revision ce5bcb413a8c55593b5061d45b69514b22d9ff47)
@@ -27,4 +27,12 @@
  */
 
+/** @addtogroup egafb
+ * @brief	HelenOS EGA framebuffer.
+ * @ingroup fbs
+ * @{
+ */ 
+/** @file
+ */
+
 #ifndef _EGA_H_
 #define _EGA_H_
@@ -33,2 +41,6 @@
 
 #endif
+
+/** @}
+ */
+
Index: fb/fb.c
===================================================================
--- fb/fb.c	(revision 41269bd669f79d1564691a6402c89c83bb19b44c)
+++ fb/fb.c	(revision ce5bcb413a8c55593b5061d45b69514b22d9ff47)
@@ -27,4 +27,18 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+/** @defgroup fbs Framebuffers
+ * @brief	HelenOS framebuffers.
+ * @{ 
+ * @}
+ */
+/** @defgroup fb Framebuffer
+ * @brief	HelenOS framebuffer.
+ * @ingroup fbs
+ * @{
+ */ 
+/** @file
+ */
+
 
 #include <stdlib.h>
@@ -1055,2 +1069,6 @@
 }
 
+
+/** 
+ * @}
+ */
Index: fb/fb.h
===================================================================
--- fb/fb.h	(revision 41269bd669f79d1564691a6402c89c83bb19b44c)
+++ fb/fb.h	(revision ce5bcb413a8c55593b5061d45b69514b22d9ff47)
@@ -27,4 +27,11 @@
  */
 
+/** @addtogroup fb
+ * @ingroup fbs
+ * @{
+ */ 
+/** @file
+ */
+
 #ifndef _FB_H_
 #define _FB_H_
@@ -33,2 +40,6 @@
 
 #endif
+
+/** @}
+ */
+
Index: fb/sysio.c
===================================================================
--- fb/sysio.c	(revision 41269bd669f79d1564691a6402c89c83bb19b44c)
+++ fb/sysio.c	(revision ce5bcb413a8c55593b5061d45b69514b22d9ff47)
@@ -25,4 +25,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @defgroup sysio SysIO 
+ * @brief	HelenOS framebuffer emulation via kernel.
+ * @ingroup fbs
+ * @{
+ */ 
+/** @file
  */
 
@@ -183,2 +191,7 @@
 	sysputs("\033[0;25r");
 }
+
+/**
+ * @}
+ */ 
+
Index: fb/sysio.h
===================================================================
--- fb/sysio.h	(revision 41269bd669f79d1564691a6402c89c83bb19b44c)
+++ fb/sysio.h	(revision ce5bcb413a8c55593b5061d45b69514b22d9ff47)
@@ -27,4 +27,12 @@
  */
 
+/** @addtogroup sysio
+ * @brief	HelenOS framebuffer emulation via kernel.
+ * @ingroup fbs
+ * @{
+ */ 
+/** @file
+ */
+
 #ifndef _SYSIO_H_
 #define _SYSIO_H_
@@ -33,2 +41,6 @@
 
 #endif
+
+/** @}
+ */
+
Index: kbd/arch/ia32/include/kbd.h
===================================================================
--- kbd/arch/ia32/include/kbd.h	(revision 41269bd669f79d1564691a6402c89c83bb19b44c)
+++ kbd/arch/ia32/include/kbd.h	(revision ce5bcb413a8c55593b5061d45b69514b22d9ff47)
@@ -27,4 +27,12 @@
  */
 
+/** @addtogroup kbdia32 ia32
+ * @brief	HelenOS ia32 arch dependent parts of uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */ 
+/** @file
+ */
+
 #ifndef __ia32_KBD_H__
 #define __ia32_KBD_H__
@@ -36,2 +44,7 @@
 
 #endif
+
+/**
+ * @}
+ */ 
+
Index: kbd/arch/ia32/src/kbd.c
===================================================================
--- kbd/arch/ia32/src/kbd.c	(revision 41269bd669f79d1564691a6402c89c83bb19b44c)
+++ kbd/arch/ia32/src/kbd.c	(revision ce5bcb413a8c55593b5061d45b69514b22d9ff47)
@@ -26,4 +26,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup kbdia32 ia32
+ * @brief	HelenOS ia32 arch dependent parts of uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */ 
+/** @file
  */
 
@@ -364,2 +372,7 @@
 	return 	1;
 }
+
+/**
+ * @}
+ */ 
+
Index: kbd/arch/ia64/include/kbd.h
===================================================================
--- kbd/arch/ia64/include/kbd.h	(revision 41269bd669f79d1564691a6402c89c83bb19b44c)
+++ kbd/arch/ia64/include/kbd.h	(revision ce5bcb413a8c55593b5061d45b69514b22d9ff47)
@@ -27,4 +27,13 @@
  */
 
+/** @addtogroup kbdia64 ia64
+ * @brief	HelenOS ia64 arch dependent parts of uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */ 
+/** @file
+ */
+
+
 #ifndef __ia64_KBD_H__
 #define __ia64_KBD_H__
@@ -37,2 +46,5 @@
 #endif
 
+/**
+ * @}
+ */ 
Index: kbd/arch/ia64/src/kbd.c
===================================================================
--- kbd/arch/ia64/src/kbd.c	(revision 41269bd669f79d1564691a6402c89c83bb19b44c)
+++ kbd/arch/ia64/src/kbd.c	(revision ce5bcb413a8c55593b5061d45b69514b22d9ff47)
@@ -25,4 +25,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup kbdia64 ia64
+ * @brief	HelenOS ia64 arch dependent parts of uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */ 
+/** @file
  */
 
@@ -156,2 +164,6 @@
 	return 	1;
 }
+
+/**
+ * @}
+ */ 
Index: kbd/arch/mips32/include/kbd.h
===================================================================
--- kbd/arch/mips32/include/kbd.h	(revision 41269bd669f79d1564691a6402c89c83bb19b44c)
+++ kbd/arch/mips32/include/kbd.h	(revision ce5bcb413a8c55593b5061d45b69514b22d9ff47)
@@ -27,4 +27,12 @@
  */
 
+/** @addtogroup kbdmips32 mips32
+ * @brief	HelenOS mips32 arch dependent parts of uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */ 
+/** @file
+ */
+
 #ifndef __mips32_KBD_H__
 #define __mips32_KBD_H__
@@ -37,2 +45,5 @@
 #endif
 
+/**
+ * @}
+ */ 
Index: kbd/arch/mips32/src/kbd.c
===================================================================
--- kbd/arch/mips32/src/kbd.c	(revision 41269bd669f79d1564691a6402c89c83bb19b44c)
+++ kbd/arch/mips32/src/kbd.c	(revision ce5bcb413a8c55593b5061d45b69514b22d9ff47)
@@ -27,4 +27,11 @@
  */
 
+/** @addtogroup kbdmips32 mips32
+ * @brief	HelenOS mips32 arch dependent parts of uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */ 
+/** @file
+ */
 #include <arch/kbd.h>
 #include <ipc/ipc.h>
@@ -388,2 +395,5 @@
 }
 
+/**
+ * @}
+ */ 
Index: kbd/arch/ppc32/include/kbd.h
===================================================================
--- kbd/arch/ppc32/include/kbd.h	(revision 41269bd669f79d1564691a6402c89c83bb19b44c)
+++ kbd/arch/ppc32/include/kbd.h	(revision ce5bcb413a8c55593b5061d45b69514b22d9ff47)
@@ -27,4 +27,12 @@
  */
 
+/** @addtogroup kbdppc32 ppc32
+ * @brief	HelenOS ppc32 arch dependent parts of uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */ 
+/** @file
+ */
+
 #ifndef __ppc32_KBD_H__
 #define __ppc32_KBD_H__
@@ -36,2 +44,6 @@
 
 #endif
+
+/** @}
+ */
+
Index: kbd/arch/ppc32/src/kbd.c
===================================================================
--- kbd/arch/ppc32/src/kbd.c	(revision 41269bd669f79d1564691a6402c89c83bb19b44c)
+++ kbd/arch/ppc32/src/kbd.c	(revision ce5bcb413a8c55593b5061d45b69514b22d9ff47)
@@ -25,4 +25,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup kbdppc32 ppc32
+ * @brief	HelenOS ppc32 arch dependent parts of uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */ 
+/** @file
  */
 
@@ -193,2 +201,6 @@
 	return 1;
 }
+
+/** @}
+ */
+
Index: kbd/generic/kbd.c
===================================================================
--- kbd/generic/kbd.c	(revision 41269bd669f79d1564691a6402c89c83bb19b44c)
+++ kbd/generic/kbd.c	(revision ce5bcb413a8c55593b5061d45b69514b22d9ff47)
@@ -25,4 +25,17 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @defgroup kbd Keyboard handler
+ * @brief	HelenOS uspace keyboard handler.
+ * @{ 
+ * @}
+ */
+/** @addtogroup kbdgen generic
+ * @brief	HelenOS generic uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */ 
+/** @file
  */
 
@@ -128,2 +141,7 @@
 
 }
+
+/**
+ * @}
+ */ 
+
Index: kbd/generic/key_buffer.c
===================================================================
--- kbd/generic/key_buffer.c	(revision 41269bd669f79d1564691a6402c89c83bb19b44c)
+++ kbd/generic/key_buffer.c	(revision ce5bcb413a8c55593b5061d45b69514b22d9ff47)
@@ -27,4 +27,11 @@
  */
 
+/** @addtogroup kbdgen
+ * @brief	HelenOS generic uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */ 
+/** @file
+ */
 #include <key_buffer.h>
 #include <futex.h>
@@ -102,3 +109,6 @@
 }
 
+/**
+ * @}
+ */ 
 
Index: kbd/include/kbd.h
===================================================================
--- kbd/include/kbd.h	(revision 41269bd669f79d1564691a6402c89c83bb19b44c)
+++ kbd/include/kbd.h	(revision ce5bcb413a8c55593b5061d45b69514b22d9ff47)
@@ -27,4 +27,12 @@
  */
 
+/** @addtogroup kbdgen generic
+ * @brief	HelenOS generic uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */ 
+/** @file
+ */
+
 #ifndef __KBD_H__
 #define __KBD_H__
@@ -47,2 +55,6 @@
 #endif
 
+/**
+ * @}
+ */ 
+
Index: kbd/include/key_buffer.h
===================================================================
--- kbd/include/key_buffer.h	(revision 41269bd669f79d1564691a6402c89c83bb19b44c)
+++ kbd/include/key_buffer.h	(revision ce5bcb413a8c55593b5061d45b69514b22d9ff47)
@@ -27,4 +27,12 @@
  */
 
+/** @addtogroup kbdgen
+ * @brief	HelenOS generic uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */ 
+/** @file
+ */
+
 #ifndef __KEY_BUFFER_H__
 #define __KEY_BUFFER_H__
@@ -51,2 +59,6 @@
 #endif
 
+/**
+ * @}
+ */ 
+
Index: ns/ns.c
===================================================================
--- ns/ns.c	(revision 41269bd669f79d1564691a6402c89c83bb19b44c)
+++ ns/ns.c	(revision ce5bcb413a8c55593b5061d45b69514b22d9ff47)
@@ -27,8 +27,14 @@
  */
 
+/** @defgroup ns Naming Service
+ * @brief	Naming service for HelenOS IPC.
+ * @{
+ */ 
+
 /**
  * @file	ns.c
  * @brief	Naming service for HelenOS IPC.
  */
+
 
 #include <ipc/ipc.h>
@@ -252,2 +258,5 @@
 	free(hash_table_get_instance(item, hashed_service_t, link));
 }
+/** 
+ * @}
+ */