Index: arch/amd64/include/arch.h
===================================================================
--- arch/amd64/include/arch.h	(revision 8abbcc9858b56f6fbc9af504791bd35090d5573d)
+++ arch/amd64/include/arch.h	(revision 7257021ee4100a27bb28568b8c5895e3d07d6cce)
@@ -27,6 +27,16 @@
  */
 
+ /** @addtogroup amd64	
+ * @{
+ */
+/** @file
+ */
+
 #ifndef __amd64_ARCH_H__
 #define __amd64_ARCH_H__
 
 #endif
+
+ /** @}
+ */
+
Index: arch/amd64/include/arg.h
===================================================================
--- arch/amd64/include/arg.h	(revision 8abbcc9858b56f6fbc9af504791bd35090d5573d)
+++ arch/amd64/include/arg.h	(revision 7257021ee4100a27bb28568b8c5895e3d07d6cce)
@@ -27,4 +27,10 @@
  */
 
+ /** @addtogroup amd64	
+ * @{
+ */
+/** @file
+ */
+
 #ifndef __amd64_ARG_H__
 #define __amd64_ARG_H__
@@ -33,2 +39,6 @@
 
 #endif
+
+ /** @}
+ */
+
Index: arch/amd64/include/asm.h
===================================================================
--- arch/amd64/include/asm.h	(revision 8abbcc9858b56f6fbc9af504791bd35090d5573d)
+++ arch/amd64/include/asm.h	(revision 7257021ee4100a27bb28568b8c5895e3d07d6cce)
@@ -27,4 +27,10 @@
  */
 
+ /** @addtogroup amd64	
+ * @{
+ */
+/** @file
+ */
+
 #ifndef __amd64_ASM_H__
 #define __amd64_ASM_H__
@@ -274,2 +280,6 @@
 
 #endif
+
+ /** @}
+ */
+
Index: arch/amd64/include/atomic.h
===================================================================
--- arch/amd64/include/atomic.h	(revision 8abbcc9858b56f6fbc9af504791bd35090d5573d)
+++ arch/amd64/include/atomic.h	(revision 7257021ee4100a27bb28568b8c5895e3d07d6cce)
@@ -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 amd64	
+ * @{
+ */
+/** @file
  */
 
@@ -119,2 +125,6 @@
 
 #endif
+
+ /** @}
+ */
+
Index: arch/amd64/include/boot/boot.h
===================================================================
--- arch/amd64/include/boot/boot.h	(revision 8abbcc9858b56f6fbc9af504791bd35090d5573d)
+++ arch/amd64/include/boot/boot.h	(revision 7257021ee4100a27bb28568b8c5895e3d07d6cce)
@@ -27,4 +27,10 @@
  */
 
+ /** @addtogroup amd64	
+ * @{
+ */
+/** @file
+ */
+
 #ifndef __amd64_BOOT_H__
 #define __amd64_BOOT_H__
@@ -40,2 +46,6 @@
 
 #endif
+
+ /** @}
+ */
+
Index: arch/amd64/include/byteorder.h
===================================================================
--- arch/amd64/include/byteorder.h	(revision 8abbcc9858b56f6fbc9af504791bd35090d5573d)
+++ arch/amd64/include/byteorder.h	(revision 7257021ee4100a27bb28568b8c5895e3d07d6cce)
@@ -27,4 +27,10 @@
  */
 
+ /** @addtogroup amd64	
+ * @{
+ */
+/** @file
+ */
+
 #ifndef __amd64_BYTEORDER_H__
 #define __amd64_BYTEORDER_H__
@@ -35,2 +41,6 @@
 
 #endif
+
+ /** @}
+ */
+
Index: arch/amd64/include/context.h
===================================================================
--- arch/amd64/include/context.h	(revision 8abbcc9858b56f6fbc9af504791bd35090d5573d)
+++ arch/amd64/include/context.h	(revision 7257021ee4100a27bb28568b8c5895e3d07d6cce)
@@ -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 amd64	
+ * @{
+ */
+/** @file
  */
 
@@ -60,2 +66,6 @@
 
 #endif
+
+ /** @}
+ */
+
Index: arch/amd64/include/context_offset.h
===================================================================
--- arch/amd64/include/context_offset.h	(revision 8abbcc9858b56f6fbc9af504791bd35090d5573d)
+++ arch/amd64/include/context_offset.h	(revision 7257021ee4100a27bb28568b8c5895e3d07d6cce)
@@ -9,2 +9,6 @@
 #define OFFSET_R15 0x38
 #define OFFSET_IPL 0x40
+
+ /** @}
+ */
+
Index: arch/amd64/include/cpu.h
===================================================================
--- arch/amd64/include/cpu.h	(revision 8abbcc9858b56f6fbc9af504791bd35090d5573d)
+++ arch/amd64/include/cpu.h	(revision 7257021ee4100a27bb28568b8c5895e3d07d6cce)
@@ -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 amd64cpu
+ * @{
+ */
+/** @file
  */
 
@@ -77,2 +83,6 @@
 
 #endif
+
+ /** @}
+ */
+
Index: arch/amd64/include/cpuid.h
===================================================================
--- arch/amd64/include/cpuid.h	(revision 8abbcc9858b56f6fbc9af504791bd35090d5573d)
+++ arch/amd64/include/cpuid.h	(revision 7257021ee4100a27bb28568b8c5895e3d07d6cce)
@@ -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 amd64cpu
+ * @{
+ */
+/** @file
  */
 
@@ -57,2 +63,6 @@
 #endif /* __ASM__ */
 #endif
+
+ /** @}
+ */
+
Index: arch/amd64/include/ddi/ddi.h
===================================================================
--- arch/amd64/include/ddi/ddi.h	(revision 8abbcc9858b56f6fbc9af504791bd35090d5573d)
+++ arch/amd64/include/ddi/ddi.h	(revision 7257021ee4100a27bb28568b8c5895e3d07d6cce)
@@ -27,6 +27,10 @@
  */
 
+ /** @addtogroup amd64ddi
+ * @{
+ */
+
 /**
- * @file	ddi.h
+ * @file
  * @brief	amd64 specific DDI declarations and macros.
  */
@@ -38,2 +42,6 @@
 
 #endif
+
+ /** @}
+ */
+
Index: arch/amd64/include/debugger.h
===================================================================
--- arch/amd64/include/debugger.h	(revision 8abbcc9858b56f6fbc9af504791bd35090d5573d)
+++ arch/amd64/include/debugger.h	(revision 7257021ee4100a27bb28568b8c5895e3d07d6cce)
@@ -27,4 +27,10 @@
  */
 
+ /** @addtogroup amd64debug
+ * @{
+ */
+/** @file
+ */
+
 #ifndef __amd64_DEBUGGER_H__
 #define __amd64_DEBUGGER_H__
@@ -47,2 +53,6 @@
 
 #endif
+
+ /** @}
+ */
+
Index: arch/amd64/include/drivers/vesa.h
===================================================================
--- arch/amd64/include/drivers/vesa.h	(revision 8abbcc9858b56f6fbc9af504791bd35090d5573d)
+++ arch/amd64/include/drivers/vesa.h	(revision 7257021ee4100a27bb28568b8c5895e3d07d6cce)
@@ -27,4 +27,10 @@
  */
 
+ /** @addtogroup amd64	
+ * @{
+ */
+/** @file
+ */
+
 #ifndef __VESA_H__
 #define __VESA_H__
@@ -36,2 +42,6 @@
 
 #endif
+
+ /** @}
+ */
+
Index: arch/amd64/include/elf.h
===================================================================
--- arch/amd64/include/elf.h	(revision 8abbcc9858b56f6fbc9af504791bd35090d5573d)
+++ arch/amd64/include/elf.h	(revision 7257021ee4100a27bb28568b8c5895e3d07d6cce)
@@ -27,4 +27,10 @@
  */
 
+ /** @addtogroup amd64	
+ * @{
+ */
+/** @file
+ */
+
 #ifndef __amd64_ELF_H__
 #define __amd64_ELF_H__
@@ -35,2 +41,6 @@
 
 #endif
+
+ /** @}
+ */
+
Index: arch/amd64/include/faddr.h
===================================================================
--- arch/amd64/include/faddr.h	(revision 8abbcc9858b56f6fbc9af504791bd35090d5573d)
+++ arch/amd64/include/faddr.h	(revision 7257021ee4100a27bb28568b8c5895e3d07d6cce)
@@ -27,4 +27,10 @@
  */
 
+ /** @addtogroup amd64	
+ * @{
+ */
+/** @file
+ */
+
 #ifndef __amd64_FADDR_H__
 #define __amd64_FADDR_H__
@@ -35,2 +41,6 @@
 
 #endif
+
+ /** @}
+ */
+
Index: arch/amd64/include/interrupt.h
===================================================================
--- arch/amd64/include/interrupt.h	(revision 8abbcc9858b56f6fbc9af504791bd35090d5573d)
+++ arch/amd64/include/interrupt.h	(revision 7257021ee4100a27bb28568b8c5895e3d07d6cce)
@@ -25,4 +25,11 @@
  * (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 amd64interrupt amd64
+ * @ingroup interrupt
+ * @{
+ */
+/** @file
  */
 
@@ -122,2 +129,6 @@
 
 #endif
+
+ /** @}
+ */
+
Index: arch/amd64/include/memstr.h
===================================================================
--- arch/amd64/include/memstr.h	(revision 8abbcc9858b56f6fbc9af504791bd35090d5573d)
+++ arch/amd64/include/memstr.h	(revision 7257021ee4100a27bb28568b8c5895e3d07d6cce)
@@ -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 amd64	
+ * @{
+ */
+/** @file
  */
 
@@ -135,2 +141,6 @@
 
 #endif
+
+ /** @}
+ */
+
Index: arch/amd64/include/mm/as.h
===================================================================
--- arch/amd64/include/mm/as.h	(revision 8abbcc9858b56f6fbc9af504791bd35090d5573d)
+++ arch/amd64/include/mm/as.h	(revision 7257021ee4100a27bb28568b8c5895e3d07d6cce)
@@ -27,4 +27,10 @@
  */
 
+ /** @addtogroup amd64mm	
+ * @{
+ */
+/** @file
+ */
+
 #ifndef __amd64_AS_H__
 #define __amd64_AS_H__
@@ -44,2 +50,6 @@
 
 #endif
+
+ /** @}
+ */
+
Index: arch/amd64/include/mm/frame.h
===================================================================
--- arch/amd64/include/mm/frame.h	(revision 8abbcc9858b56f6fbc9af504791bd35090d5573d)
+++ arch/amd64/include/mm/frame.h	(revision 7257021ee4100a27bb28568b8c5895e3d07d6cce)
@@ -27,4 +27,10 @@
  */
 
+ /** @addtogroup amd64mm	
+ * @{
+ */
+/** @file
+ */
+
 #ifndef __amd64_FRAME_H__
 #define __amd64_FRAME_H__
@@ -44,2 +50,6 @@
 
 #endif
+
+ /** @}
+ */
+
Index: arch/amd64/include/mm/page.h
===================================================================
--- arch/amd64/include/mm/page.h	(revision 8abbcc9858b56f6fbc9af504791bd35090d5573d)
+++ arch/amd64/include/mm/page.h	(revision 7257021ee4100a27bb28568b8c5895e3d07d6cce)
@@ -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 amd64mm	
+ * @{
+ */
+/** @file
  */
 
@@ -191,2 +197,6 @@
 
 #endif
+
+ /** @}
+ */
+
Index: arch/amd64/include/mm/ptl.h
===================================================================
--- arch/amd64/include/mm/ptl.h	(revision 8abbcc9858b56f6fbc9af504791bd35090d5573d)
+++ arch/amd64/include/mm/ptl.h	(revision 7257021ee4100a27bb28568b8c5895e3d07d6cce)
@@ -27,4 +27,10 @@
  */
 
+ /** @addtogroup amd64mm	
+ * @{
+ */
+/** @file
+ */
+
 
 #ifndef __amd64_PTL_H_
@@ -42,2 +48,6 @@
 
 #endif
+
+ /** @}
+ */
+
Index: arch/amd64/include/mm/tlb.h
===================================================================
--- arch/amd64/include/mm/tlb.h	(revision 8abbcc9858b56f6fbc9af504791bd35090d5573d)
+++ arch/amd64/include/mm/tlb.h	(revision 7257021ee4100a27bb28568b8c5895e3d07d6cce)
@@ -27,4 +27,10 @@
  */
 
+ /** @addtogroup amd64mm	
+ * @{
+ */
+/** @file
+ */
+
 #ifndef __amd64_TLB_H__
 #define __amd64_TLB_H__
@@ -34,2 +40,6 @@
 
 #endif
+
+ /** @}
+ */
+
Index: arch/amd64/include/pm.h
===================================================================
--- arch/amd64/include/pm.h	(revision 8abbcc9858b56f6fbc9af504791bd35090d5573d)
+++ arch/amd64/include/pm.h	(revision 7257021ee4100a27bb28568b8c5895e3d07d6cce)
@@ -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 amd64	
+ * @{
+ */
+/** @file
  */
 
@@ -188,2 +194,6 @@
 
 #endif
+
+ /** @}
+ */
+
Index: arch/amd64/include/proc/task.h
===================================================================
--- arch/amd64/include/proc/task.h	(revision 8abbcc9858b56f6fbc9af504791bd35090d5573d)
+++ arch/amd64/include/proc/task.h	(revision 7257021ee4100a27bb28568b8c5895e3d07d6cce)
@@ -27,4 +27,10 @@
  */
 
+ /** @addtogroup amd64proc
+ * @{
+ */
+/** @file
+ */
+
 #ifndef __amd64_TASK_H__
 #define __amd64_TASK_H__
@@ -40,2 +46,6 @@
 
 #endif
+
+ /** @}
+ */
+
Index: arch/amd64/include/proc/thread.h
===================================================================
--- arch/amd64/include/proc/thread.h	(revision 8abbcc9858b56f6fbc9af504791bd35090d5573d)
+++ arch/amd64/include/proc/thread.h	(revision 7257021ee4100a27bb28568b8c5895e3d07d6cce)
@@ -27,4 +27,10 @@
  */
 
+ /** @addtogroup amd64proc
+ * @{
+ */
+/** @file
+ */
+
 #ifndef __amd64_THREAD_H__
 #define __amd64_THREAD_H__
@@ -37,2 +43,6 @@
 
 #endif
+
+ /** @}
+ */
+
Index: arch/amd64/include/syscall.h
===================================================================
--- arch/amd64/include/syscall.h	(revision 8abbcc9858b56f6fbc9af504791bd35090d5573d)
+++ arch/amd64/include/syscall.h	(revision 7257021ee4100a27bb28568b8c5895e3d07d6cce)
@@ -27,4 +27,10 @@
  */
 
+ /** @addtogroup amd64
+ * @{
+ */
+/** @file
+ */
+
 #ifndef __amd64_SYSCALL_H__
 #define __amd64_SYSCALL_H__
@@ -35,2 +41,6 @@
 
 #endif
+
+ /** @}
+ */
+
Index: arch/amd64/include/types.h
===================================================================
--- arch/amd64/include/types.h	(revision 8abbcc9858b56f6fbc9af504791bd35090d5573d)
+++ arch/amd64/include/types.h	(revision 7257021ee4100a27bb28568b8c5895e3d07d6cce)
@@ -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 amd64	
+ * @{
+ */
+/** @file
  */
 
@@ -54,2 +60,6 @@
 
 #endif
+
+ /** @}
+ */
+
