diff --git a/src/Doxyfile b/src/Doxyfile
new file mode 100644
index 00000000..8fc9c1b2
--- /dev/null
+++ b/src/Doxyfile
@@ -0,0 +1,275 @@
+# Doxyfile 1.5.2
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+DOXYFILE_ENCODING      = UTF-8
+PROJECT_NAME           = ELinks
+PROJECT_NUMBER         = 0.13.GIT
+OUTPUT_DIRECTORY       = ../doc/api
+CREATE_SUBDIRS         = NO
+OUTPUT_LANGUAGE        = English
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = YES
+STRIP_FROM_PATH        = .
+STRIP_FROM_INC_PATH    = 
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = YES
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP         = NO
+INHERIT_DOCS           = YES
+SEPARATE_MEMBER_PAGES  = NO
+TAB_SIZE               = 3
+ALIASES                = 
+OPTIMIZE_OUTPUT_FOR_C  = YES
+OPTIMIZE_OUTPUT_JAVA   = NO
+BUILTIN_STL_SUPPORT    = NO
+CPP_CLI_SUPPORT        = NO
+DISTRIBUTE_GROUP_DOC   = NO
+SUBGROUPING            = YES
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = YES
+EXTRACT_STATIC         = YES
+EXTRACT_LOCAL_CLASSES  = YES
+EXTRACT_LOCAL_METHODS  = YES
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = NO
+CASE_SENSE_NAMES       = NO
+HIDE_SCOPE_NAMES       = NO
+SHOW_INCLUDE_FILES     = YES
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+SORT_BRIEF_DOCS        = NO
+SORT_BY_SCOPE_NAME     = NO
+GENERATE_TODOLIST      = YES
+GENERATE_TESTLIST      = YES
+GENERATE_BUGLIST       = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS       = 
+MAX_INITIALIZER_LINES  = 30
+SHOW_USED_FILES        = YES
+SHOW_DIRECTORIES       = NO
+FILE_VERSION_FILTER    = 
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+QUIET                  = NO
+WARNINGS               = YES
+WARN_IF_UNDOCUMENTED   = YES
+WARN_IF_DOC_ERROR      = YES
+WARN_NO_PARAMDOC       = NO
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+INPUT                  = .
+INPUT_ENCODING         = UTF-8
+FILE_PATTERNS          = *.c \
+                         *.h \
+                         *.inc
+RECURSIVE              = YES
+EXCLUDE                = 
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       = 
+EXCLUDE_SYMBOLS        = 
+EXAMPLE_PATH           = 
+EXAMPLE_PATTERNS       = *
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             = 
+INPUT_FILTER           = 
+FILTER_PATTERNS        = 
+FILTER_SOURCE_FILES    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+SOURCE_BROWSER         = NO
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = NO
+REFERENCES_RELATION    = NO
+REFERENCES_LINK_SOURCE = NO
+USE_HTAGS              = NO
+VERBATIM_HEADERS       = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+ALPHABETICAL_INDEX     = NO
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+GENERATE_HTML          = YES
+HTML_OUTPUT            = html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            = 
+HTML_FOOTER            = 
+HTML_STYLESHEET        = 
+HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = NO
+CHM_FILE               = 
+HHC_LOCATION           = 
+GENERATE_CHI           = NO
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+DISABLE_INDEX          = NO
+ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = NO
+TREEVIEW_WIDTH         = 250
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+GENERATE_LATEX         = NO
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         = latex
+MAKEINDEX_CMD_NAME     = makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4wide
+EXTRA_PACKAGES         = 
+LATEX_HEADER           = 
+PDF_HYPERLINKS         = NO
+USE_PDFLATEX           = NO
+LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+GENERATE_RTF           = NO
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = NO
+RTF_HYPERLINKS         = NO
+RTF_STYLESHEET_FILE    = 
+RTF_EXTENSIONS_FILE    = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+GENERATE_XML           = NO
+XML_OUTPUT             = xml
+XML_SCHEMA             = 
+XML_DTD                = 
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = YES
+EXPAND_ONLY_PREDEF     = YES
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           = 
+INCLUDE_FILE_PATTERNS  = 
+PREDEFINED             = "LIST_OF(element_T)=element_T list" \
+                         CONFIG_DEBUG \
+                         CONFIG_UTF8 \
+                         HAVE_VARIADIC_MACROS
+EXPAND_AS_DEFINED      = 
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references   
+#---------------------------------------------------------------------------
+
+TAGFILES               = 
+GENERATE_TAGFILE       = 
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+
+CLASS_DIAGRAMS         = NO
+MSCGEN_PATH            = 
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = YES
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+GROUP_GRAPHS           = YES
+UML_LOOK               = NO
+TEMPLATE_RELATIONS     = NO
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = NO
+CALLER_GRAPH           = NO
+GRAPHICAL_HIERARCHY    = YES
+DIRECTORY_GRAPH        = YES
+DOT_IMAGE_FORMAT       = png
+DOT_PATH               = 
+DOTFILE_DIRS           = 
+DOT_GRAPH_MAX_NODES    = 50
+DOT_TRANSPARENT        = NO
+DOT_MULTI_TARGETS      = NO
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine   
+#---------------------------------------------------------------------------
+
+SEARCHENGINE           = NO
diff --git a/src/Makefile b/src/Makefile
index 87955058..c751ed26 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -45,7 +45,7 @@ elinks: $(LIB_O_NAME) vernum.o
 TAGS:
 	cd $(srcdir) \
 	&& find . \( -name "*.[ch]" -o -name "*.inc" \) -print \
-	| etags --regex='{c}/INIT_LIST_HEAD(\([[:alnum:]_]+\))/\1/' \
+	| etags --regex='{c}/INIT_LIST_OF([^,]*,[ \t]*\([[:alnum:]_]+\))/\1/' \
 		--regex='{c}/struct_hierbox_browser(\n[ \t]*\([[:alnum:]_]+\),/\1/m' \
 		--regex='{c}/^ACTION_(\([[:alnum:]_]+\),[^,]*,[ \t]*\([[:alnum:]_]+\),/ACT_\1_\2/' \
 		--language=c -
diff --git a/src/bfu/hierbox.h b/src/bfu/hierbox.h
index 513d0974..b3c9d1d2 100644
--- a/src/bfu/hierbox.h
+++ b/src/bfu/hierbox.h
@@ -21,8 +21,8 @@ struct hierbox_browser {
 	const struct hierbox_browser_button *buttons;
 	size_t buttons_size;
 
-	struct list_head boxes;
-	struct list_head dialogs;
+	LIST_OF(struct listbox_data) boxes;
+	LIST_OF(struct hierbox_dialog_list_item) dialogs;
 	struct listbox_item root;
 	const struct listbox_ops *ops;
 
diff --git a/src/bfu/inpfield.h b/src/bfu/inpfield.h
index 2829eb70..d45a9020 100644
--- a/src/bfu/inpfield.h
+++ b/src/bfu/inpfield.h
@@ -30,7 +30,7 @@ struct widget_info_field {
 struct widget_data_info_field {
 	int vpos;
 	int cpos;
-	struct list_head history;
+	LIST_OF(struct input_history_entry) history;
 	struct input_history_entry *cur_hist;
 };
 
diff --git a/src/bfu/inphist.c b/src/bfu/inphist.c
index b3b714ab..8c6d005c 100644
--- a/src/bfu/inphist.c
+++ b/src/bfu/inphist.c
@@ -58,7 +58,8 @@ menu_tab_compl(struct terminal *term, void *item_, void *dlg_data_)
 /* Complete to last unambiguous character, and display menu for all possible
  * further completions. */
 void
-do_tab_compl(struct dialog_data *dlg_data, struct list_head *history)
+do_tab_compl(struct dialog_data *dlg_data,
+	     LIST_OF(struct input_history_entry) *history)
 {
 	struct terminal *term = dlg_data->win->term;
 	struct widget_data *widget_data = selected_widget(dlg_data);
@@ -104,7 +105,8 @@ strcommonlen(unsigned char *a, unsigned char *b)
  * completes `go' to `google.com' and `google.com/' to `google.com/search?q='.
  */
 void
-do_tab_compl_unambiguous(struct dialog_data *dlg_data, struct list_head *history)
+do_tab_compl_unambiguous(struct dialog_data *dlg_data,
+			 LIST_OF(struct input_history_entry) *history)
 {
 	struct string completion;
 	struct widget_data *widget_data = selected_widget(dlg_data);
@@ -188,7 +190,8 @@ tab_complete_file_menu(struct terminal *term, void *path_, void *dlg_data_)
 }
 
 void
-do_tab_compl_file(struct dialog_data *dlg_data, struct list_head *history)
+do_tab_compl_file(struct dialog_data *dlg_data,
+		  LIST_OF(struct input_history_entry) *history)
 {
 	struct widget_data *widget_data = selected_widget(dlg_data);
 
diff --git a/src/bfu/inphist.h b/src/bfu/inphist.h
index 0011ef9d..d7a5ecf0 100644
--- a/src/bfu/inphist.h
+++ b/src/bfu/inphist.h
@@ -12,7 +12,7 @@ struct input_history_entry {
 };
 
 struct input_history {
-	struct list_head entries;
+	LIST_OF(struct input_history_entry) entries;
 	int size;
 	unsigned int dirty:1;
 	unsigned int nosave:1;
@@ -42,9 +42,12 @@ struct input_history {
 
 void add_to_input_history(struct input_history *, unsigned char *, int);
 
-void do_tab_compl(struct dialog_data *, struct list_head *);
-void do_tab_compl_file(struct dialog_data *, struct list_head *);
-void do_tab_compl_unambiguous(struct dialog_data *, struct list_head *);
+void do_tab_compl(struct dialog_data *,
+		  LIST_OF(struct input_history_entry) *);
+void do_tab_compl_file(struct dialog_data *,
+		       LIST_OF(struct input_history_entry) *);
+void do_tab_compl_unambiguous(struct dialog_data *,
+			      LIST_OF(struct input_history_entry) *);
 
 /* Load history file from elinks home. */
 int load_input_history(struct input_history *history, unsigned char *filename);
diff --git a/src/bfu/listbox.c b/src/bfu/listbox.c
index 0b56109a..7ec1b660 100644
--- a/src/bfu/listbox.c
+++ b/src/bfu/listbox.c
@@ -407,7 +407,7 @@ display_listbox_item(struct listbox_item *item, void *data_, int *offset)
 					str[1] = BORDER_SDLCORNER;
 				}
 			} else {
-				struct list_head *p = data->box->items;
+				LIST_OF(struct listbox_item) *p = data->box->items;
 
 				if (p->next == item) {
 					str[1] = BORDER_SULCORNER;
diff --git a/src/bfu/listbox.h b/src/bfu/listbox.h
index bca2a266..c3599e58 100644
--- a/src/bfu/listbox.h
+++ b/src/bfu/listbox.h
@@ -105,7 +105,7 @@ struct listbox_data {
 	struct listbox_item *top; /* Item which is on the top line of the box */
 
 	int sel_offset; /* Offset of selected item against the box top */
-	struct list_head *items; /* The list being displayed */
+	LIST_OF(struct listbox_item) *items; /* The list being displayed */
 };
 
 enum listbox_item_type {
@@ -119,7 +119,7 @@ struct listbox_item {
 	LIST_HEAD(struct listbox_item);
 
 	/* The list may be empty for leaf nodes or non-hiearchic listboxes */
-	struct list_head child;
+	LIST_OF(struct listbox_item) child;
 
 	enum listbox_item_type type;
 	int depth;
diff --git a/src/bookmarks/backend/common.c b/src/bookmarks/backend/common.c
index 0890bbd4..4d386cdd 100644
--- a/src/bookmarks/backend/common.c
+++ b/src/bookmarks/backend/common.c
@@ -74,7 +74,7 @@ bookmarks_read(void)
 }
 
 void
-bookmarks_write(struct list_head *bookmarks_list)
+bookmarks_write(LIST_OF(struct bookmark) *bookmarks_list)
 {
 	int backend_num = get_opt_int("bookmarks.file_format");
 	struct bookmarks_backend *backend = bookmarks_backends[backend_num];
diff --git a/src/bookmarks/backend/common.h b/src/bookmarks/backend/common.h
index 6dec16c7..f406aa3c 100644
--- a/src/bookmarks/backend/common.h
+++ b/src/bookmarks/backend/common.h
@@ -10,10 +10,10 @@ struct bookmarks_backend {
 	/* Order matters here. --Zas. */
 	unsigned char *(*filename)(int);
 	void (*read)(FILE *);
-	void (*write)(struct secure_save_info *, struct list_head *);
+	void (*write)(struct secure_save_info *, LIST_OF(struct bookmark) *);
 };
 
 void bookmarks_read(void);
-void bookmarks_write(struct list_head *);
+void bookmarks_write(LIST_OF(struct bookmark) *);
 
 #endif
diff --git a/src/bookmarks/backend/default.c b/src/bookmarks/backend/default.c
index f68d1c64..a098b7d3 100644
--- a/src/bookmarks/backend/default.c
+++ b/src/bookmarks/backend/default.c
@@ -128,7 +128,7 @@ read_bookmarks_default(FILE *f)
 /* Saves the bookmarks to file */
 static void
 write_bookmarks_default(struct secure_save_info *ssi,
-		        struct list_head *bookmarks_list)
+		        LIST_OF(struct bookmark) *bookmarks_list)
 {
 	int folder_state = get_opt_bool("bookmarks.folder_state");
 	struct bookmark *bm;
diff --git a/src/bookmarks/backend/xbel.c b/src/bookmarks/backend/xbel.c
index a7639290..d78a7684 100644
--- a/src/bookmarks/backend/xbel.c
+++ b/src/bookmarks/backend/xbel.c
@@ -58,16 +58,16 @@ static unsigned char * filename_bookmarks_xbel(int writing);
 static int xbeltree_to_bookmarks_list(struct tree_node *root,
 				      struct bookmark *current_parent);
 static void write_bookmarks_list(struct secure_save_info *ssi,
-				 struct list_head *bookmarks_list,
+				 LIST_OF(struct bookmark) *bookmarks_list,
 				 int n, int folder_state);
 static void write_bookmarks_xbel(struct secure_save_info *ssi,
-				 struct list_head *bookmarks_list);
+				 LIST_OF(struct bookmark) *bookmarks_list);
 
 /* Element */
 struct tree_node {
 	unsigned char *name;		/* Name of the element */
 	unsigned char *text;		/* Text inside the element */
-	struct list_head attrs;		/* {struct attributes} */
+	LIST_OF(struct attributes) attrs;
 	struct tree_node *parent;
 	struct tree_node *children;
 
@@ -134,7 +134,7 @@ read_bookmarks_xbel(FILE *f)
 
 static void
 write_bookmarks_xbel(struct secure_save_info *ssi,
-		     struct list_head *bookmarks_list)
+		     LIST_OF(struct bookmarks) *bookmarks_list)
 {
 	int folder_state = get_opt_bool("bookmarks.folder_state");
 	/* We check for readok in filename_bookmarks_xbel(). */
@@ -208,7 +208,7 @@ print_xml_entities(struct secure_save_info *ssi, const unsigned char *str)
 
 static void
 write_bookmarks_list(struct secure_save_info *ssi,
-		     struct list_head *bookmarks_list,
+		     LIST_OF(struct bookmark) *bookmarks_list,
 		     int n, int folder_state)
 {
 	struct bookmark *bm;
diff --git a/src/bookmarks/bookmarks.c b/src/bookmarks/bookmarks.c
index f9e9a45e..3439d901 100644
--- a/src/bookmarks/bookmarks.c
+++ b/src/bookmarks/bookmarks.c
@@ -32,7 +32,7 @@
 #include "util/string.h"
 
 /* The list of bookmarks */
-INIT_LIST_HEAD(bookmarks);
+INIT_LIST_OF(struct bookmark, bookmarks);
 
 /* Set to 1, if bookmarks have changed. */
 static int bookmarks_dirty = 0;
@@ -147,8 +147,8 @@ init_bookmarks(struct module *module)
 
 /* Clears the bookmark list */
 static void
-free_bookmarks(struct list_head *bookmarks_list,
-	       struct list_head *box_items)
+free_bookmarks(LIST_OF(struct bookmark) *bookmarks_list,
+	       LIST_OF(struct listbox_item) *box_items)
 {
 	struct bookmark *bm;
 
@@ -441,7 +441,7 @@ struct bookmark *
 get_bookmark_by_name(struct bookmark *folder, unsigned char *title)
 {
 	struct bookmark *bookmark;
-	struct list_head *lh;
+	LIST_OF(struct bookmark) *lh;
 
 	lh = folder ? &folder->child : &bookmarks;
 
diff --git a/src/bookmarks/bookmarks.h b/src/bookmarks/bookmarks.h
index 4c576aa7..84fcc73f 100644
--- a/src/bookmarks/bookmarks.h
+++ b/src/bookmarks/bookmarks.h
@@ -20,12 +20,12 @@ struct bookmark {
 	unsigned char *title;   /* title of bookmark */
 	unsigned char *url;     /* Location of bookmarked item */
 
-	struct list_head child;
+	LIST_OF(struct bookmark) child;
 };
 
 /* Bookmark lists */
 
-extern struct list_head bookmarks; /* struct bookmark */
+extern LIST_OF(struct bookmark) bookmarks;
 
 /* The bookmarks module */
 
diff --git a/src/bookmarks/dialogs.c b/src/bookmarks/dialogs.c
index 1b020dca..66211089 100644
--- a/src/bookmarks/dialogs.c
+++ b/src/bookmarks/dialogs.c
@@ -344,7 +344,7 @@ enum move_bookmark_flags {
  * _into_ dest or, if insert_as_child is 0, _after_ dest. */
 static enum move_bookmark_flags
 do_move_bookmark(struct bookmark *dest, int insert_as_child,
-		 struct list_head *src, struct listbox_data *box)
+		 LIST_OF(struct bookmark) *src, struct listbox_data *box)
 {
 	static int move_bookmark_event_id = EVENT_NONE;
 	struct bookmark *bm, *next;
diff --git a/src/cache/cache.c b/src/cache/cache.c
index dc746575..db9efe1e 100644
--- a/src/cache/cache.c
+++ b/src/cache/cache.c
@@ -24,7 +24,7 @@
 #include "util/time.h"
 
 /* The list of cache entries */
-static INIT_LIST_HEAD(cache_entries);
+static INIT_LIST_OF(struct cache_entry, cache_entries);
 
 static unsigned longlong cache_size;
 static int id_counter = 1;
diff --git a/src/cache/cache.h b/src/cache/cache.h
index 78180bce..8ee0ad6c 100644
--- a/src/cache/cache.h
+++ b/src/cache/cache.h
@@ -29,7 +29,7 @@ struct cache_entry {
 	/* Items in this list are ALLOCATED IN A NON-STANDARD WAY! Thus if you
 	 * are gonna mess with them (you shouldn't), you need to use the
 	 * mmap suite. */
-	struct list_head frag;		/* -> struct fragment */
+	LIST_OF(struct fragment) frag;
 
 	struct uri *uri;		/* Identifier for the cached data */
 	struct uri *proxy_uri;		/* Proxy identifier or same as @uri */
diff --git a/src/config/cmdline.c b/src/config/cmdline.c
index 179883ae..27eb83b8 100644
--- a/src/config/cmdline.c
+++ b/src/config/cmdline.c
@@ -45,7 +45,7 @@ static unsigned char *remote_url;
 
 static enum retval
 parse_options_(int argc, unsigned char *argv[], struct option *opt,
-               struct list_head *url_list)
+               LIST_OF(struct string_list_item) *url_list)
 {
 	while (argc) {
 		argv++, argc--;
@@ -116,7 +116,8 @@ unknown_option:
 }
 
 enum retval
-parse_options(int argc, unsigned char *argv[], struct list_head *url_list)
+parse_options(int argc, unsigned char *argv[],
+	      LIST_OF(struct string_list_item) *url_list)
 {
 	return parse_options_(argc, argv, cmdline_options, url_list);
 }
diff --git a/src/config/cmdline.h b/src/config/cmdline.h
index cb085353..4ed39042 100644
--- a/src/config/cmdline.h
+++ b/src/config/cmdline.h
@@ -4,6 +4,7 @@
 #include "main/main.h"
 #include "util/lists.h"
 
-enum retval parse_options(int, unsigned char *[], struct list_head *);
+enum retval parse_options(int, unsigned char *[],
+			  LIST_OF(struct string_list_item) *);
 
 #endif
diff --git a/src/config/dialogs.c b/src/config/dialogs.c
index 0203c874..6a11c63f 100644
--- a/src/config/dialogs.c
+++ b/src/config/dialogs.c
@@ -924,8 +924,6 @@ push_kbdbind_save_button(struct dialog_data *dlg_data,
 }
 
 
-static INIT_LIST_HEAD(keybinding_dialog_list);
-
 static const struct hierbox_browser_button keybinding_buttons[] = {
 	/* [gettext_accelerator_context(.keybinding_buttons)] */
 	{ N_("~Add"),            push_kbdbind_add_button,            0 },
diff --git a/src/config/kbdbind.c b/src/config/kbdbind.c
index 6a58773e..db597af6 100644
--- a/src/config/kbdbind.c
+++ b/src/config/kbdbind.c
@@ -27,7 +27,7 @@
 
 static struct action_list action_table[KEYMAP_MAX];
 static struct keymap keymap_table[KEYMAP_MAX];
-static struct list_head keymaps[KEYMAP_MAX]; /* struct keybinding */
+static LIST_OF(struct keybinding) keymaps[KEYMAP_MAX];
 
 static void add_default_keybindings(void);
 
@@ -318,12 +318,12 @@ get_keymap_name(enum keymap_id keymap_id)
 }
 
 
-struct key {
-	unsigned char *str;
-	int num;
+struct named_key {
+	const unsigned char *str;
+	term_event_key_T num;
 };
 
-static struct key key_table[] = {
+static const struct named_key key_table[] = {
 	{ "Enter",	KBD_ENTER },
 	{ "Space",	' ' },
 	{ "Backspace",	KBD_BS },
@@ -351,13 +351,13 @@ static struct key key_table[] = {
 	{ "F10",	KBD_F10 },
 	{ "F11",	KBD_F11 },
 	{ "F12",	KBD_F12 },
-	{ NULL, 0 }
+	{ NULL, KBD_UNDEF }
 };
 
 term_event_key_T
 read_key(const unsigned char *key_str)
 {
-	struct key *key;
+	const struct named_key *key;
 
 	if (key_str[0] && !key_str[1])
 		return key_str[0];
@@ -438,8 +438,8 @@ add_keystroke_to_string(struct string *str, struct term_event_keyboard *kbd,
                         int escape)
 {
 	unsigned char key_buffer[3] = "\\x";
-	unsigned char *key_string = NULL;
-	struct key *key;
+	const unsigned char *key_string = NULL;
+	const struct named_key *key;
 
 	if (kbd->key == KBD_UNDEF) return;
 
@@ -459,7 +459,7 @@ add_keystroke_to_string(struct string *str, struct term_event_keyboard *kbd,
 
 	if (!key_string) {
 		key_string = key_buffer + 1;
-		*key_string = (unsigned char) kbd->key;
+		key_buffer[1] = (unsigned char) kbd->key;
 		if (escape && strchr("'\"\\", kbd->key))
 			key_string--;
 	}
diff --git a/src/config/options.c b/src/config/options.c
index 43d22446..025c9def 100644
--- a/src/config/options.c
+++ b/src/config/options.c
@@ -52,7 +52,7 @@
  * (struct option *) instead. This applies to bookmarks, global history and
  * listbox items as well, though. --pasky */
 
-static INIT_LIST_HEAD(options_root_tree);
+static INIT_LIST_OF(struct option, options_root_tree);
 
 static struct option options_root = INIT_OPTION(
 	/* name: */	"",
@@ -68,7 +68,7 @@ struct option *config_options;
 struct option *cmdline_options;
 
 static void add_opt_rec(struct option *, unsigned char *, struct option *);
-static void free_options_tree(struct list_head *, int recursive);
+static void free_options_tree(LIST_OF(struct option) *, int recursive);
 
 #ifdef CONFIG_DEBUG
 /* Detect ending '.' (and some others) in options captions.
@@ -305,8 +305,8 @@ get_opt_(
 static void
 add_opt_sort(struct option *tree, struct option *option, int abi)
 {
-	struct list_head *cat = tree->value.tree;
-	struct list_head *bcat = &tree->box_item->child;
+	LIST_OF(struct option) *cat = tree->value.tree;
+	LIST_OF(struct listbox_item) *bcat = &tree->box_item->child;
 	struct option *pos;
 
 	/* The list is empty, just add it there. */
@@ -477,7 +477,7 @@ add_opt(struct option *tree, unsigned char *path, unsigned char *capt,
 				mem_free(option);
 				return NULL;
 			}
-			option->value.tree = (struct list_head *) value;
+			option->value.tree = (LIST_OF(struct option) *) value;
 			break;
 		case OPT_STRING:
 			if (!value) {
@@ -642,10 +642,10 @@ copy_option(struct option *template)
 	return option;
 }
 
-struct list_head *
+LIST_OF(struct option) *
 init_options_tree(void)
 {
-	struct list_head *ptr = mem_alloc(sizeof(*ptr));
+	LIST_OF(struct option) *ptr = mem_alloc(sizeof(*ptr));
 
 	if (ptr) init_list(*ptr);
 	return ptr;
@@ -700,7 +700,7 @@ init_options(void)
 }
 
 static void
-free_options_tree(struct list_head *tree, int recursive)
+free_options_tree(LIST_OF(struct option) *tree, int recursive)
 {
 	while (!list_empty(*tree))
 		delete_option_do(tree->next, recursive);
@@ -730,7 +730,7 @@ register_change_hooks(const struct change_hook_info *change_hooks)
 }
 
 void
-unmark_options_tree(struct list_head *tree)
+unmark_options_tree(LIST_OF(struct option) *tree)
 {
 	struct option *option;
 
@@ -742,7 +742,7 @@ unmark_options_tree(struct list_head *tree)
 }
 
 void
-watermark_deleted_options(struct list_head *tree)
+watermark_deleted_options(LIST_OF(struct option) *tree)
 {
 	struct option *option;
 
@@ -755,7 +755,7 @@ watermark_deleted_options(struct list_head *tree)
 }
 
 static int
-check_nonempty_tree(struct list_head *options)
+check_nonempty_tree(LIST_OF(struct option) *options)
 {
 	struct option *opt;
 
@@ -773,7 +773,8 @@ check_nonempty_tree(struct list_head *options)
 
 void
 smart_config_string(struct string *str, int print_comment, int i18n,
-		    struct list_head *options, unsigned char *path, int depth,
+		    LIST_OF(struct option) *options,
+		    unsigned char *path, int depth,
 		    void (*fn)(struct string *, struct option *,
 			       unsigned char *, int, int, int, int))
 {
@@ -917,7 +918,7 @@ change_hook_ui(struct session *ses, struct option *current, struct option *chang
 /* Bit 2 of show means we should always set visibility, otherwise we set it
  * only on templates. */
 static void
-update_visibility(struct list_head *tree, int show)
+update_visibility(LIST_OF(struct option) *tree, int show)
 {
 	struct option *opt;
 
diff --git a/src/config/options.h b/src/config/options.h
index 77e2a157..15d9d794 100644
--- a/src/config/options.h
+++ b/src/config/options.h
@@ -84,7 +84,7 @@ struct session; /* session/session.h */
 union option_value {
 	/* XXX: Keep first to make @options_root initialization possible. */
 	/* The OPT_TREE list_head is allocated. */
-	struct list_head *tree;
+	LIST_OF(struct option) *tree;
 
 	/* Used by OPT_BOOL, OPT_INT, OPT_CODEPAGE and OPT_LANGUAGE */
 	int number;
@@ -142,7 +142,7 @@ struct option {
 };
 
 #define INIT_OPTION(name, flags, type, min, max, value, desc, capt) \
-	{ NULL_LIST_HEAD, INIT_OBJECT("option"), name, flags, type, min, max, { (struct list_head *) (value) }, desc, capt }
+	{ NULL_LIST_HEAD, INIT_OBJECT("option"), name, flags, type, min, max, { (LIST_OF(struct option) *) (value) }, desc, capt }
 
 extern struct option *config_options;
 extern struct option *cmdline_options;
@@ -160,12 +160,14 @@ struct change_hook_info {
 extern void register_change_hooks(const struct change_hook_info *change_hooks);
 
 
-extern struct list_head *init_options_tree(void);
-extern void unmark_options_tree(struct list_head *);
-void watermark_deleted_options(struct list_head *);
+extern LIST_OF(struct option) *init_options_tree(void);
+extern void unmark_options_tree(LIST_OF(struct option) *);
+void watermark_deleted_options(LIST_OF(struct option) *);
 
-extern void smart_config_string(struct string *, int, int, struct list_head *, unsigned char *, int,
-				void (*)(struct string *, struct option *, unsigned char *, int, int, int, int));
+extern void smart_config_string(struct string *, int, int,
+				LIST_OF(struct option) *, unsigned char *, int,
+				void (*)(struct string *, struct option *,
+					 unsigned char *, int, int, int, int));
 
 extern struct option *copy_option(struct option *);
 extern void delete_option(struct option *);
diff --git a/src/config/opttypes.c b/src/config/opttypes.c
index bc29b225..3a5c8915 100644
--- a/src/config/opttypes.c
+++ b/src/config/opttypes.c
@@ -368,8 +368,8 @@ color_wr(struct option *opt, struct string *str)
 static void
 tree_dup(struct option *opt, struct option *template)
 {
-	struct list_head *new = init_options_tree();
-	struct list_head *tree = template->value.tree;
+	LIST_OF(struct option) *new = init_options_tree();
+	LIST_OF(struct option) *tree = template->value.tree;
 	struct option *option;
 
 	if (!new) return;
diff --git a/src/cookies/cookies.c b/src/cookies/cookies.c
index 30269df7..639e8a60 100644
--- a/src/cookies/cookies.c
+++ b/src/cookies/cookies.c
@@ -51,7 +51,7 @@
 
 static int cookies_nosave = 0;
 
-static INIT_LIST_HEAD(cookies);
+static INIT_LIST_OF(struct cookie, cookies);
 
 struct c_domain {
 	LIST_HEAD(struct c_domain);
@@ -64,11 +64,10 @@ struct c_domain {
  * struct c_domain.  No other data structures have pointers to these
  * objects.  Currently the domains remain in the list until
  * @done_cookies clears the whole list.  */
-static INIT_LIST_HEAD(c_domains);
+static INIT_LIST_OF(struct c_domain, c_domains);
 
-/* List of servers for which there are cookies.  Each element is a
- * struct cookie_server.  */
-static INIT_LIST_HEAD(cookie_servers);
+/* List of servers for which there are cookies.  */
+static INIT_LIST_OF(struct cookie_server, cookie_servers);
 
 /* Only @set_cookies_dirty may make this nonzero.  */
 static int cookies_dirty = 0;
@@ -908,7 +907,7 @@ init_cookies(struct module *module)
 /* Like @delete_cookie, this function does not set @cookies_dirty.
  * The caller must do that if appropriate.  */
 static void
-free_cookies_list(struct list_head *list)
+free_cookies_list(LIST_OF(struct cookie) *list)
 {
 	while (!list_empty(*list)) {
 		struct cookie *cookie = list->next;
diff --git a/src/cookies/dialogs.c b/src/cookies/dialogs.c
index f4df50c8..696cad59 100644
--- a/src/cookies/dialogs.c
+++ b/src/cookies/dialogs.c
@@ -25,7 +25,7 @@
 #include "util/string.h"
 
 
-INIT_LIST_HEAD(cookie_queries);
+INIT_LIST_OF(struct cookie, cookie_queries);
 
 static void
 add_cookie_info_to_string(struct string *string, struct cookie *cookie,
diff --git a/src/cookies/dialogs.h b/src/cookies/dialogs.h
index a7b6c214..8896d3f1 100644
--- a/src/cookies/dialogs.h
+++ b/src/cookies/dialogs.h
@@ -6,7 +6,7 @@
 #include "terminal/terminal.h"
 #include "util/lists.h"
 
-extern struct list_head cookie_queries;
+extern LIST_OF(struct cookie) cookie_queries;
 
 void accept_cookie_dialog(struct session *ses, void *data);
 extern struct hierbox_browser cookie_browser;
diff --git a/src/dialogs/menu.c b/src/dialogs/menu.c
index 172965ca..744a4b78 100644
--- a/src/dialogs/menu.c
+++ b/src/dialogs/menu.c
@@ -812,7 +812,7 @@ enum frame_event_status
 pass_uri_to_command(struct session *ses, struct document_view *doc_view,
 		    int which_type)
 {
-	struct list_head *tree = get_opt_tree("document.uri_passing");
+	LIST_OF(struct option) *tree = get_opt_tree("document.uri_passing");
 	enum pass_uri_type type = which_type;
 	struct menu_item *items;
 	struct option *option;
@@ -887,7 +887,7 @@ void
 add_uri_command_to_menu(struct menu_item **mi, enum pass_uri_type type,
 			unsigned char *text)
 {
-	struct list_head *tree = get_opt_tree("document.uri_passing");
+	LIST_OF(struct option) *tree = get_opt_tree("document.uri_passing");
 	struct option *option;
 	int commands = 0;
 	enum menu_item_flags flags = NO_FLAG;
diff --git a/src/document/css/apply.c b/src/document/css/apply.c
index 05072d12..703eea8f 100644
--- a/src/document/css/apply.c
+++ b/src/document/css/apply.c
@@ -1,4 +1,10 @@
-/* CSS style applier */
+/** CSS style applier
+ * @file
+ *
+ * @todo TODO: A way to disable CSS completely, PLUS a way to stop
+ * various property groups from taking effect. (Ie. way to turn out
+ * effect of 'display: none' or aligning or colors but keeping all the
+ * others.) --pasky */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -28,11 +34,6 @@
 #include "document/html/internal.h"
 
 
-/* TODO: A way to disable CSS completely, PLUS a way to stop various property
- * groups from taking effect. (Ie. way to turn out effect of 'display: none'
- * or aligning or colors but keeping all the others.) --pasky */
-
-
 typedef void (*css_applier_T)(struct html_context *html_context,
 			      struct html_element *element,
 			      struct css_property *prop);
@@ -89,8 +90,9 @@ css_apply_font_attribute(struct html_context *html_context,
 	element->attr.style.attr &= ~prop->value.font_attribute.rem;
 }
 
-/* FIXME: Because the current CSS doesn't provide reasonable defaults for each
- * HTML element this applier will cause bad rendering of <pre> tags. */
+/** @bug FIXME: Because the current CSS doesn't provide reasonable
+ * defaults for each HTML element this applier will cause bad
+ * rendering of @<pre> tags. */
 static void
 css_apply_text_align(struct html_context *html_context,
 		     struct html_element *element, struct css_property *prop)
@@ -99,8 +101,8 @@ css_apply_text_align(struct html_context *html_context,
 	element->parattr.align = prop->value.text_align;
 }
 
-/* XXX: Sort like the css_property_type */
-static css_applier_T css_appliers[CSS_PT_LAST] = {
+/*! XXX: Sort like the css_property_type */
+static const css_applier_T css_appliers[CSS_PT_LAST] = {
 	/* CSS_PT_NONE */		NULL,
 	/* CSS_PT_BACKGROUND */		css_apply_background_color,
 	/* CSS_PT_BACKGROUND_COLOR */	css_apply_background_color,
@@ -113,11 +115,12 @@ static css_applier_T css_appliers[CSS_PT_LAST] = {
 	/* CSS_PT_WHITE_SPACE */	css_apply_font_attribute,
 };
 
-/* This looks for a match in list of selectors. */
+/** This looks for a match in list of selectors. */
 static void
 examine_element(struct html_context *html_context, struct css_selector *base,
 		enum css_selector_type seltype, enum css_selector_relation rel,
-		struct css_selector_set *selectors, struct html_element *element)
+		struct css_selector_set *selectors,
+		struct html_element *element)
 {
 	struct css_selector *selector;
 
@@ -142,7 +145,7 @@ examine_element(struct html_context *html_context, struct css_selector *base,
 		merge_css_selectors(base, sel); \
 		/* Ancestor matches? */ \
 		if (sel->leaves.may_contain_rel_ancestor_or_parent \
-		    && (struct list_head *) element->next \
+		    && (LIST_OF(struct html_element) *) element->next \
 		     != &html_context->stack) { \
 			struct html_element *ancestor; \
 			/* This is less effective than doing reverse iterations,
@@ -152,7 +155,7 @@ examine_element(struct html_context *html_context, struct css_selector *base,
 			 * have to duplicate the whole examine_element(), so if
 			 * profiles won't show it really costs... */ \
 			for (ancestor = element->next; \
-			     (struct list_head *) ancestor \
+			     (LIST_OF(struct html_element) *) ancestor	\
 			      != &html_context->stack;\
 			     ancestor = ancestor->next) \
 				examine_element(html_context, base, \
@@ -221,7 +224,7 @@ struct css_selector *
 get_css_selector_for_element(struct html_context *html_context,
 			     struct html_element *element,
 			     struct css_stylesheet *css,
-			     struct list_head *html_stack)
+			     LIST_OF(struct html_element) *html_stack)
 {
 	unsigned char *code;
 	struct css_selector *selector;
@@ -281,7 +284,7 @@ apply_css_selector_style(struct html_context *html_context,
 
 void
 css_apply(struct html_context *html_context, struct html_element *element,
-	  struct css_stylesheet *css, struct list_head *html_stack)
+	  struct css_stylesheet *css, LIST_OF(struct html_element) *html_stack)
 {
 	struct css_selector *selector;
 
diff --git a/src/document/css/apply.h b/src/document/css/apply.h
index 61423152..c5e2fa7f 100644
--- a/src/document/css/apply.h
+++ b/src/document/css/apply.h
@@ -1,3 +1,6 @@
+/*! @file
+ * This is the main entry point for the CSS micro-engine. It throws
+ * all the power of the stylesheets at a given element. */
 
 #ifndef EL__DOCUMENT_CSS_APPLY_H
 #define EL__DOCUMENT_CSS_APPLY_H
@@ -8,28 +11,26 @@ struct css_stylesheet;
 struct html_context;
 struct html_element;
 
-/* This is the main entry point for the CSS micro-engine. It throws all the
- * power of the stylesheets at a given element. */
-
-/* Gather all style information for the given @element, so it can later be
- * applied. Returned value should be freed using done_css_selector(). */
+/** Gather all style information for the given @a element, so it can later be
+ * applied. Returned value should be freed using done_css_selector().  */
 struct css_selector *
 get_css_selector_for_element(struct html_context *html_context,
 			     struct html_element *element,
 			     struct css_stylesheet *css,
-			     struct list_head *html_stack);
+			     LIST_OF(struct html_element) *html_stack);
 
 
-/* Apply properties from an existing selector. */
+/** Apply properties from an existing selector. */
 void
 apply_css_selector_style(struct html_context *html_context,
 			 struct html_element *element,
 			 struct css_selector *selector);
 
-/* This function takes @element and applies its 'style' attribute onto its
+/** This function takes @a element and applies its 'style' attribute onto its
  * attributes (if it contains such an attribute). */
 void
 css_apply(struct html_context *html_context, struct html_element *element,
-	  struct css_stylesheet *css, struct list_head *html_stack);
+	  struct css_stylesheet *css,
+	  LIST_OF(struct html_element) *html_stack);
 
 #endif
diff --git a/src/document/css/css.c b/src/document/css/css.c
index 46d4dcdd..28b717f4 100644
--- a/src/document/css/css.c
+++ b/src/document/css/css.c
@@ -1,4 +1,5 @@
-/* CSS module management */
+/** CSS module management
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -124,7 +125,8 @@ static int
 change_hook_css(struct session *ses, struct option *current, struct option *changed)
 {
 	if (!strcmp(changed->name, "stylesheet")) {
-		/* TODO: We need to update all entries in format cache. --jonas */
+		/** @todo TODO: We need to update all entries in
+		 * format cache. --jonas */
 		import_default_css();
 	}
 
diff --git a/src/document/css/css.h b/src/document/css/css.h
index 5bd1e193..458300ef 100644
--- a/src/document/css/css.h
+++ b/src/document/css/css.h
@@ -6,20 +6,21 @@ struct css_stylesheet;
 struct module;
 struct uri;
 
-/* TODO: Basicly we need two default stylesheets. One that ELinks controls
- * (which is defined by the defaults of every property, they could however also
- * be loadable at startup time, e.g. when/if we will have a very generalised
- * renderer it would be possible to bypass the HTML renderer but would simply
- * use a HTML stylesheet like the one in CSS2 Appendix A. "A sample style sheet
- * for HTML 4.0") and one that the user controls. They should be remerged when
- * ever the user reloads the user stylesheet but else they should be pretty
- * static. Together they defines the basic layouting should be done when
- * rendering the document. */
+/** @todo TODO: Basicly we need two default stylesheets. One that
+ * ELinks controls (which is defined by the defaults of every
+ * property, they could however also be loadable at startup time,
+ * e.g. when/if we will have a very generalised renderer it would be
+ * possible to bypass the HTML renderer but would simply use a HTML
+ * stylesheet like the one in CSS2 Appendix A. "A sample style sheet
+ * for HTML 4.0") and one that the user controls. They should be
+ * remerged when ever the user reloads the user stylesheet but else
+ * they should be pretty static. Together they defines the basic
+ * layouting should be done when rendering the document. */
 extern struct css_stylesheet default_stylesheet;
 
 extern struct module css_module;
 
-/* This function will try to import the given @url from the cache. */
+/** This function will try to import the given @a url from the cache. */
 void import_css(struct css_stylesheet *css, struct uri *uri);
 
 #endif
diff --git a/src/document/css/parser.c b/src/document/css/parser.c
index 7ef1a9b0..d51b3e51 100644
--- a/src/document/css/parser.c
+++ b/src/document/css/parser.c
@@ -1,4 +1,5 @@
-/* CSS main parser */
+/** CSS main parser
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -23,7 +24,8 @@
 
 
 void
-css_parse_properties(struct list_head *props, struct scanner *scanner)
+css_parse_properties(LIST_OF(struct css_property) *props,
+		     struct scanner *scanner)
 {
 	assert(props && scanner);
 
@@ -108,8 +110,11 @@ skip_css_block(struct scanner *scanner)
 	}
 }
 
-/* Atrules grammer:
+/** Parse an atrule from @a scanner and update @a css accordingly.
  *
+ * Atrules grammar:
+ *
+ * @verbatim
  * media_types:
  *	  <empty>
  *	| <ident>
@@ -122,6 +127,7 @@ skip_css_block(struct scanner *scanner)
  *	| '@media' media_types '{' ruleset* '}'
  *	| '@page' <ident>? [':' <ident>]? '{' properties '}'
  *	| '@font-face' '{' properties '}'
+ * @endverbatim
  */
 static void
 css_parse_atrule(struct css_stylesheet *css, struct scanner *scanner,
@@ -184,18 +190,19 @@ struct selector_pkg {
 /** Move a CSS selector and its leaves into a new set.  If a similar
  * selector already exists in the set, merge them.
  *
- * \param sels
- *   The set to which \a selector should be moved.  Must not be NULL.
- * \param selector
+ * @param sels
+ *   The set to which @a selector should be moved.  Must not be NULL.
+ * @param selector
  *   The selector that should be moved.  Must not be NULL.  If it is
  *   already in some set, this function removes it from there.
- * \param watch
- *   This function updates \a *watch if it merges that selector into
- *   another one.  \a watch must not be NULL but \a *watch may be.
+ * @param watch
+ *   This function updates @a *watch if it merges that selector into
+ *   another one.  @a watch must not be NULL but @a *watch may be.
  *
- * \return \a selector or the one into which it was merged.  */
+ * @returns @a selector or the one into which it was merged.  */
 static struct css_selector *
-reparent_selector(struct css_selector_set *sels, struct css_selector *selector,
+reparent_selector(struct css_selector_set *sels,
+                  struct css_selector *selector,
                   struct css_selector **watch)
 {
 	struct css_selector *twin = find_css_selector(sels, selector->type,
@@ -222,16 +229,22 @@ reparent_selector(struct css_selector_set *sels, struct css_selector *selector,
 	return twin ? twin : selector;
 }
 
-/* Our selector grammar:
+/** Parse a comma-separated list of CSS selectors from @a scanner.
+ * Register the selectors in @a css so that get_css_selector_for_element()
+ * will find them, and add them to @a selectors so that the caller can
+ * attach properties to them.
  *
+ * Our selector grammar:
+ *
+ * @verbatim
  * selector:
  *	  element_name? ('#' id)? ('.' class)? (':' pseudo_class)? \
  *		  ((' ' | '>') selector)?
- *
+ * @endverbatim
  */
 static void
 css_parse_selector(struct css_stylesheet *css, struct scanner *scanner,
-		   struct list_head *selectors)
+		   LIST_OF(struct selector_pkg) *selectors)
 {
 	/* Shell for the last selector (the whole selector chain, that is). */
 	struct selector_pkg *pkg = NULL;
@@ -464,16 +477,20 @@ css_parse_selector(struct css_stylesheet *css, struct scanner *scanner,
 }
 
 
-/* Ruleset grammar:
+/** Parse a ruleset from @a scanner to @a css.
  *
+ * Ruleset grammar:
+ *
+ * @verbatim
  * ruleset:
  *	  selector [ ',' selector ]* '{' properties '}'
+ * @endverbatim
  */
 static void
 css_parse_ruleset(struct css_stylesheet *css, struct scanner *scanner)
 {
-	INIT_LIST_HEAD(selectors);
-	INIT_LIST_HEAD(properties);
+	INIT_LIST_OF(struct selector_pkg, selectors);
+	INIT_LIST_OF(struct css_property, properties);
 	struct selector_pkg *pkg;
 
 	css_parse_selector(css, scanner, &selectors);
diff --git a/src/document/css/parser.h b/src/document/css/parser.h
index e9003f42..645d0525 100644
--- a/src/document/css/parser.h
+++ b/src/document/css/parser.h
@@ -1,3 +1,6 @@
+/*! @file
+ * This is interface for the value parser. It is intended to be used
+ * only internally inside of the CSS engine. */
 
 #ifndef EL__DOCUMENT_CSS_PARSER_H
 #define EL__DOCUMENT_CSS_PARSER_H
@@ -7,19 +10,17 @@ struct scanner;
 struct css_stylesheet;
 struct uri;
 
-/* This is interface for the value parser. It is intended to be used only
- * internally inside of the CSS engine. */
-
-/* This function takes a semicolon separated list of declarations from the
- * given string, parses them to atoms, and chains the newly created {struct
- * css_property}es to the specified list. The function returns positive value
- * in case it recognized a property in the given string, or zero in case of an
- * error. */
-void css_parse_properties(struct list_head *props, struct scanner *scanner);
+/** This function takes a semicolon separated list of declarations
+ * from the given string, parses them to atoms, and chains the newly
+ * created struct css_property objects to the specified list.
+ * @returns positive value in case it recognized a property in the
+ * given string, or zero in case of an error. */
+void css_parse_properties(LIST_OF(struct css_property) *props,
+			  struct scanner *scanner);
 
 
-/* Parses the @string and adds any recognized selectors + properties to the
- * given stylesheet @css. If the selector is already in the stylesheet it
+/** Parses the @a string and adds any recognized selectors + properties to the
+ * given stylesheet @a css. If the selector is already in the stylesheet it
  * properties are added to the that selector. */
 void css_parse_stylesheet(struct css_stylesheet *css, struct uri *base_uri,
 			  unsigned char *string, unsigned char *end);
diff --git a/src/document/css/property.c b/src/document/css/property.c
index e379f328..553bbcfd 100644
--- a/src/document/css/property.c
+++ b/src/document/css/property.c
@@ -1,4 +1,5 @@
-/* CSS property info */
+/** CSS property info
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -12,8 +13,8 @@
 #include "document/css/value.h"
 
 
-/* TODO: Use fastfind when we get a lot of properties. */
-/* XXX: But only _WHEN_ we get _A LOT_ of properties, zas! ;-) --pasky */
+/** @todo TODO: Use fastfind when we get a lot of properties.
+ * XXX: But only _WHEN_ we get _A LOT_ of properties, zas! ;-) --pasky */
 struct css_property_info css_property_info[CSS_PT_LAST] = {
 	{ "background",		CSS_PT_BACKGROUND,	 CSS_VT_COLOR,		css_parse_background_value },
 	{ "background-color",	CSS_PT_BACKGROUND_COLOR, CSS_VT_COLOR,		css_parse_color_value },
diff --git a/src/document/css/property.h b/src/document/css/property.h
index 0801026e..c362801b 100644
--- a/src/document/css/property.h
+++ b/src/document/css/property.h
@@ -6,16 +6,14 @@
 #include "util/color.h"
 #include "util/lists.h"
 
-/* The {struct css_property} describes one CSS declaration in a rule, therefore
- * being basically a parsed instance of {struct css_property_info}. One list of
+/** The struct css_property describes one CSS declaration in a rule, therefore
+ * being basically a parsed instance of struct css_property_info. One list of
  * these contains all the declarations contained in one rule. */
-
 struct css_property {
 	LIST_HEAD(struct css_property);
 
-	/* Declared property. The enum item name is derived from the property
-	 * name, just uppercase it and tr/-/_/. */
-
+	/** Declared property. The enum item name is derived from the
+	 * property name, just uppercase it and tr/-/_/. */
 	enum css_property_type {
 		CSS_PT_NONE,
 		CSS_PT_BACKGROUND,
@@ -30,9 +28,7 @@ struct css_property {
 		CSS_PT_LAST,
 	} type;
 
-	/* Property value. If it is a pointer, it points always to a memory
-	 * to be free()d together with this structure. */
-
+	/** Type of the property value.  Discriminates the #value union.  */
 	enum css_property_value_type {
 		CSS_VT_NONE,
 		CSS_VT_COLOR,
@@ -41,6 +37,9 @@ struct css_property {
 		CSS_VT_TEXT_ALIGN,
 		CSS_VT_LAST,
 	} value_type;
+
+	/** Property value. If it is a pointer, it points always to a
+	 * memory to be free()d together with this structure. */
 	union css_property_value {
 		void *none;
 		color_T color;
@@ -61,40 +60,40 @@ struct css_property {
 	} value;
 };
 
-/* The {struct css_property_info} describes what values the properties can
- * have and what internal type they have. */
-
 struct css_property_info;
 struct scanner;
 typedef int (*css_property_value_parser_T)(struct css_property_info *propinfo,
 					 union css_property_value *value,
 					 struct scanner *scanner);
 
+/** The struct css_property_info describes what values the properties can
+ * have and what internal type they have. */
 struct css_property_info {
 	unsigned char *name;
 	enum css_property_type type;
 
-	/* This is the storage type, basically describing what to save to
+	/** This is the storage type, basically describing what to save to
 	 * css_property.value. Many properties can share the same valtype.
 	 * The value is basically output of the value parser. */
 	enum css_property_value_type value_type;
 
-	/* This is the property value parser, processing the written form of a
-	 * property value. Its job is to take the value string (or scanner's
-	 * token list in the future) and transform it to a @value form
-	 * according to the property's @value_type. Although some properties
-	 * can share a parser, it is expected that most properties will either
-	 * use a custom one or use a generic parser with property-specific
-	 * backend specified in @parser_data. */
+	/** This is the property value parser, processing the written
+	 * form of a property value. Its job is to take the value
+	 * string (or scanner's token list in the future) and
+	 * transform it to a union css_property_value according to the
+	 * property's #value_type. Although some properties can share
+	 * a parser, it is expected that most properties will either
+	 * use a custom one or use a generic parser with
+	 * property-specific backend specified in #parser_data. */
 	css_property_value_parser_T parser;
 
-	/* In case you use a generic @parser, it can be useful to still give
-	 * it some specific data. You can do so through @parser_data. The
-	 * content is @parser-specific. */
+	/** In case you use a generic #parser, it can be useful to still give
+	 * it some specific data. You can do so through @c parser_data. The
+	 * content is #parser-specific. */
 	void *parser_data;
 };
 
-/* This table contains info about all the known CSS properties. */
+/** This table contains info about all the known CSS properties. */
 extern struct css_property_info css_property_info[];
 
 #endif
diff --git a/src/document/css/scanner.c b/src/document/css/scanner.c
index 0781968c..cb927a2f 100644
--- a/src/document/css/scanner.c
+++ b/src/document/css/scanner.c
@@ -1,4 +1,5 @@
-/* CSS token scanner utilities */
+/** CSS token scanner utilities
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -15,8 +16,7 @@
 #include "util/string.h"
 
 
-/* Bitmap entries for the CSS character groups used in the scanner table */
-
+/** Bitmap entries for the CSS character groups used in the scanner table */
 enum css_char_group {
 	CSS_CHAR_ALPHA		= (1 << 0),
 	CSS_CHAR_DIGIT		= (1 << 1),
diff --git a/src/document/css/scanner.h b/src/document/css/scanner.h
index 4820a0a6..5db7d853 100644
--- a/src/document/css/scanner.h
+++ b/src/document/css/scanner.h
@@ -4,88 +4,94 @@
 
 #include "util/scanner.h"
 
-/* The various token types and what they contain. Patterns taken from
- * the flex scanner declarations in the CSS 2 Specification. */
+/** The various token types and what they contain. Patterns taken from
+ * the flex scanner declarations in the CSS 2 Specification.
+ *
+ * Char tokens range from 1 to 255 and have their char value as type
+ * meaning non char tokens have values from 256 and up.
+ *
+ * @verbatim
+ * {...} means char group, <...> means token
+ * {identstart}	[a-z_]|{nonascii}
+ * {ident}	[a-z0-9_-]|{nonascii}
+ * <ident>	{identstart}{ident}*
+ * <name>	{ident}+
+ * <number>	[0-9]+|[0-9]*"."[0-9]+
+ * @endverbatim */
 enum css_token_type {
-	/* Char tokens: */
-
-	/* Char tokens range from 1 to 255 and have their char value as type */
-	/* meaning non char tokens have values from 256 and up. */
+	/* Doxygen 1.5.2 does not support member groups inside enum.  */
 
 	/* Low level string tokens: */
 
-	/* {...} means char group, <...> means token */
-	/* {identstart}	[a-z_]|{nonascii} */
-	/* {ident}	[a-z0-9_-]|{nonascii} */
-	/* <ident>	{identstart}{ident}* */
-	/* <name>	{ident}+ */
-	/* <number>	[0-9]+|[0-9]*"."[0-9]+ */
-
-	/* Percentage is put because although it looks like being composed of
-	 * <number> and '%' floating point numbers are really not allowed but
-	 * strtol() will round it down for us ;) */
-	CSS_TOKEN_IDENT = 256,	/* <ident> */
-	CSS_TOKEN_NUMBER,	/* <number> */
-	CSS_TOKEN_PERCENTAGE,	/* <number>% */
-	CSS_TOKEN_STRING,	/* Char sequence delimted by matching ' or " */
+	CSS_TOKEN_IDENT = 256,	/**< @<ident> */
+	CSS_TOKEN_NUMBER,	/**< @<number> */
+	/*! Percentage is put because although it looks like being composed
+	 * of @<number> and '@%' floating point numbers are really not
+	 * allowed but strtol() will round it down for us ;) */
+	CSS_TOKEN_PERCENTAGE,	/**< @<number>% */
+	CSS_TOKEN_STRING,	/**< Char sequence delimited by matching ' or " */
 
 	/* High level string tokens: */
 
 	/* The various number values; dimension being the most generic */
-	CSS_TOKEN_ANGLE,	/* <number>rad, <number>grad or <number>deg */
-	CSS_TOKEN_DIMENSION,	/* <number><ident> */
-	CSS_TOKEN_EM,		/* <number>em */
-	CSS_TOKEN_EX,		/* <number>ex */
-	CSS_TOKEN_FREQUENCY,	/* <number>Hz or <number>kHz */
-	CSS_TOKEN_LENGTH,	/* <number>{px,cm,mm,in,pt,pc} */
-	CSS_TOKEN_TIME,		/* <number>ms or <number>s */
+	CSS_TOKEN_ANGLE,	/**< @<number>rad, @<number>grad or @<number>deg */
+	CSS_TOKEN_DIMENSION,	/**< @<number>@<ident> */
+	CSS_TOKEN_EM,		/**< @<number>em */
+	CSS_TOKEN_EX,		/**< @<number>ex */
+	CSS_TOKEN_FREQUENCY,	/**< @<number>Hz or @<number>kHz */
+	CSS_TOKEN_LENGTH,	/**< @<number>{px,cm,mm,in,pt,pc} */
+	CSS_TOKEN_TIME,		/**< @<number>ms or @<number>s */
 
-	/* XXX: CSS_TOKEN_HASH conflicts with CSS_TOKEN_HEX_COLOR. Generating
-	 * hex color tokens has precedence and the hash token user have to
-	 * treat CSS_TOKEN_HASH and CSS_TOKEN_HEX_COLOR alike. */
-	CSS_TOKEN_HASH,		/* #<name> */
-	CSS_TOKEN_HEX_COLOR,	/* #[0-9a-f]\{3,6} */
+	/*! XXX: @c CSS_TOKEN_HASH conflicts with #CSS_TOKEN_HEX_COLOR.
+	 * Generating hex color tokens has precedence and the hash token
+	 * user have to treat @c CSS_TOKEN_HASH and #CSS_TOKEN_HEX_COLOR
+	 * alike. */
+	CSS_TOKEN_HASH,		/**< #@<name> */
+	CSS_TOKEN_HEX_COLOR,	/**< #[0-9a-f]@\{3,6} */
 
-	/* For all unknown functions we generate on token contain both function name
-	 * and args so scanning/parsing is easier. Besides we already check for
-	 * ending ')'. */
-	/* For known functions where we need several args [like rgb()] we want
-	 * to generate tokens for every arg and arg delimiter ( ',' or ')' ).
-	 * Because url() is a bit triggy: it can contain both <string> and some
-	 * chars that would other wise make the scanner probably choke we also
-	 * include the arg in that token. Besides it will make things like
-	 * 'background' property parsing easier. */
-	CSS_TOKEN_FUNCTION,	/* <ident>(<args>) */
-	CSS_TOKEN_RGB,		/* rgb( */
-	CSS_TOKEN_URL,		/* url(<arg>) */
+	/*! For all unknown functions we generate on token contain both
+	 * function name and args so scanning/parsing is easier. Besides
+	 * we already check for ending ')'.  */
+	CSS_TOKEN_FUNCTION,	/**< @<ident>(@<args>) */
+	/*! For known functions where we need several args [like rgb()]
+	 * we want to generate tokens for every arg and arg delimiter
+	 * ( ',' or ')' ). */
+	CSS_TOKEN_RGB,		/**< rgb( */
+	/*! Because url() is a bit triggy: it can contain both @<string>
+	 * and some chars that would other wise make the scanner probably
+	 * choke we also include the arg in that token. Besides it will
+	 * make things like 'background' property parsing easier. */
+	CSS_TOKEN_URL,		/**< url(@<arg>) */
 
 	/* @-rule symbols */
-	CSS_TOKEN_AT_KEYWORD,	/* @<ident> */
-	CSS_TOKEN_AT_CHARSET,	/* @charset */
-	CSS_TOKEN_AT_FONT_FACE,	/* @font-face */
-	CSS_TOKEN_AT_IMPORT,	/* @import */
-	CSS_TOKEN_AT_MEDIA,	/* @media */
-	CSS_TOKEN_AT_PAGE,	/* @page */
 
-	CSS_TOKEN_IMPORTANT,	/* !<whitespace>important */
+	CSS_TOKEN_AT_KEYWORD,	/**< @@@<ident> */
+	CSS_TOKEN_AT_CHARSET,	/**< @@charset */
+	CSS_TOKEN_AT_FONT_FACE,	/**< @@font-face */
+	CSS_TOKEN_AT_IMPORT,	/**< @@import */
+	CSS_TOKEN_AT_MEDIA,	/**< @@media */
+	CSS_TOKEN_AT_PAGE,	/**< @@page */
+
+	CSS_TOKEN_IMPORTANT,	/**< !@<whitespace>important */
 
 	/* TODO: Selector stuff: */
-	CSS_TOKEN_SELECT_SPACE_LIST,	/* ~= */
-	CSS_TOKEN_SELECT_HYPHEN_LIST,	/* |= */
-	CSS_TOKEN_SELECT_BEGIN,		/* ^= */
-	CSS_TOKEN_SELECT_END,		/* $= */
-	CSS_TOKEN_SELECT_CONTAINS,	/* *= */
+
+	CSS_TOKEN_SELECT_SPACE_LIST,	/**< ~= */
+	CSS_TOKEN_SELECT_HYPHEN_LIST,	/**< |= */
+	CSS_TOKEN_SELECT_BEGIN,		/**< ^= */
+	CSS_TOKEN_SELECT_END,		/**< $= */
+	CSS_TOKEN_SELECT_CONTAINS,	/**< *= */
 
 	/* Special tokens: */
 
-	/* A special token for unrecognized strings */
+	/** A special token for unrecognized strings */
 	CSS_TOKEN_GARBAGE,
 
-	/* Token type used internally when scanning to signal that the token
+	/** Token type used internally when scanning to signal that the token
 	 * should not be recorded in the scanners token table. */
 	CSS_TOKEN_SKIP,
 
-	/* Another internal token type used both to mark unused tokens in the
+	/** Another internal token type used both to mark unused tokens in the
 	 * scanner table as invalid or when scanning to signal that the
 	 * scanning should end. */
 	CSS_TOKEN_NONE = 0,
@@ -102,7 +108,7 @@ extern struct scanner_info css_scanner_info;
 	 (token_type) == ';' ? (1 <<  8) : \
 	 (token_type) == ')' ? (1 <<  7) : 0)
 
-/* Check whether it is safe to skip the @token when looking for @skipto. */
+/** Check whether it is safe to skip the @a type when looking for @a skipto. */
 static inline int
 check_css_precedence(int type, int skipto)
 {
diff --git a/src/document/css/stylesheet.c b/src/document/css/stylesheet.c
index 6f36ba60..815ad71e 100644
--- a/src/document/css/stylesheet.c
+++ b/src/document/css/stylesheet.c
@@ -1,4 +1,5 @@
-/* CSS stylesheet handling */
+/** CSS stylesheet handling
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -25,7 +26,8 @@
 
 
 struct css_selector *
-find_css_selector(struct css_selector_set *sels, enum css_selector_type type,
+find_css_selector(struct css_selector_set *sels,
+                  enum css_selector_type type,
                   enum css_selector_relation rel,
                   const unsigned char *name, int namelen)
 {
@@ -46,8 +48,8 @@ find_css_selector(struct css_selector_set *sels, enum css_selector_type type,
 
 struct css_selector *
 init_css_selector(struct css_selector_set *sels,
-		  enum css_selector_type type,
-		  enum css_selector_relation relation,
+                  enum css_selector_type type,
+                  enum css_selector_relation relation,
                   unsigned char *name, int namelen)
 {
 	struct css_selector *selector;
@@ -92,7 +94,8 @@ set_css_selector_relation(struct css_selector *selector,
 }
 
 struct css_selector *
-get_css_selector(struct css_selector_set *sels, enum css_selector_type type,
+get_css_selector(struct css_selector_set *sels,
+                 enum css_selector_type type,
                  enum css_selector_relation rel,
                  unsigned char *name, int namelen)
 {
@@ -136,7 +139,7 @@ add_selector_property(struct css_selector *selector, struct css_property *prop)
 
 void
 add_selector_properties(struct css_selector *selector,
-                        struct list_head *properties)
+                        LIST_OF(struct css_property) *properties)
 {
 	struct css_property *prop;
 
diff --git a/src/document/css/stylesheet.h b/src/document/css/stylesheet.h
index 54857881..28b41298 100644
--- a/src/document/css/stylesheet.h
+++ b/src/document/css/stylesheet.h
@@ -6,10 +6,12 @@
 
 /* #define DEBUG_CSS */
 
-/* TODO: We need a memory efficient and fast way to define how properties
- * cascade. What we are interested in is making it fast and easy to find
- * all properties we need.
+/** @file
+ * @todo TODO: We need a memory efficient and fast way to define how
+ * properties cascade. What we are interested in is making it fast and
+ * easy to find all properties we need.
  *
+ * @code
  *	struct css_cascade {
  *		struct css_cascade *parent;
  *		struct list_head properties;
@@ -17,6 +19,7 @@
  *			- Can later be turned into a table to not waste memory:
  *			  struct css_property properties[1];
  *	};
+ * @endcode
  *
  * And the selector should then only map a document element into this
  * data structure.
@@ -26,12 +29,13 @@
  * Question is in what direction to apply. It should be possible for the user
  * to overwrite any document provided stylesheet using "!important" so we need
  * to keep track in some table what properties was already applied so we only
- * overwrite when we have to. --jonas */
-/* XXX: This is one of the TODOs where I have no clue what is it talking about
+ * overwrite when we have to. --jonas
+ *
+ * XXX: This is one of the TODOs where I have no clue what is it talking about
  * in particular. Is it obsolete now when we grok 'td.foo p#x>a:hover' without
  * hesitation? --pasky */
 
-/* A set of struct css_selector.  This is currently represented as a
+/** A set of struct css_selector.  This is currently represented as a
  * list but that may be changed later.  Therefore please try not to
  * access the contents directly; instead define new wrapper macros.
  *
@@ -43,30 +47,36 @@
 struct css_selector_set {
 	unsigned char may_contain_rel_ancestor_or_parent;
 
-	/* Keep this away from the beginning of the structure,
+	/** The list of selectors in this set.
+	 *
+	 * Sets are currently represented as lists that
+	 * find_css_selector() then has to search linearly.
+	 * Hashing was also tested but did not help in practice:
+	 * each find_css_selector() call runs approximately one
+	 * strcasecmp(), and a hash function is unlikely to be
+	 * faster than that.  See ELinks bug 789 for details.
+	 *
+	 * Keep this away from the beginning of the structure,
 	 * so that nobody can cast the struct css_selector_set *
-	 * to struct list_head * and get away with it.  */
-	struct list_head list;	/* -> struct css_selector */
+	 * to LIST_OF(struct css_selector) * and get away with it.  */
+	LIST_OF(struct css_selector) list;
 };
 #define INIT_CSS_SELECTOR_SET(set) { 0, { D_LIST_HEAD(set.list) } }
 
-/* The {struct css_selector} is used for mapping elements (or nodes) in the
+/** The struct css_selector is used for mapping elements (or nodes) in the
  * document structure to properties. See README for some hints about how the
  * trees of these span. */
-/* TODO: Hash the selectors at least at the top levels? Binary trees could
- * still give an excellent gain while not giving a constant memory usage hit.
- * --pasky */
 struct css_selector {
 	LIST_HEAD(struct css_selector);
 
-	/* This defines relation between this selector fragment and its
+	/** This defines relation between this selector fragment and its
 	 * parent in the selector tree.
 	 * Update with set_css_selector_relation().  */
 	enum css_selector_relation {
-		CSR_ROOT, /* First class stylesheet member. */
-		CSR_SPECIFITY, /* Narrowing-down, i.e. the "x" in "foo#x". */
-		CSR_ANCESTOR, /* Ancestor, i.e. the "p" in "p a". */
-		CSR_PARENT, /* Direct parent, i.e. the "div" in "div>img". */
+		CSR_ROOT, /**< First class stylesheet member. */
+		CSR_SPECIFITY, /**< Narrowing-down, i.e. the "x" in "foo#x". */
+		CSR_ANCESTOR, /**< Ancestor, i.e. the "p" in "p a". */
+		CSR_PARENT, /**< Direct parent, i.e. the "div" in "div>img". */
 	} relation;
 	struct css_selector_set leaves;
 
@@ -75,11 +85,11 @@ struct css_selector {
 		CST_ID,
 		CST_CLASS,
 		CST_PSEUDO,
-		CST_INVALID, /* Auxiliary for the parser */
+		CST_INVALID, /**< Auxiliary for the parser */
 	} type;
 	unsigned char *name;
 
-	struct list_head properties; /* -> struct css_property */
+	LIST_OF(struct css_property) properties;
 };
 
 
@@ -87,43 +97,43 @@ struct css_stylesheet;
 typedef void (*css_stylesheet_importer_T)(struct css_stylesheet *, struct uri *,
 					unsigned char *url, int urllen);
 
-/* The {struct css_stylesheet} describes all the useful data that was extracted
+/** The struct css_stylesheet describes all the useful data that was extracted
  * from the CSS source. Currently we don't cache anything but the default user
- * stylesheet so it can contain stuff from both <style> tags and @import'ed CSS
- * documents. */
+ * stylesheet so it can contain stuff from both @<style> tags and @@import'ed
+ * CSS documents. */
 struct css_stylesheet {
-	/* The import callback function. */
+	/** The import callback function. */
 	css_stylesheet_importer_T import;
 
-	/* The import callback's data. */
+	/** The import callback's data. */
 	void *import_data;
 
-	/* The set of basic element selectors (which can then somehow
+	/** The set of basic element selectors (which can then somehow
 	 * tree up on inside). */
 	struct css_selector_set selectors;
 
-	/* How deeply nested are we. Limited by MAX_REDIRECTS. */
+	/** How deeply nested are we. Limited by MAX_REDIRECTS. */
 	int import_level;
 };
 
 #define INIT_CSS_STYLESHEET(css, import) \
 	{ import, NULL, INIT_CSS_SELECTOR_SET(css.selectors) }
 
-/* Dynamically allocates a stylesheet. */
+/** Dynamically allocates a stylesheet. */
 struct css_stylesheet *init_css_stylesheet(css_stylesheet_importer_T importer,
                                            void *import_data);
 
-/* Mirror given CSS stylesheet @css1 to an identical copy of itself (including
- * all the selectors), @css2. */
+/** Mirror given CSS stylesheet @a css1 to an identical copy of itself
+ * (including all the selectors), @a css2. */
 void mirror_css_stylesheet(struct css_stylesheet *css1,
 			   struct css_stylesheet *css2);
 
-/* Releases all the content of the stylesheet (but not the stylesheet
+/** Releases all the content of the stylesheet (but not the stylesheet
  * itself). */
 void done_css_stylesheet(struct css_stylesheet *css);
 
 
-/* Returns a new freshly made selector adding it to the given selector
+/** Returns a new freshly made selector adding it to the given selector
  * set, or NULL. */
 struct css_selector *get_css_selector(struct css_selector_set *set,
                                       enum css_selector_type type,
@@ -134,8 +144,8 @@ struct css_selector *get_css_selector(struct css_selector_set *set,
 	get_css_selector((stylesheet) ? &(stylesheet)->selectors : NULL, \
 	                 type, rel, name, namelen)
 
-/* Looks up the selector of the name @name and length @namelen in the
- * given set of selectors. */
+/** Looks up the selector of the name @a name and length @a namelen in
+ * the given set of selectors. */
 struct css_selector *find_css_selector(struct css_selector_set *set,
                                        enum css_selector_type type,
                                        enum css_selector_relation rel,
@@ -144,25 +154,25 @@ struct css_selector *find_css_selector(struct css_selector_set *set,
 #define find_css_base_selector(stylesheet, type, rel, name, namelen) \
 	find_css_selector(&stylesheet->selectors, rel, type, name, namelen)
 
-/* Initialize the selector structure. This is a rather low-level function from
- * your POV. */
+/** Initialize the selector structure. This is a rather low-level
+ * function from your POV. */
 struct css_selector *init_css_selector(struct css_selector_set *set,
                                        enum css_selector_type type,
                                        enum css_selector_relation relation,
                                        unsigned char *name, int namelen);
 
-/* Add all properties from the list to the given @selector. */
+/** Add all properties from the list to the given @a selector. */
 void add_selector_properties(struct css_selector *selector,
-                             struct list_head *properties);
+                             LIST_OF(struct css_property) *properties);
 
-/* Join @sel2 to @sel1, @sel1 taking precedence in all conflicts. */
+/** Join @a sel2 to @a sel1, @a sel1 taking precedence in all conflicts. */
 void merge_css_selectors(struct css_selector *sel1, struct css_selector *sel2);
 
-/* Use this function instead of modifying css_selector.relation directly.  */
+/** Use this function instead of modifying css_selector.relation directly.  */
 void set_css_selector_relation(struct css_selector *,
 			       enum css_selector_relation);
 
-/* Destroy a selector. done_css_stylesheet() normally does that for you. */
+/** Destroy a selector. done_css_stylesheet() normally does that for you. */
 void done_css_selector(struct css_selector *selector);
 
 void init_css_selector_set(struct css_selector_set *set);
@@ -175,7 +185,7 @@ void del_css_selector_from_set(struct css_selector *);
 #define foreach_css_selector(selector, set) foreach (selector, (set)->list)
 
 #ifdef DEBUG_CSS
-/* Dumps the selector tree to stderr. */
+/** Dumps the selector tree to stderr. */
 void dump_css_selector_tree(struct css_selector_set *set);
 #endif
 
diff --git a/src/document/css/value.c b/src/document/css/value.c
index 270694c9..f59965f9 100644
--- a/src/document/css/value.c
+++ b/src/document/css/value.c
@@ -1,4 +1,5 @@
-/* CSS property value parser */
+/** CSS property value parser
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/src/document/css/value.h b/src/document/css/value.h
index 9d78887a..25730170 100644
--- a/src/document/css/value.h
+++ b/src/document/css/value.h
@@ -1,3 +1,6 @@
+/*! @file
+ * This is interface for the value parser. It is intended to be used
+ * only internally inside of the CSS engine. */
 
 #ifndef EL__DOCUMENT_CSS_VALUE_H
 #define EL__DOCUMENT_CSS_VALUE_H
@@ -5,13 +8,13 @@
 #include "document/css/property.h"
 #include "document/css/scanner.h"
 
-/* This is interface for the value parser. It is intended to be used only
- * internally inside of the CSS engine. */
 
-/* This function takes a value of a specified type from the given scanner and
- * converts it to a reasonable {struct css_property}-ready form. */
-/* It returns positive integer upon success, zero upon parse error, and moves
- * the string pointer to the byte after the value end. */
+/** This function takes a value of a specified type from the given
+ * scanner and converts it to a reasonable struct css_property-ready
+ * form.
+ *
+ * It returns positive integer upon success, zero upon parse error,
+ * and moves the string pointer to the byte after the value end. */
 int css_parse_value(struct css_property_info *propinfo,
 		    union css_property_value *value,
 		    struct scanner *scanner);
@@ -19,42 +22,42 @@ int css_parse_value(struct css_property_info *propinfo,
 
 /* Here come the css_property_value_parsers provided. */
 
-/* Takes no parser_data. */
+/*! Takes no parser_data. */
 int css_parse_background_value(struct css_property_info *propinfo,
 				union css_property_value *value,
 				struct scanner *scanner);
 
-/* Takes no parser_data. */
+/*! Takes no parser_data. */
 int css_parse_color_value(struct css_property_info *propinfo,
 			  union css_property_value *value,
 			  struct scanner *scanner);
 
-/* Takes no parser_data. */
+/*! Takes no parser_data. */
 int css_parse_display_value(struct css_property_info *propinfo,
 			    union css_property_value *value,
 			    struct scanner *scanner);
 
-/* Takes no parser_data. */
+/*! Takes no parser_data. */
 int css_parse_text_decoration_value(struct css_property_info *propinfo,
 				union css_property_value *value,
 				struct scanner *scanner);
 
-/* Takes no parser_data. */
+/*! Takes no parser_data. */
 int css_parse_font_style_value(struct css_property_info *propinfo,
 				union css_property_value *value,
 				struct scanner *scanner);
 
-/* Takes no parser_data. */
+/*! Takes no parser_data. */
 int css_parse_font_weight_value(struct css_property_info *propinfo,
 				union css_property_value *value,
 				struct scanner *scanner);
 
-/* Takes no parser_data. */
+/*! Takes no parser_data. */
 int css_parse_text_align_value(struct css_property_info *propinfo,
 				union css_property_value *value,
 				struct scanner *scanner);
 
-/* Takes no parser_data. */
+/*! Takes no parser_data. */
 int css_parse_white_space_value(struct css_property_info *propinfo,
 				union css_property_value *value,
 				struct scanner *scanner);
diff --git a/src/document/docdata.c b/src/document/docdata.c
index cd0284e3..a277f7e9 100644
--- a/src/document/docdata.c
+++ b/src/document/docdata.c
@@ -1,4 +1,5 @@
-/* The document->data tools */
+/** The document->data tools
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/src/document/document.c b/src/document/document.c
index 9c0d4d75..7288c8a1 100644
--- a/src/document/document.c
+++ b/src/document/document.c
@@ -1,4 +1,5 @@
-/* The document base functionality */
+/** The document base functionality
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -33,7 +34,7 @@
 #include "viewer/text/link.h"
 
 
-static INIT_LIST_HEAD(format_cache);
+static INIT_LIST_OF(struct document, format_cache);
 
 struct document *
 init_document(struct cache_entry *cached, struct document_options *options)
diff --git a/src/document/document.h b/src/document/document.h
index 4ea7781b..a5c61635 100644
--- a/src/document/document.h
+++ b/src/document/document.h
@@ -18,7 +18,7 @@ struct frameset_desc;
 struct module;
 struct screen_char;
 
-/* Nodes are used for marking areas of text on the document canvas as
+/** Nodes are used for marking areas of text on the document canvas as
  * searchable. */
 struct node {
 	LIST_HEAD(struct node);
@@ -27,14 +27,14 @@ struct node {
 };
 
 
-/* The document line consisting of the chars ready to be copied to the terminal
- * screen. */
+/** The document line consisting of the chars ready to be copied to
+ * the terminal screen. */
 struct line {
 	struct screen_char *chars;
 	int length;
 };
 
-/* Codepage status */
+/** Codepage status */
 enum cp_status {
 	CP_STATUS_NONE,
 	CP_STATUS_SERVER,
@@ -83,21 +83,21 @@ struct link {
 	unsigned char *where_img;
 	unsigned char *title;
 
-	/* The set of characters belonging to this link (their coordinates
-	 * in the document) - each character has own {struct point}. */
+	/** The set of characters belonging to this link (their coordinates
+	 * in the document) - each character has own struct point. */
 	struct point *points;
 	int npoints;
 
 	int number;
 
-	/* This is supposed to be the colour-pair of the link, but the actual
+	/** This is supposed to be the colour-pair of the link, but the actual
 	 * colours on the canvas can differ--e.g., with image links. */
 	struct color_pair color;
 
-	/* XXX: They don't neccessary need to be link-specific, but we just
+	/*! XXX: They don't neccessary need to be link-specific, but we just
 	 * don't support them for any other elements for now. Well, we don't
 	 * even have a good place where to store them in that case. */
-	struct list_head *event_hooks; /* -> struct script_event_hook */
+	LIST_OF(struct script_event_hook) *event_hooks;
 
 	union {
 		unsigned char *name;
@@ -138,31 +138,31 @@ struct document {
 
 	struct document_options options;
 
-	struct list_head forms; /* -> struct form */
-	struct list_head tags; /* -> struct tag */
-	struct list_head nodes; /* -> struct node */
+	LIST_OF(struct form) forms;
+	LIST_OF(struct tag) tags;
+	LIST_OF(struct node) nodes;
 
 #ifdef CONFIG_ECMASCRIPT
-	/* ECMAScript snippets to be executed during loading the document into
+	/** ECMAScript snippets to be executed during loading the document into
 	 * a window.  This currently involves <script>s and onLoad handlers.
 	 * Note that if you hit a string beginning by '^' here, it is followed
 	 * by an external reference - you must wait with processing other items
 	 * until it gets resolved and loaded. New items are guaranteed to
 	 * always appear at the list end. */
-	struct list_head onload_snippets; /* -> struct string_list_item */
-	/* FIXME: We should externally maybe using cache_entry store the
+	LIST_OF(struct string_list_item) onload_snippets;
+	/** \todo FIXME: We should externally maybe using cache_entry store the
 	 * dependencies between the various entries so nothing gets removed
 	 * unneeded. */
 	struct uri_list ecmascript_imports;
-	/* used by setTimeout */
+	/** used by setTimeout */
 	timer_id_T timeout;
 #endif
 #ifdef CONFIG_CSS
-	/* FIXME: We should externally maybe using cache_entry store the
+	/** \todo FIXME: We should externally maybe using cache_entry store the
 	 * dependencies between the various entries so nothing gets removed
 	 * unneeded. */
 	struct uri_list css_imports;
-	/* Calculated from the id's of all the cache entries in css_imports.
+	/** Calculated from the id's of all the cache entries in #css_imports.
 	 * Used for checking rerendering for available CSS imports. */
 	unsigned long css_magic;
 #endif
@@ -172,15 +172,17 @@ struct document {
 	struct cache_entry *cached;
 
 	struct frame_desc *frame;
-	struct frameset_desc *frame_desc; /* RENAME ME */
+	struct frameset_desc *frame_desc; /**< \todo RENAME ME */
 	struct document_refresh *refresh;
 
 	struct line *data;
 
 	struct link *links;
-	/* Arrays with one item per rendered document's line. */
-	struct link **lines1; /* The first link on the line. */
-	struct link **lines2; /* The last link on the line. */
+	/** @name Arrays with one item per rendered document's line.
+	 * @{ */
+	struct link **lines1; /**< The first link on the line. */
+	struct link **lines2; /**< The last link on the line. */
+	/** @} */
 
 	struct search *search;
 	struct search **slines1;
@@ -190,32 +192,34 @@ struct document {
 	unsigned char buf[7];
 	unsigned char buf_length;
 #endif
-	unsigned int id; /* Used to check cache entries. */
+	unsigned int id; /**< Used to check cache entries. */
 
 	int cp;
-	int width, height; /* size of document */
+	int width, height; /**< size of document */
 	int nlinks;
 	int nsearch;
 	color_T bgcolor;
 
 	enum cp_status cp_status;
-	unsigned int links_sorted:1; /* whether links are already sorted */
+	unsigned int links_sorted:1; /**< whether links are already sorted */
 };
 
 #define document_has_frames(document_) ((document_) && (document_)->frame_desc)
 
-/* Initializes a document and its canvas. */
-/* Return NULL on allocation failure. */
+/** Initializes a document and its canvas.
+ * @returns NULL on allocation failure.
+ * @relates document */
 struct document *
 init_document(struct cache_entry *cached, struct document_options *options);
 
-/* Releases the document and all its resources. */
+/** Releases the document and all its resources.
+ * @relates document */
 void done_document(struct document *document);
 
-/* Free's the allocated members of the link. */
+/** Free's the allocated members of the link. */
 void done_link_members(struct link *link);
 
-/* Calculates css magic from available CSS imports. Used for determining
+/** Calculates css magic from available CSS imports. Used for determining
  * validity of formatted documents in the cache. */
 unsigned long get_document_css_magic(struct document *document);
 
@@ -223,7 +227,8 @@ void update_cached_document_options(void);
 
 struct document *get_cached_document(struct cache_entry *cached, struct document_options *options);
 
-/* Release a reference to the document. */
+/** Release a reference to the document.
+ * @relates document */
 void release_document(struct document *document);
 
 int get_format_cache_size(void);
@@ -234,7 +239,7 @@ void shrink_format_cache(int);
 
 extern struct module document_module;
 
-/* FIXME: support for entities and all Unicode characters.
+/** \todo FIXME: support for entities and all Unicode characters.
  * (Unpaired surrogates should be rejected, so that the ECMAScript
  * interface can convert the access key to UTF-16.)
  * For now, we only support simple printable character.  */
diff --git a/src/document/forms.c b/src/document/forms.c
index f862b37a..27133551 100644
--- a/src/document/forms.c
+++ b/src/document/forms.c
@@ -1,4 +1,5 @@
-/* The document base functionality */
+/** The document base functionality
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/src/document/forms.h b/src/document/forms.h
index 0762fa5c..ba1a0112 100644
--- a/src/document/forms.h
+++ b/src/document/forms.h
@@ -18,17 +18,18 @@ enum form_method {
 struct form {
 	LIST_HEAD(struct form);
 
-	/* The value of @form_num serves both as a unique ID of the form.
-	 * However @form_num and @form_end also stores information about where
+	/** The value of @c form_num serves both as a unique ID of the form.
+	 * However @c form_num and #form_end also stores information about where
 	 * in the source the form is positioned. Combined they are used to
 	 * figured which form items belong to which forms after rendering
 	 * tables.
 	 *
-	 * Initially the range between @form_num and @form_end will stretch from
-	 * 0 to INT_MAX. When a new form is added the range is partitioned so
-	 * the forms each has unique source ranges. */
+	 * Initially the range between @c form_num and #form_end will
+	 * stretch from 0 to INT_MAX. When a new form is added the
+	 * range is partitioned so the forms each has unique source
+	 * ranges. */
 	int form_num;
-	int form_end;
+	int form_end;		/**< @see #form_num */
 
 	unsigned char *action;
 	unsigned char *name;
@@ -36,7 +37,7 @@ struct form {
 	unsigned char *target;
 	enum form_method method;
 
-	struct list_head items; /* -> struct form_control */
+	LIST_OF(struct form_control) items;
 };
 
 
@@ -76,20 +77,20 @@ struct form_control {
 	struct form *form;
 	int g_ctrl_num;
 
-	/* The value of @position is relative to the place of the form item in
-	 * the source. */
+	/** The value of @c position is relative to the place of the
+	 * form item in the source. */
 	int position;
 
 	enum form_type type;
 	enum form_mode mode;
 
-	unsigned char *id; /* used by scripts */
+	unsigned char *id; /**< used by scripts */
 	unsigned char *name;
 	unsigned char *alt;
-	/* For FC_TEXT, FC_PASSWORD, and FC_TEXTAREA: @default_value
-	 * is in the charset of the document.
-	 *
-	 * For FC_FILE: The parser does not set @default_value.  */
+	/** Default value, cannot be changed by document scripts.
+	 * - For ::FC_TEXT, ::FC_PASSWORD, and ::FC_TEXTAREA:
+	 *   @c default_value is in the charset of the document.
+	 * - For ::FC_FILE: The parser does not set @c default_value.  */
 	unsigned char *default_value;
 	int default_state;
 	int size;
@@ -98,11 +99,11 @@ struct form_control {
 	int maxlength;
 	int nvalues;
 	unsigned char **values;
-	/* For FC_SELECT: @labels are in the charset of the terminal.
-	 * (That charset can be UTF-8 only if CONFIG_UTF8 is defined,
-	 * and is assumed to be unibyte otherwise.)  The charset of
-	 * the document and the UTF-8 I/O option have no effect
-	 * here.  */
+	/** Labels in a selection menu.
+	 * - For ::FC_SELECT: @c labels are in the charset of the terminal.
+	 *   (That charset can be UTF-8 only if CONFIG_UTF8 is defined,
+	 *   and is assumed to be unibyte otherwise.)  The charset of
+	 *   the document and the UTF-8 I/O option have no effect here.  */
 	unsigned char **labels;
 	struct menu_item *menu;
 };
diff --git a/src/document/html/internal.h b/src/document/html/internal.h
index 419da38f..c656660f 100644
--- a/src/document/html/internal.h
+++ b/src/document/html/internal.h
@@ -59,7 +59,7 @@ struct html_context {
 	 * html/parser/parse.c
 	 * html/parser/stack.c
 	 * html/parser.c */
-	struct list_head stack;
+	LIST_OF(struct html_element) stack;
 
 	/* For parser/parse.c: */
 	unsigned char *eoff; /* For parser/forms.c too */
diff --git a/src/document/html/renderer.c b/src/document/html/renderer.c
index 0598d9a4..358a948a 100644
--- a/src/document/html/renderer.c
+++ b/src/document/html/renderer.c
@@ -1863,7 +1863,7 @@ void
 check_html_form_hierarchy(struct part *part)
 {
 	struct document *document = part->document;
-	INIT_LIST_HEAD(form_controls);
+	INIT_LIST_OF(struct form_control, form_controls);
 	struct form *form;
 	struct form_control *fc, *next;
 
diff --git a/src/document/options.c b/src/document/options.c
index 1d2d81cd..8d77ce89 100644
--- a/src/document/options.c
+++ b/src/document/options.c
@@ -1,4 +1,5 @@
-/* Document options/setup workshop */
+/** Document options/setup workshop
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/src/document/options.h b/src/document/options.h
index d48a579b..dd5f6bb7 100644
--- a/src/document/options.h
+++ b/src/document/options.h
@@ -7,7 +7,7 @@
 
 struct session;
 
-/* Active link coloring options */
+/** Active link coloring options */
 struct active_link_options {
 	unsigned int color:1;
 	unsigned int underline:1;
@@ -17,14 +17,14 @@ struct active_link_options {
 	color_T bg;
 };
 
-/* This mostly acts as a option cache so rendering will be faster. However it
+/** This mostly acts as a option cache so rendering will be faster. However it
  * is also used to validate and invalidate documents in the format cache as to
  * whether they satisfy the current state of the document options. */
 struct document_options {
 	enum color_mode color_mode;
-	/* cp is the codepage for which the document is being formatted;
+	/** cp is the codepage for which the document is being formatted;
 	 * typically it is the codepage of a terminal.  It is set in
-	 * render_document_frames.  */
+	 * render_document_frames().  */
 	int cp, assume_cp, hard_assume;
 	int margin;
 	int num_links_key;
@@ -32,7 +32,8 @@ struct document_options {
 	int meta_link_display;
 	int default_form_input_size;
 
-	/* The default (fallback) colors. */
+	/** @name The default (fallback) colors.
+	 * @{ */
 	color_T default_fg;
 	color_T default_bg;
 	color_T default_link;
@@ -41,18 +42,22 @@ struct document_options {
 	color_T default_bookmark_link;
 #endif
 	color_T default_image_link;
+	/** @} */
 
-	/* Color model/optimizations */
+	/** Color model/optimizations */
 	enum color_flags color_flags;
 
 	/* XXX: Keep boolean options grouped to save padding */
 #ifdef CONFIG_CSS
-	/* CSS stuff */
+	/** @name CSS stuff
+	 * @{ */
 	unsigned int css_enable:1;
 	unsigned int css_import:1;
+	/** @} */
 #endif
 
-	/* HTML stuff */
+	/** @name HTML stuff
+	 * @{ */
 	unsigned int tables:1;
 	unsigned int table_order:1;
 	unsigned int frames:1;
@@ -63,14 +68,19 @@ struct document_options {
 	unsigned int underline_links:1;
 
 	unsigned int wrap_nbsp:1;
+	/** @} */
 
-	/* Plain rendering stuff */
+	/** @name Plain rendering stuff
+	 * @{ */
 	unsigned int plain_display_links:1;
 	unsigned int plain_compress_empty_lines:1;
+	/** @} */
 
-	/* Link navigation */
+	/** @name Link navigation
+	 * @{ */
 	unsigned int links_numbering:1;
 	unsigned int use_tabindex:1;
+	/** @} */
 
 	unsigned int plain:1;
 	unsigned int wrap:1;
@@ -78,41 +88,44 @@ struct document_options {
 	/* XXX: Everything past this comment is specialy handled by compare_opt() */
 	unsigned char *framename;
 
-	/* The position of the window (box.x and box.y)
+	/** The location of the window in which the document is rendered.
 	 *
-	 *	This is not compared at all since it doesn't make any
+	 * <dl>
+	 * <dt>The position of the window (box.x and box.y)
+	 *
+	 *  <dd>This is not compared at all since it doesn't make any
 	 *	difference what position the document will fit into a frameset
 	 *	or so.
 	 *
-	 * The width of the window (box.width)
+	 * <dt>The width of the window (box.width)
 	 *
-	 *	This controls how wide tables can be rendered and so on. It is
+	 *  <dd>This controls how wide tables can be rendered and so on. It is
 	 *	thus also to blame for the extra memory consumption when
 	 *	resizing because all documents has to be rerendered. We only
-	 *	need to compare it if not @plain.
+	 *	need to compare it if not #plain.
 	 *
-	 * The height of the window (box.height)
+	 * <dt>The height of the window (box.height)
 	 *
-	 *	Only documents containing textarea or frames uses it and we
-	 *	only compare it if @needs_height is set.
-	 */
+	 *  <dd>Only documents containing textarea or frames uses it and we
+	 *	only compare it if #needs_height is set.
+	 * </dl> */
 	struct box box;
 	unsigned int needs_height:1;
 	unsigned int needs_width:1;
 
-	/* Internal flag for rerendering */
+	/** Internal flag for rerendering */
 	unsigned int no_cache:1;
 	unsigned int gradual_rerendering:1;
 
 #ifdef CONFIG_UTF8
 	unsigned int utf8:1;
 #endif /* CONFIG_UTF8 */
-	/* Active link coloring */
-	/* This is mostly here to make use of this option cache so link
-	 * drawing is faster. --jonas */
+	/** Active link coloring.
+	 * This is mostly here to make use of this option cache so
+	 * link drawing is faster. --jonas */
 	struct active_link_options active_link;
 
-	/* Options related with IMG tag */
+	/** Options related with IMG tag */
 	struct {
 		unsigned char *prefix;
 		unsigned char *suffix;
@@ -124,18 +137,22 @@ struct document_options {
 	} image_link;
 };
 
-/* Fills the structure with values from the option system. */
+/** Fills the structure with values from the option system.
+ * @relates document_options */
 void init_document_options(struct document_options *doo);
 
-/* Free allocated document options. */
+/** Free allocated document options.
+ * @relates document_options */
 void done_document_options(struct document_options *options);
 
-/* Copies the values of one struct @from to the other @to.
- * Note that the framename is dynamically allocated. */
+/** Copies the values of one struct @a from to the other @a to.
+ * Note that the document_options.framename is dynamically allocated.
+ * @relates document_options */
 void copy_opt(struct document_options *to, struct document_options *from);
 
 /* Compares comparable values from the two structures according to
- * the comparable members described in the struct definition. */
+ * the comparable members described in the struct definition.
+ * @relates document_options */
 int compare_opt(struct document_options *o1, struct document_options *o2);
 
 #define use_document_fg_colors(o) \
@@ -144,7 +161,7 @@ int compare_opt(struct document_options *o1, struct document_options *o2);
 #define use_document_bg_colors(o) \
 	((o)->color_mode != COLOR_MODE_MONO && (o)->use_document_colors == 2)
 
-/* Increments the numeric value of the option identified by option_name,
+/** Increments the numeric value of the option identified by @a option_name,
  * resetting it to the minimum value when it is already at the maximum value,
  * and redraws the document. */
 void toggle_document_option(struct session *ses, unsigned char *option_name);
diff --git a/src/document/refresh.c b/src/document/refresh.c
index 69eb226b..eae40cab 100644
--- a/src/document/refresh.c
+++ b/src/document/refresh.c
@@ -1,4 +1,5 @@
-/* Document (meta) refresh. */
+/** Document (meta) refresh.
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -59,8 +60,9 @@ done_document_refresh(struct document_refresh *refresh)
 	mem_free(refresh);
 }
 
-/* Timer callback for @refresh->timer.  As explained in @install_timer,
- * this function must erase the expired timer ID from all variables.  */
+/** Timer callback for document_refresh.timer.  As explained in
+ * install_timer(), this function must erase the expired timer ID from
+ * all variables.  */
 static void
 do_document_refresh(void *data)
 {
diff --git a/src/document/renderer.c b/src/document/renderer.c
index cb94d885..40f2f58f 100644
--- a/src/document/renderer.c
+++ b/src/document/renderer.c
@@ -1,4 +1,5 @@
-/* HTML renderer */
+/** HTML renderer
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -40,18 +41,19 @@
 
 
 #ifdef CONFIG_ECMASCRIPT
-/* XXX: This function is de facto obsolete, since we do not need to copy
+/** @todo XXX: This function is de facto obsolete, since we do not need to copy
  * snippets around anymore (we process them in one go after the document is
  * loaded; gradual processing was practically impossible because the snippets
  * could reorder randomly during the loading - consider i.e.
- * <body onLoad><script></body>: first just <body> is loaded, but then the
- * rest of the document is loaded and <script> gets before <body>; do not even
+ * @<body onLoad>@<script>@</body>: first just @<body> is loaded, but then the
+ * rest of the document is loaded and @<script> gets before @<body>; do not even
  * imagine the trouble with rewritten (through scripting hooks) documents;
  * besides, implementing document.write() will be much simpler).
  * But I want to take no risk by reworking that now. --pasky */
 static void
 add_snippets(struct ecmascript_interpreter *interpreter,
-             struct list_head *doc_snippets, struct list_head *queued_snippets)
+             LIST_OF(struct string_list_item) *doc_snippets,
+             LIST_OF(struct string_list_item) *queued_snippets)
 {
 	struct string_list_item *doc_current = doc_snippets->next;
 
@@ -110,7 +112,8 @@ add_snippets(struct ecmascript_interpreter *interpreter,
 
 static void
 process_snippets(struct ecmascript_interpreter *interpreter,
-                 struct list_head *snippets, struct string_list_item **current)
+                 LIST_OF(struct string_list_item) *snippets,
+                 struct string_list_item **current)
 {
 	if (!*current)
 		*current = snippets->next;
diff --git a/src/document/view.h b/src/document/view.h
index 1e134df6..f800d836 100644
--- a/src/document/view.h
+++ b/src/document/view.h
@@ -19,8 +19,8 @@ struct document_view {
 	struct document *document;
 	struct view_state *vs;
 
-	struct box box;	/* pos and size of window */
-	int last_x, last_y; /* last pos of window */
+	struct box box;	/**< pos and size of window */
+	int last_x, last_y; /**< last pos of window */
 	int depth;
 	int used;
 };
diff --git a/src/dom/Doxyfile b/src/dom/Doxyfile
index e43330e6..bb16477e 100644
--- a/src/dom/Doxyfile
+++ b/src/dom/Doxyfile
@@ -188,12 +188,12 @@ PERLMOD_MAKEVAR_PREFIX =
 # Configuration options related to the preprocessor   
 #---------------------------------------------------------------------------
 ENABLE_PREPROCESSING   = YES
-MACRO_EXPANSION        = NO
-EXPAND_ONLY_PREDEF     = NO
+MACRO_EXPANSION        = YES
+EXPAND_ONLY_PREDEF     = YES
 SEARCH_INCLUDES        = YES
 INCLUDE_PATH           = 
 INCLUDE_FILE_PATTERNS  = 
-PREDEFINED             = 
+PREDEFINED             = LIST_OF(element_T)="element_T list"
 EXPAND_AS_DEFINED      = 
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
diff --git a/src/dom/stack.h b/src/dom/stack.h
index 820bbb46..423c5bb5 100644
--- a/src/dom/stack.h
+++ b/src/dom/stack.h
@@ -67,8 +67,8 @@ struct dom_stack_state {
 	 * The depth of the state in the stack. This is amongst other things
 	 * used to get the state object data. */
 	unsigned int depth;
-	/** Whether this stack state can be popped with #pop_dom_node,
-	 * #pop_dom_nodes, or #pop_dom_state. */
+	/** Whether this stack state can be popped with pop_dom_node(),
+	 * pop_dom_nodes(), or pop_dom_state(). */
 	unsigned int immutable:1;
 };
 
@@ -112,7 +112,7 @@ enum dom_stack_flag {
 	/** No flag needed. */
 	DOM_STACK_FLAG_NONE = 0,
 
-	/** Free nodes when popping by calling #done_dom_node. */
+	/** Free nodes when popping by calling done_dom_node(). */
 	DOM_STACK_FLAG_FREE_NODES = 1,
 };
 
diff --git a/src/ecmascript/ecmascript.h b/src/ecmascript/ecmascript.h
index 5693c71d..e39bf4e1 100644
--- a/src/ecmascript/ecmascript.h
+++ b/src/ecmascript/ecmascript.h
@@ -39,7 +39,7 @@ struct ecmascript_interpreter {
 	 * any new snippets in document.onload_snippets). Instead, as we
 	 * go through the list we maintain a pointer to the last processed
 	 * entry. */
-	struct list_head onload_snippets; /* -> struct string_list_item */
+	LIST_OF(struct string_list_item) onload_snippets;
 	struct string_list_item *current_onload_snippet;
 
 	/* ID of the {struct document} where those onload_snippets belong to.
diff --git a/src/formhist/formhist.c b/src/formhist/formhist.c
index 822ce492..469dcdf5 100644
--- a/src/formhist/formhist.c
+++ b/src/formhist/formhist.c
@@ -42,7 +42,7 @@ static struct option_info forms_history_options[] = {
 	NULL_OPTION_INFO,
 };
 
-INIT_LIST_HEAD(saved_forms);
+INIT_LIST_OF(struct formhist_data, saved_forms);
 
 static struct formhist_data *
 new_formhist_item(unsigned char *url)
@@ -386,7 +386,7 @@ get_form_history_value(unsigned char *url, unsigned char *name)
 }
 
 void
-memorize_form(struct session *ses, struct list_head *submit,
+memorize_form(struct session *ses, LIST_OF(struct submitted_value) *submit,
 	      struct form *forminfo)
 {
 	/* [gettext_accelerator_context(memorize_form)] */
diff --git a/src/formhist/formhist.h b/src/formhist/formhist.h
index 3be6622d..7dcd7adc 100644
--- a/src/formhist/formhist.h
+++ b/src/formhist/formhist.h
@@ -11,7 +11,7 @@ struct formhist_data {
 	OBJECT_HEAD(struct formhist_data);
 
 	/* List of submitted_values for this form */
-	struct list_head *submit;
+	LIST_OF(struct submitted_value) *submit;
 
 	struct listbox_item *box_item;
 
@@ -26,7 +26,9 @@ struct formhist_data {
  * value if present, NULL upon an error. */
 unsigned char *get_form_history_value(unsigned char *url, unsigned char *name);
 
-void memorize_form(struct session *ses, struct list_head *submit, struct form *forminfo);
+void memorize_form(struct session *ses,
+		   LIST_OF(struct submitted_value) *submit,
+		   struct form *forminfo);
 
 int save_formhist_to_file(void);
 void delete_formhist_item(struct formhist_data *form);
diff --git a/src/globhist/globhist.c b/src/globhist/globhist.c
index 4eab05b5..7f1d7b2b 100644
--- a/src/globhist/globhist.c
+++ b/src/globhist/globhist.c
@@ -39,7 +39,7 @@
 
 
 INIT_INPUT_HISTORY(global_history);
-INIT_LIST_HEAD(global_history_reap_list);
+INIT_LIST_OF(struct global_history_item, global_history_reap_list);
 
 
 /* GUI stuff. Declared here because done_global_history() frees it. */
diff --git a/src/main/main.c b/src/main/main.c
index 5901665f..8b34d16b 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -62,7 +62,7 @@ static int init_b = 0;
 
 /* Check if either stdin or stdout are pipes */
 static void
-check_stdio(struct list_head *url_list)
+check_stdio(LIST_OF(struct string_list_item) *url_list)
 {
 	assert(!remote_session_flags);
 
@@ -105,7 +105,7 @@ check_cwd(void)
 static void
 init(void)
 {
-	INIT_LIST_HEAD(url_list);
+	INIT_LIST_OF(struct string_list_item, url_list);
 	int fd = -1;
 	enum retval ret;
 
diff --git a/src/main/select.c b/src/main/select.c
index cdc68757..aab5349d 100644
--- a/src/main/select.c
+++ b/src/main/select.c
@@ -82,7 +82,7 @@ struct bottom_half {
 	void *data;
 };
 
-static INIT_LIST_HEAD(bottom_halves);
+static INIT_LIST_OF(struct bottom_half, bottom_halves);
 
 int
 register_bottom_half_do(select_handler_T fn, void *data)
diff --git a/src/main/timer.c b/src/main/timer.c
index 1a362cd2..33b00737 100644
--- a/src/main/timer.c
+++ b/src/main/timer.c
@@ -24,7 +24,7 @@ struct timer {
 
 /* @timers.next points to the timer with the smallest interval,
  * @timers.next->next to the second smallest, and so on.  */
-static INIT_LIST_HEAD(timers);
+static INIT_LIST_OF(struct timer, timers);
 
 int
 get_timers_count(void)
diff --git a/src/mime/backend/mailcap.c b/src/mime/backend/mailcap.c
index aaa17b3f..1ca637a6 100644
--- a/src/mime/backend/mailcap.c
+++ b/src/mime/backend/mailcap.c
@@ -42,7 +42,7 @@
 
 struct mailcap_hash_item {
 	/* The entries associated with the type */
-	struct list_head entries; /* -> struct mailcap_entry */
+	LIST_OF(struct mailcap_entry) entries;
 
 	/* The content type of all @entries. Must be last! */
 	unsigned char type[1];
@@ -683,7 +683,7 @@ int default_mime_backend,
     install_signal_handler,
     mimetypes_mime_backend,
     program;
-struct list_head terminals;
+LIST_OF(struct terminal) terminals;
 
 void die(const char *msg, ...)
 {
diff --git a/src/mime/dialogs.c b/src/mime/dialogs.c
index 1d56e45e..f140c9d4 100644
--- a/src/mime/dialogs.c
+++ b/src/mime/dialogs.c
@@ -146,7 +146,7 @@ void
 menu_list_ext(struct terminal *term, void *fn_, void *xxx)
 {
 	menu_func_T fn = fn_;
-	struct list_head *opt_tree = get_opt_tree("mime.extension");
+	LIST_OF(struct option) *opt_tree = get_opt_tree("mime.extension");
 	struct option *opt;
 	struct menu_item *mi = NULL;
 
diff --git a/src/network/connection.c b/src/network/connection.c
index f49cf01f..ece33adc 100644
--- a/src/network/connection.c
+++ b/src/network/connection.c
@@ -59,9 +59,9 @@ static unsigned int connection_id = 0;
 static int active_connections = 0;
 static timer_id_T keepalive_timeout = TIMER_ID_UNDEF;
 
-static INIT_LIST_HEAD(connection_queue);
-static INIT_LIST_HEAD(host_connections);
-static INIT_LIST_HEAD(keepalive_connections);
+static INIT_LIST_OF(struct connection, connection_queue);
+static INIT_LIST_OF(struct host_connection, host_connections);
+static INIT_LIST_OF(struct keepalive_connection, keepalive_connections);
 
 /* Prototypes */
 static void notify_connection_callbacks(struct connection *conn);
diff --git a/src/network/connection.h b/src/network/connection.h
index c4a4b2e4..61931e19 100644
--- a/src/network/connection.h
+++ b/src/network/connection.h
@@ -16,7 +16,7 @@ struct uri;
 struct connection {
 	LIST_HEAD(struct connection);
 
-	struct list_head downloads;
+	LIST_OF(struct download) downloads;
 	struct progress *progress;
 
 	/* If no proxy is used uri and proxied_uri are the same. */
@@ -82,7 +82,7 @@ struct popen_data {
 	unsigned char *filename;
 };
 
-extern struct list_head copiousoutput_data;
+extern LIST_OF(struct popen_data) copiousoutput_data;
 
 int register_check_queue(void);
 
diff --git a/src/network/dns.c b/src/network/dns.c
index 29a3717e..73458fe2 100644
--- a/src/network/dns.c
+++ b/src/network/dns.c
@@ -76,7 +76,7 @@ struct dnsquery {
 static struct dnsquery *dns_queue = NULL;
 #endif
 
-static INIT_LIST_HEAD(dns_cache);
+static INIT_LIST_OF(struct dnsentry, dns_cache);
 
 static void done_dns_lookup(struct dnsquery *query, enum dns_result res);
 
diff --git a/src/network/state.c b/src/network/state.c
index 5b0f5a21..e4588d32 100644
--- a/src/network/state.c
+++ b/src/network/state.c
@@ -136,7 +136,7 @@ struct strerror_val {
 	unsigned char msg[1]; /* must be last */
 };
 
-static INIT_LIST_HEAD(strerror_buf); /* struct strerror_val */
+static INIT_LIST_OF(struct strerror_val, strerror_buf);
 
 /* It returns convenient error message, depending on @state.
  * It never returns NULL (if one changes that, be warn that
diff --git a/src/osdep/beos/beos.c b/src/osdep/beos/beos.c
index 2f22138f..79edef6a 100644
--- a/src/osdep/beos/beos.c
+++ b/src/osdep/beos/beos.c
@@ -61,7 +61,7 @@ struct active_thread {
 	void *data;
 };
 
-INIT_LIST_HEAD(active_threads);
+INIT_LIST_OF(struct active_thread, active_threads);
 
 int32
 started_thr(void *data)
@@ -114,12 +114,14 @@ rel:
 void
 terminate_osdep(void)
 {
-	struct list_head *p;
+	LIST_OF(struct active_thread) *p;
 	struct active_thread *thrd;
 
 	if (acquire_sem(thr_sem) < B_NO_ERROR) return;
 	foreach (thrd, active_threads) kill_thread(thrd->tid);
 
+	/* Cannot use free_list(active_threads) because it would call
+	 * mem_free(p) and we need free(p).  */
 	while ((p = active_threads.next) != &active_threads) {
 		del_from_list(p);
 		free(p);
diff --git a/src/osdep/os2/os2.c b/src/osdep/os2/os2.c
index 8812b4bd..20d6d9f4 100644
--- a/src/osdep/os2/os2.c
+++ b/src/osdep/os2/os2.c
@@ -436,9 +436,9 @@ resize_window(int x, int y, int old_width, int old_height)
 #if 0
 	unsigned char cmdline[16];
 	sprintf(cmdline, "mode ");
-	snprint(cmdline + 5, 5, x);
+	ulongcat(cmdline + 5, NULL, x, 5, 0);
 	strcat(cmdline, ",");
-	snprint(cmdline + strlen(cmdline), 5, y);
+	ulongcat(cmdline + strlen(cmdline), NULL, y, 5, 0);
 #endif
 	return 0;
 }
diff --git a/src/protocol/auth/auth.c b/src/protocol/auth/auth.c
index 4f18db5d..dc1c1643 100644
--- a/src/protocol/auth/auth.c
+++ b/src/protocol/auth/auth.c
@@ -26,7 +26,7 @@
 #define DEBUG_HTTP_AUTH
 #endif
 
-static INIT_LIST_HEAD(auth_entry_list);
+static INIT_LIST_OF(struct auth_entry, auth_entry_list);
 
 
 /* Find if url/realm is in auth list. If a matching url is found, but realm is
diff --git a/src/protocol/bittorrent/bittorrent.c b/src/protocol/bittorrent/bittorrent.c
index f0847b03..9ce12b92 100644
--- a/src/protocol/bittorrent/bittorrent.c
+++ b/src/protocol/bittorrent/bittorrent.c
@@ -228,7 +228,7 @@ get_bittorrent_peerwire_max_request_length(void)
 
 
 /* File selection store. */
-static INIT_LIST_HEAD(bittorrent_selections);
+static INIT_LIST_OF(struct bittorrent_selection_info, bittorrent_selections);
 
 struct bittorrent_selection_info {
 	LIST_HEAD(struct bittorrent_selection_info);
@@ -291,7 +291,7 @@ add_bittorrent_selection(struct uri *uri, int *selection, size_t size)
 
 
 /* Message queue. */
-static INIT_LIST_HEAD(bittorrent_messages);
+static INIT_LIST_OF(struct bittorrent_message, bittorrent_messages);
 
 void
 add_bittorrent_message(struct uri *uri, enum connection_state state,
diff --git a/src/protocol/bittorrent/common.c b/src/protocol/bittorrent/common.c
index ddefa288..d9fe3ecb 100644
--- a/src/protocol/bittorrent/common.c
+++ b/src/protocol/bittorrent/common.c
@@ -465,7 +465,7 @@ struct bittorrent_blacklist_item {
 	bittorrent_id_T id;
 };
 
-static INIT_LIST_HEAD(bittorrent_blacklist);
+static INIT_LIST_OF(struct bittorrent_blacklist_item, bittorrent_blacklist);
 
 
 static struct bittorrent_blacklist_item *
diff --git a/src/protocol/bittorrent/common.h b/src/protocol/bittorrent/common.h
index 1108efe3..3d92832a 100644
--- a/src/protocol/bittorrent/common.h
+++ b/src/protocol/bittorrent/common.h
@@ -117,7 +117,7 @@ struct bittorrent_peer_request {
 
 struct bittorrent_peer_status {
 	/* FIFO-like recording of requests. */
-	struct list_head requests; /* -> struct bittorrent_peer_request */
+	LIST_OF(struct bittorrent_peer_request) requests;
 
 	/* Flags for scheduling updating of the peer state. */
 	unsigned int choked:1;		/* The peer was choked. */
@@ -170,7 +170,7 @@ struct bittorrent_peer_connection {
 
 	/* Outgoing message queue. Note piece messages are maintained entirely
 	 * in the request list in the bittorrent_peer_status struct. */
-	struct list_head queue; /* -> struct bittorrent_peer_request */
+	LIST_OF(struct bittorrent_peer_request) queue;
 
 	/* A bitfield of the available pieces from the peer. */
 	/* The size depends on the number of pieces. */
@@ -270,7 +270,7 @@ struct bittorrent_meta {
 
 	/* A list with information about files in the torrent. */
 	/* The list is a singleton for single-file torrents. */
-	struct list_head files;	/* -> struct bittorrent_file */
+	LIST_OF(struct bittorrent_file) files;
 };
 
 enum bittorrent_connection_mode {
@@ -304,11 +304,11 @@ struct bittorrent_connection {
 	/* Active peer list */
 	/* The size is controlled by the protocol.bittorrent.max_active_peers
 	 * option. */
-	struct list_head peers; 	/* -> struct bittorrent_peer_connection */
+	LIST_OF(struct bittorrent_peer_connection) peers;
 
 	/* List of information about potential peers. */
 	/* TODO: Use hash. */
-	struct list_head peer_pool;	/* -> struct bittorrent_peer */
+	LIST_OF(struct bittorrent_peer) peer_pool;
 
 	/* The peer ID of the client. */
 	bittorrent_id_T peer_id;
diff --git a/src/protocol/bittorrent/dialogs.c b/src/protocol/bittorrent/dialogs.c
index 365c5666..eec92c2a 100644
--- a/src/protocol/bittorrent/dialogs.c
+++ b/src/protocol/bittorrent/dialogs.c
@@ -26,7 +26,7 @@
 
 
 struct bittorrent_download_info {
-	struct list_head labels;	/* -> struct string_list_item */
+	LIST_OF(struct string_list_item) labels;
 	unsigned char *name;
 	int *selection;
 	size_t size;
diff --git a/src/protocol/bittorrent/peerconnect.c b/src/protocol/bittorrent/peerconnect.c
index ddb80375..ba93982c 100644
--- a/src/protocol/bittorrent/peerconnect.c
+++ b/src/protocol/bittorrent/peerconnect.c
@@ -43,12 +43,12 @@
 static int bittorrent_socket = -1;
 
 /* The active BitTorrent connections sharing the above listening port. */
-static INIT_LIST_HEAD(bittorrent_connections);
+static INIT_LIST_OF(struct bittorrent_connection, bittorrent_connections);
 
 /* The incoming (and pending anonymous) peer connections which has not yet been
  * assigned to a BitTorrent connection because the info hash has not been read
  * from the handshake.  */
-static INIT_LIST_HEAD(bittorrent_peer_connections);
+static INIT_LIST_OF(struct bittorrent_peer_connection, bittorrent_peer_connections);
 
 
 /* Loop the bittorrent connection list and return matching connection
diff --git a/src/protocol/bittorrent/piececache.c b/src/protocol/bittorrent/piececache.c
index 80b54d99..c7f4eac7 100644
--- a/src/protocol/bittorrent/piececache.c
+++ b/src/protocol/bittorrent/piececache.c
@@ -341,7 +341,7 @@ add_piece_to_bittorrent_free_list(struct bittorrent_piece_cache *cache,
 {
 	struct bittorrent_peer_request *request, *next;
 	uint32_t request_length, piece_length, piece_offset;
-	INIT_LIST_HEAD(requests);
+	INIT_LIST_OF(struct bittorrent_peer_request, requests);
 	uint16_t blocks = 0;
 
 	assert(piece <= bittorrent->meta.pieces);
diff --git a/src/protocol/bittorrent/piececache.h b/src/protocol/bittorrent/piececache.h
index c9291548..1c2a5d9e 100644
--- a/src/protocol/bittorrent/piececache.h
+++ b/src/protocol/bittorrent/piececache.h
@@ -60,7 +60,7 @@ struct bittorrent_piece_cache {
 	/* A list of completed and saved entries which has been loaded into
 	 * memory. The allocated memory for all these entries is disposable. The
 	 * entries are sorted in a LRU-manner. */
-	struct list_head queue;	/* -> struct bittorrent_piece_cache_entry */
+	LIST_OF(struct bittorrent_piece_cache_entry) queue;
 
 	/* Remaining pieces are tracked using the remaining_blocks member of the
 	 * piece cache entry and a free list of piece blocks to be requested.
@@ -84,7 +84,7 @@ struct bittorrent_piece_cache {
 	 * cloned flag. The flag is set when piece block requests are cloned. If
 	 * the cloned flag is set when receiving a block then the peer-list is
 	 * searched and requests for the same piece is canceled. */
-	struct list_head free_list;	/* -> struct bittorrent_piece_request */
+	LIST_OF(struct bittorrent_piece_request) free_list;
 	struct bittorrent_piece_cache_entry entries[1];
 };
 
diff --git a/src/protocol/http/blacklist.c b/src/protocol/http/blacklist.c
index ea1e34cc..8f92d9ea 100644
--- a/src/protocol/http/blacklist.c
+++ b/src/protocol/http/blacklist.c
@@ -22,7 +22,7 @@ struct blacklist_entry {
 	unsigned char host[1]; /* Must be last. */
 };
 
-static INIT_LIST_HEAD(blacklist);
+static INIT_LIST_OF(struct blacklist_entry, blacklist);
 
 
 static struct blacklist_entry *
diff --git a/src/protocol/http/http_negotiate.c b/src/protocol/http/http_negotiate.c
index f9a144e4..470b0717 100644
--- a/src/protocol/http/http_negotiate.c
+++ b/src/protocol/http/http_negotiate.c
@@ -44,7 +44,7 @@ struct negotiate {
 	gss_buffer_desc input_token;
 };
 
-static INIT_LIST_HEAD(negotiate_list);
+static INIT_LIST_OF(struct negotiate, negotiate_list);
 
 static struct negotiate *
 http_negotiate_get(struct uri *uri, int *isnew, int alloc)
diff --git a/src/protocol/test/.gitignore b/src/protocol/test/.gitignore
new file mode 100644
index 00000000..08f363c3
--- /dev/null
+++ b/src/protocol/test/.gitignore
@@ -0,0 +1 @@
+test_uri
diff --git a/src/session/download.c b/src/session/download.c
index 376a2944..56d58c8a 100644
--- a/src/session/download.c
+++ b/src/session/download.c
@@ -1,4 +1,5 @@
-/* Downloads managment */
+/** Downloads managment
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -62,9 +63,9 @@
 /* TODO: tp_*() should be in separate file, I guess? --pasky */
 
 
-INIT_LIST_HEAD(downloads);
+INIT_LIST_OF(struct file_download, downloads);
 
-INIT_LIST_HEAD(copiousoutput_data);
+INIT_LIST_OF(struct popen_data, copiousoutput_data);
 
 int
 download_is_progressing(struct download *download)
@@ -1032,7 +1033,7 @@ tp_save(struct type_query *type_query)
 	query_file(type_query->ses, type_query->uri, type_query, continue_download, tp_cancel, 1);
 }
 
-/* This button handler uses the add_dlg_button() interface so that pressing
+/** This button handler uses the add_dlg_button() interface so that pressing
  * 'Show header' will not close the type query dialog. */
 static widget_handler_status_T
 tp_show_header(struct dialog_data *dlg_data, struct widget_data *widget_data)
@@ -1045,9 +1046,10 @@ tp_show_header(struct dialog_data *dlg_data, struct widget_data *widget_data)
 }
 
 
-/* FIXME: We need to modify this function to take frame data instead, as we
- * want to use this function for frames as well (now, when frame has content
- * type text/plain, it is ignored and displayed as HTML). */
+/** @bug FIXME: We need to modify this function to take frame data
+ * instead, as we want to use this function for frames as well (now,
+ * when frame has content type text/plain, it is ignored and displayed
+ * as HTML). */
 void
 tp_display(struct type_query *type_query)
 {
@@ -1197,10 +1199,7 @@ do_type_query(struct type_query *type_query, unsigned char *ct, struct mime_hand
 		}
 
 		if (handler && handler->program) {
-			int programlen = strlen(handler->program);
-
-			programlen = int_min(programlen, MAX_STR_LEN);
-			memcpy(field, handler->program, programlen);
+			safe_strncpy(field, handler->program, MAX_STR_LEN);
 		}
 
 		/* xgettext:no-c-format */
diff --git a/src/session/download.h b/src/session/download.h
index 8c80e20b..79923d2e 100644
--- a/src/session/download.h
+++ b/src/session/download.h
@@ -27,7 +27,7 @@ struct download {
 
 	struct connection *conn;
 	struct cache_entry *cached;
-	/* The callback is called when connection gets into a progress state,
+	/** The callback is called when connection gets into a progress state,
 	 * after it's over (in a result state), and also periodically after
 	 * the download starts receiving some data. */
 	download_callback_T *callback;
@@ -67,25 +67,25 @@ struct file_download {
 	int notify;
 	struct download download;
 
-	/* Should the file be deleted when destroying the structure */
+	/** Should the file be deleted when destroying the structure */
 	unsigned int delete:1;
 
-	/* Should the download be stopped/interrupted when destroying the structure */
+	/** Should the download be stopped/interrupted when destroying the structure */
 	unsigned int stop:1;
 
-	/* Whether to block the terminal when running the external handler. */
+	/** Whether to block the terminal when running the external handler. */
 	unsigned int block:1;
 
-	/* Whether copiousoutput mode is used by the mailcap entry */
+	/** Whether copiousoutput mode is used by the mailcap entry */
 	unsigned int copiousoutput:1;
 
-	/* The current dialog for this download. Can be NULL. */
+	/** The current dialog for this download. Can be NULL. */
 	struct dialog_data *dlg_data;
 	struct listbox_item *box_item;
 };
 
-/* Stack of all running downloads */
-extern struct list_head downloads;
+/** Stack of all running downloads */
+extern LIST_OF(struct file_download) downloads;
 
 static inline int
 is_in_downloads_list(struct file_download *file_download)
diff --git a/src/session/history.c b/src/session/history.c
index 8c462e62..6b374429 100644
--- a/src/session/history.c
+++ b/src/session/history.c
@@ -1,4 +1,5 @@
-/* Visited URL history managment - NOT goto_url_dialog history! */
+/** Visited URL history managment - NOT dialog_goto_url() history!
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -24,7 +25,7 @@
 
 
 static inline void
-free_history(struct list_head *history)
+free_history(LIST_OF(struct location) *history)
 {
 	while (!list_empty(*history)) {
 		struct location *loc = history->next;
@@ -35,6 +36,7 @@ free_history(struct list_head *history)
 }
 
 
+/** @relates ses_history */
 void
 create_history(struct ses_history *history)
 {
@@ -42,6 +44,7 @@ create_history(struct ses_history *history)
 	history->current = NULL;
 }
 
+/** @relates ses_history */
 void
 destroy_history(struct ses_history *history)
 {
@@ -49,6 +52,7 @@ destroy_history(struct ses_history *history)
 	history->current = NULL;
 }
 
+/** @relates ses_history */
 void
 clean_unhistory(struct ses_history *history)
 {
@@ -62,6 +66,7 @@ clean_unhistory(struct ses_history *history)
 	}
 }
 
+/** @relates ses_history */
 void
 add_to_history(struct ses_history *history, struct location *loc)
 {
@@ -74,6 +79,7 @@ add_to_history(struct ses_history *history, struct location *loc)
 	history->current = loc;
 }
 
+/** @relates ses_history */
 void
 del_from_history(struct ses_history *history, struct location *loc)
 {
@@ -175,16 +181,16 @@ go_history_by_n(struct session *ses, int n)
 	go_history(ses, loc);
 }
 
-/* See go_history() description regarding unpredictable effects on cur_loc()
- * by this function. */
+/** Go backward in the history.  See go_history() description regarding
+ * unpredictable effects on cur_loc() by this function. */
 void
 go_back(struct session *ses)
 {
 	go_history_by_n(ses, -1);
 }
 
-/* See go_history() description regarding unpredictable effects on cur_loc()
- * by this function. */
+/** Go forward in the history.  See go_history() description regarding
+ * unpredictable effects on cur_loc() by this function. */
 void
 go_unback(struct session *ses)
 {
diff --git a/src/session/history.h b/src/session/history.h
index 0d60d8c2..ed28bf4a 100644
--- a/src/session/history.h
+++ b/src/session/history.h
@@ -5,13 +5,13 @@ struct location;
 struct session;
 
 struct ses_history {
-	/* The first list item is the first visited location. The last list
-	 * item is the last location in the unhistory. The @current location is
+	/** The first list item is the first visited location. The last list
+	 * item is the last location in the unhistory. The #current location is
 	 * included in this list. */
-	struct list_head history; /* -> struct location */
+	LIST_OF(struct location) history;
 
-	/* The current location. This is moveable pivot pointing somewhere at
-	 * the middle of @history. */
+	/** The current location. This is moveable pivot pointing somewhere at
+	 * the middle of #history. */
 	struct location *current;
 };
 
@@ -24,7 +24,7 @@ void add_to_history(struct ses_history *history, struct location *loc);
 void del_from_history(struct ses_history *history, struct location *loc);
 
 
-/* Note that this function is dangerous, and its results are sort of
+/** Note that this function is dangerous, and its results are sort of
  * unpredictable. If the document is cached and is permitted to be fetched from
  * the cache, the effect of this function is immediate and you end up with the
  * new location being cur_loc(). BUT if the cache entry cannot be used, the
@@ -34,7 +34,8 @@ void del_from_history(struct ses_history *history, struct location *loc);
  * after call to this function (or the regents go_(un)back(), of course). */
 void go_history(struct session *ses, struct location *loc);
 
-/* Move back -n times if n is negative, forward n times if positive. */
+/** Move back -@a n times if @a n is negative, forward @a n times if
+ * positive. */
 void go_history_by_n(struct session *ses, int n);
 
 void go_back(struct session *ses);
diff --git a/src/session/location.c b/src/session/location.c
index 2478eb30..302b4dc5 100644
--- a/src/session/location.c
+++ b/src/session/location.c
@@ -1,4 +1,5 @@
-/* Locations handling */
+/** Locations handling
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -14,6 +15,7 @@
 #include "util/string.h"
 
 
+/** @relates location */
 void
 copy_location(struct location *dst, struct location *src)
 {
diff --git a/src/session/location.h b/src/session/location.h
index 9f1631e8..a534b739 100644
--- a/src/session/location.h
+++ b/src/session/location.h
@@ -8,7 +8,7 @@
 struct location {
 	LIST_HEAD(struct location);
 
-	struct list_head frames;
+	LIST_OF(struct frame) frames;
 	struct download download;
 	struct view_state vs;
 };
@@ -16,7 +16,8 @@ struct location {
 
 void copy_location(struct location *, struct location *);
 
-/* You probably want to call del_from_history() first! */
+/** You probably want to call del_from_history() first!
+ * @relates location */
 void destroy_location(struct location *);
 
 #endif
diff --git a/src/session/session.c b/src/session/session.c
index d0d4e81c..8fd4b5ec 100644
--- a/src/session/session.c
+++ b/src/session/session.c
@@ -1,4 +1,5 @@
-/* Sessions managment - you'll find things here which you wouldn't expect */
+/** Sessions managment - you'll find things here which you wouldn't expect
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -64,7 +65,7 @@ struct file_to_load {
 	struct download download;
 };
 
-/* This structure and related functions are used to maintain information
+/** This structure and related functions are used to maintain information
  * for instances opened in new windows. We store all related session info like
  * URI and base session to clone from so that when the new instance connects
  * we can look up this information. In case of failure the session information
@@ -84,7 +85,7 @@ struct session_info {
 #define file_to_load_is_active(ftl) ((ftl)->req_sent && is_in_progress_state((ftl)->download.state))
 
 
-INIT_LIST_HEAD(sessions);
+INIT_LIST_OF(struct session, sessions);
 
 enum remote_session_flags remote_session_flags;
 
@@ -96,7 +97,7 @@ static struct file_to_load *request_additional_file(struct session *,
 static window_handler_T tabwin_func;
 
 
-static INIT_LIST_HEAD(session_info);
+static INIT_LIST_OF(struct session_info, session_info);
 static int session_info_id = 1;
 
 static struct session_info *
@@ -139,7 +140,7 @@ done_saved_session_info(void)
 		done_session_info(session_info.next);
 }
 
-/* Timer callback for @info->timer.  As explained in @install_timer,
+/** Timer callback for session_info.timer.  As explained in install_timer(),
  * this function must erase the expired timer ID from all variables.  */
 static void
 session_info_timeout(int id)
@@ -227,6 +228,7 @@ get_master_session(void)
 	return NULL;
 }
 
+/** @relates session */
 struct download *
 get_current_download(struct session *ses)
 {
@@ -440,7 +442,7 @@ load_frames(struct session *ses, struct document_view *doc_view)
 	}
 }
 
-/* Timer callback for @ses->display_timer.  As explained in @install_timer,
+/** Timer callback for session.display_timer.  As explained in install_timer(),
  * this function must erase the expired timer ID from all variables.  */
 void
 display_timer(struct session *ses)
@@ -474,7 +476,7 @@ struct questions_entry {
 	void *data;
 };
 
-INIT_LIST_HEAD(questions_queue);
+INIT_LIST_OF(struct questions_entry, questions_queue);
 
 
 void
@@ -699,9 +701,9 @@ request_additional_file(struct session *ses, unsigned char *name, struct uri *ur
 }
 
 static void
-load_additional_file(struct file_to_load *ftl, struct document_view *doc_view,
-		     enum cache_mode cache_mode)
+load_additional_file(struct file_to_load *ftl, enum cache_mode cache_mode)
 {
+	struct document_view *doc_view = current_frame(ftl->ses);
 	struct uri *referrer = doc_view && doc_view->document
 			     ? doc_view->document->uri : NULL;
 
@@ -719,15 +721,12 @@ process_file_requests(struct session *ses)
 		int more = 0;
 
 		foreach (ftl, ses->more_files) {
-			struct document_view *doc_view;
-
 			if (ftl->req_sent)
 				continue;
 
 			ftl->req_sent = 1;
 
-			doc_view = current_frame(ses);
-			load_additional_file(ftl, doc_view, CACHE_MODE_NORMAL);
+			load_additional_file(ftl, CACHE_MODE_NORMAL);
 			more = 1;
 		}
 
@@ -744,7 +743,7 @@ dialog_goto_url_open(void *data)
 	dialog_goto_url((struct session *) data, NULL);
 }
 
-/* Returns 0 if the first session was not properly initialized and
+/** @returns 0 if the first session was not properly initialized and
  * setup_session() should be called on the session as well. */
 static int
 setup_first_session(struct session *ses, struct uri *uri)
@@ -824,7 +823,7 @@ setup_first_session(struct session *ses, struct uri *uri)
 	return 0;
 }
 
-/* First load the current URI of the base session. In most cases it will just
+/** First load the current URI of the base session. In most cases it will just
  * be fetched from the cache so that the new tab will not appear ``empty' while
  * loading the real URI or showing the goto URL dialog. */
 static void
@@ -851,6 +850,7 @@ setup_session(struct session *ses, struct uri *uri, struct session *base)
 	}
 }
 
+/** @relates session  */
 struct session *
 init_session(struct session *base_session, struct terminal *term,
 	     struct uri *uri, int in_background)
@@ -978,7 +978,8 @@ init_remote_session(struct session *ses, enum remote_session_flags *remote_ptr,
 
 
 struct string *
-encode_session_info(struct string *info, struct list_head *url_list)
+encode_session_info(struct string *info,
+		    LIST_OF(struct string_list_item) *url_list)
 {
 	struct string_list_item *url;
 
@@ -993,7 +994,7 @@ encode_session_info(struct string *info, struct list_head *url_list)
 	return info;
 }
 
-/* Older elinks versions (up to and including 0.9.1) sends no magic variable and if
+/** Older elinks versions (up to and including 0.9.1) sends no magic variable and if
  * this is detected we fallback to the old session info format. For this format
  * the magic member of terminal_info hold the length of the URI string. The
  * old format is handled by the default label in the switch.
@@ -1002,12 +1003,11 @@ encode_session_info(struct string *info, struct list_head *url_list)
  * terminal_info data member. The magic variable controls how to interpret
  * the fields:
  *
- *	INTERLINK_NORMAL_MAGIC means use the terminal_info session_info
+ *    -	INTERLINK_NORMAL_MAGIC means use the terminal_info session_info
  *	variable as an id for a saved session.
  *
- *	INTERLINK_REMOTE_MAGIC means use the terminal_info session_info
+ *    -	INTERLINK_REMOTE_MAGIC means use the terminal_info session_info
  *	variable as the remote session flags. */
-
 int
 decode_session_info(struct terminal *term, struct terminal_info *info)
 {
@@ -1194,7 +1194,6 @@ reload(struct session *ses, enum cache_mode cache_mode)
 	if (have_location(ses)) {
 		struct location *loc = cur_loc(ses);
 		struct file_to_load *ftl;
-		struct document_view *doc_view = current_frame(ses);
 
 #ifdef CONFIG_ECMASCRIPT
 		loc->vs.ecmascript_fragile = 1;
@@ -1217,7 +1216,7 @@ reload(struct session *ses, enum cache_mode cache_mode)
 			ftl->download.data = ftl;
 			ftl->download.callback = (download_callback_T *) file_loading_callback;
 
-			load_additional_file(ftl, doc_view, cache_mode);
+			load_additional_file(ftl, cache_mode);
 		}
 	}
 }
@@ -1282,9 +1281,10 @@ tabwin_func(struct window *tab, struct term_event *ev)
 	}
 }
 
-/*
- * Gets the url being viewed by this session. Writes it into str.
- * A maximum of str_size bytes (including null) will be written.
+/**
+ * Gets the url being viewed by this session. Writes it into @a str.
+ * A maximum of @a str_size bytes (including null) will be written.
+ * @relates session
  */
 unsigned char *
 get_current_url(struct session *ses, unsigned char *str, size_t str_size)
@@ -1307,9 +1307,10 @@ get_current_url(struct session *ses, unsigned char *str, size_t str_size)
 	return safe_strncpy(str, struri(uri), length + 1);
 }
 
-/*
- * Gets the title of the page being viewed by this session. Writes it into str.
- * A maximum of str_size bytes (including null) will be written.
+/**
+ * Gets the title of the page being viewed by this session. Writes it into
+ * @a str.  A maximum of @a str_size bytes (including null) will be written.
+ * @relates session
  */
 unsigned char *
 get_current_title(struct session *ses, unsigned char *str, size_t str_size)
@@ -1326,9 +1327,10 @@ get_current_title(struct session *ses, unsigned char *str, size_t str_size)
 	return NULL;
 }
 
-/*
- * Gets the url of the link currently selected. Writes it into str.
- * A maximum of str_size bytes (including null) will be written.
+/**
+ * Gets the url of the link currently selected. Writes it into @a str.
+ * A maximum of @a str_size bytes (including null) will be written.
+ * @relates session
  */
 unsigned char *
 get_current_link_url(struct session *ses, unsigned char *str, size_t str_size)
@@ -1342,9 +1344,10 @@ get_current_link_url(struct session *ses, unsigned char *str, size_t str_size)
 	return safe_strncpy(str, link->where ? link->where : link->where_img, str_size);
 }
 
-/* get_current_link_name: returns the name of the current link
- * (the text between <A> and </A>), str is a preallocated string,
- * str_size includes the null char. */
+/** get_current_link_name: returns the name of the current link
+ * (the text between <A> and </A>), @a str is a preallocated string,
+ * @a str_size includes the null char.
+ * @relates session */
 unsigned char *
 get_current_link_name(struct session *ses, unsigned char *str, size_t str_size)
 {
@@ -1378,12 +1381,14 @@ get_current_link_in_view(struct document_view *doc_view)
 	return link && !link_is_form(link) ? link : NULL;
 }
 
+/** @relates session */
 struct link *
 get_current_session_link(struct session *ses)
 {
 	return get_current_link_in_view(current_frame(ses));
 }
 
+/** @relates session */
 int
 eat_kbd_repeat_count(struct session *ses)
 {
diff --git a/src/session/session.h b/src/session/session.h
index 55d37d9f..3b18dd1d 100644
--- a/src/session/session.h
+++ b/src/session/session.h
@@ -20,7 +20,7 @@ struct terminal;
 struct uri;
 struct window;
 
-/* Used by delayed_open and delayed_goto_uri_frame. */
+/** Used by delayed_open() and delayed_goto_uri_frame(). */
 struct delayed_open {
 	struct session *ses;
 	struct uri *uri;
@@ -37,7 +37,7 @@ enum remote_session_flags {
 	SES_REMOTE_INFO_BOX = 64,
 };
 
-/* This is generic frame descriptor, meaningful mainly for ses_*_frame*(). */
+/** This is generic frame descriptor, meaningful mainly for ses_*_frame*(). */
 struct frame {
 	LIST_HEAD(struct frame);
 
@@ -47,22 +47,22 @@ struct frame {
 	struct view_state vs;
 };
 
-/* Use for keyboard prefixes. */
+/** Use for keyboard prefixes. */
 struct kbdprefix {
-	/* This is the repeat count being inserted by user so far. It is stored
-	 * intermediately per-session. */
+	/** This is the repeat count being inserted by user so far.
+	 * It is stored intermediately per-session. */
 	int repeat_count;
 
 #ifdef CONFIG_MARKS
-	/* If the previous key was a mark prefix, this describes what kind of
-	 * action are we supposed to do when we receive the next key. */
+	/** If the previous key was a mark prefix, this describes what kind
+	 * of action are we supposed to do when we receive the next key. */
 	enum { KP_MARK_NOTHING, KP_MARK_SET, KP_MARK_GOTO } mark;
 #endif
 };
 
 struct session;
 
-/* This describes, what are we trying to do right now. We pass this around so
+/** This describes, what are we trying to do right now. We pass this around so
  * that we can use generic scheduler routines and when the control will get
  * back to our subsystem, we will know what are we up to. */
 enum task_type {
@@ -104,10 +104,10 @@ struct session_status {
 	struct led *ecmascript_led;
 	struct led *popup_led;
 #endif
-	/* Has the tab been visited yet. */
+	/** Has the tab been visited yet. */
 	unsigned int visited:1;
 
-	/* Is processing file requests. */
+	/** Is processing file requests. */
 	unsigned int processing_file_requests:1;
 	unsigned int show_tabs_bar_at_top:1;
 };
@@ -123,7 +123,7 @@ enum navigate_mode {
 	NAVIGATE_CURSOR_ROUTING,
 };
 
-/* This is one of the building stones of ELinks architecture --- this structure
+/** This is one of the building stones of ELinks architecture --- this structure
  * carries information about the specific ELinks session. Each tab (thus, at
  * least one per terminal, in the normal case) has its own session. Session
  * describes mainly the current browsing and control state, from the currently
@@ -133,19 +133,22 @@ struct session {
 	LIST_HEAD(struct session);
 
 
-	/* The vital session data */
+	/** @name The vital session data
+	 * @{ */
 
 	struct window *tab;
 
 
-	/* Browsing history */
+	/** @} @name Browsing history
+	 * @{ */
 
 	struct ses_history history;
 
 
-	/* The current document */
+	/** @} @name The current document
+	 * @{ */
 
-	struct list_head more_files; /* -> struct file_to_load */
+	LIST_OF(struct file_to_load) more_files;
 
 	struct download loading;
 	struct uri *loading_uri;
@@ -154,35 +157,38 @@ struct session {
 	int redirect_cnt;
 
 	struct document_view *doc_view;
-	struct list_head scrn_frames; /* -> struct document_view */
+	LIST_OF(struct document_view) scrn_frames;
 
 	struct uri *download_uri;
 
-	/* The URI which is the referrer to the current loaded document or NULL
-	 * if there are no referrer. */
-	/* The @referrer members sole purpose is to have the information handy
-	 * when loading URIs. It is not 'filtered' in anyway at this level only
-	 * at the lower ones. */
+	/** The URI which is the referrer to the current loaded document
+	 * or NULL if there are no referrer.
+	 *
+	 * The @c referrer member's sole purpose is to have the information
+	 * handy when loading URIs. It is not 'filtered' in anyway at this
+	 * level only at the lower ones. */
 	struct uri *referrer;
 
 
-	/* The current action-in-progress selector */
+	/** @} @name The current action-in-progress selector
+	 * @{ */
 
 	struct session_task task;
 
 
-	/* The current browsing state */
+	/** @} @name The current browsing state
+	 * @{ */
 
 	int search_direction;
 	struct kbdprefix kbdprefix;
 	int exit_query;
 	timer_id_T display_timer;
 
-	/* The text input form insert mode. It is a tristate controlled by the
+	/** The text input form insert mode. It is a tristate controlled by the
 	 * boolean document.browse.forms.insert_mode option. When disabled we
-	 * use mode less insertion and we always insert stuff into the text
+	 * use modeless insertion and we always insert stuff into the text
 	 * input field. When enabled it is possible to switch insertion on and
-	 * off using ACT_EDIT_ENTER and *_CANCEL. */
+	 * off using ::ACT_EDIT_ENTER and *_CANCEL. */
 	enum insert_mode insert_mode;
 
 	enum navigate_mode navigate_mode;
@@ -191,28 +197,32 @@ struct session {
 	unsigned char *last_search_word;
 
 
-	/* The possibly running type queries (what-to-do-with-that-file?) */
-	struct list_head type_queries; /* -> struct type_query */
+	/** The possibly running type queries (what-to-do-with-that-file?) */
+	LIST_OF(struct type_query) type_queries;
 
-	/* The info for status displaying */
+	/** The info for status displaying */
 	struct session_status status;
+
+	/** @} */
 };
 
-extern struct list_head sessions; /* -> struct session */
+extern LIST_OF(struct session) sessions;
 extern enum remote_session_flags remote_session_flags;
 
-/* This returns a pointer to the current location inside of the given session.
- * That's nice for encapsulation and alrady paid out once ;-). */
+/** This returns a pointer to the current location inside of the given session.
+ * That's nice for encapsulation and already paid out once ;-). */
 #define cur_loc(x) ((x)->history.current)
 
-/* Return if we have anything being loaded in this session already. */
+/** Return if we have anything being loaded in this session already.
+ * @relates session */
 static inline int
 have_location(struct session *ses) {
 	return !!cur_loc(ses);
 }
 
-/* Swaps the current session referrer with the new one passed as @referrer */
-/* @referrer may be NULL */
+/** Swaps the current session referrer with the new one passed as @a referrer.
+ * @a referrer may be NULL.
+ * @relates session */
 void set_session_referrer(struct session *ses, struct uri *referrer);
 
 void
@@ -221,13 +231,14 @@ print_error_dialog(struct session *ses, enum connection_state state,
 
 void process_file_requests(struct session *);
 
-struct string *encode_session_info(struct string *info, struct list_head *url_list);
+struct string *encode_session_info(struct string *info,
+				   LIST_OF(struct string_list_item) *url_list);
 
-/* Returns zero if the info was remote sessions or if it failed to create any
- * sessions. */
+/** @returns zero if the info was remote sessions or if it failed to
+ * create any sessions. */
 int decode_session_info(struct terminal *term, struct terminal_info *info);
 
-/* Registers a base session and returns it's id. Value <= 0 means error. */
+/** Registers a base session and returns its id. Value <= 0 means error. */
 int
 add_session_info(struct session *ses, struct uri *uri, struct uri *referrer,
 		 enum cache_mode cache_mode, enum task_type task);
@@ -248,12 +259,13 @@ struct frame *ses_find_frame(struct session *, unsigned char *);
 void free_files(struct session *);
 void display_timer(struct session *ses);
 
-/* session_is_loading() is like !!get_current_download() but doesn't take
- * @req_sent into account. */
-struct download *get_current_download(struct session *ses);
+/** session_is_loading() is like !!get_current_download() but doesn't take
+ * session.req_sent into account.
+ * @relates session */
 int session_is_loading(struct session *ses);
+struct download *get_current_download(struct session *ses);
 
-/* Information about the current document */
+/** Information about the current document */
 unsigned char *get_current_url(struct session *, unsigned char *, size_t);
 unsigned char *get_current_title(struct session *, unsigned char *, size_t);
 
@@ -262,13 +274,13 @@ struct link *get_current_link_in_view(struct document_view *doc_view);
 unsigned char *get_current_link_url(struct session *, unsigned char *, size_t);
 unsigned char *get_current_link_name(struct session *, unsigned char *, size_t);
 
-extern struct list_head questions_queue;
+extern LIST_OF(struct questions_entry) questions_queue;
 void add_questions_entry(void (*callback)(struct session *, void *), void *data);
 void check_questions_queue(struct session *ses);
 
 unsigned char *get_homepage_url(void);
 
-/* Returns current keyboard repeat count and reset it. */
+/** Returns current keyboard repeat count and reset it. */
 int eat_kbd_repeat_count(struct session *ses);
 
 #endif
diff --git a/src/session/task.c b/src/session/task.c
index 14694b02..d9258354 100644
--- a/src/session/task.c
+++ b/src/session/task.c
@@ -1,4 +1,5 @@
-/* Sessions task management */
+/** Sessions task management
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -106,7 +107,7 @@ post_no(void *task_)
 	done_uri(task->uri);
 }
 
-/* Check if the URI is obfuscated (bug 382). The problem is said to occur when
+/** Check if the URI is obfuscated (bug 382). The problem is said to occur when
  * a URI designed to pass access a specific location with a supplied username,
  * contains misleading chars prior to the @ symbol.
  *
@@ -279,13 +280,13 @@ ses_goto(struct session *ses, struct uri *uri, unsigned char *target_frame,
 }
 
 
-/* If @loaded_in_frame is set, this was called just to indicate a move inside a
- * frameset, and we basically just reset the appropriate frame's view_state in
+/** If @a loaded_in_frame is set, this was called just to indicate a move inside
+ * a frameset, and we basically just reset the appropriate frame's view_state in
  * that case. When clicking on a link inside a frame, the frame URI is somehow
  * updated and added to the files-to-load queue, then ses_forward() is called
- * with @loaded_in_frame unset, duplicating the whole frameset's location, then
- * later the file-to-load callback calls it for the particular frame with
- * @loaded_in_frame set. */
+ * with @a loaded_in_frame unset, duplicating the whole frameset's location,
+ * then later the file-to-load callback calls it for the particular frame with
+ * @a loaded_in_frame set. */
 struct view_state *
 ses_forward(struct session *ses, int loaded_in_frame)
 {
diff --git a/src/session/task.h b/src/session/task.h
index f61747bb..08caff60 100644
--- a/src/session/task.h
+++ b/src/session/task.h
@@ -10,8 +10,8 @@ struct terminal;
 struct view_state;
 struct uri;
 
-/* This is for map_selected(), it is used to pass around information about
- * in-imagemap links. */
+/** This is for map_selected(), it is used to pass around information
+ * about in-imagemap links. */
 struct link_def {
 	unsigned char *link;
 	unsigned char *target;
diff --git a/src/terminal/color.c b/src/terminal/color.c
index 8112628d..e0e5b715 100644
--- a/src/terminal/color.c
+++ b/src/terminal/color.c
@@ -1,4 +1,5 @@
-/* Terminal color composing. */
+/** Terminal color composing.
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -51,11 +52,12 @@ color_distance(const struct rgb *c1, const struct rgb *c2)
 #define RGB_HASH_SIZE		4096
 #define HASH_RGB(color, l)	((RGBCOLOR(color) + (l)) & (RGB_HASH_SIZE - 1))
 
-/* Initialize a rgb struct from a color_T */
+/** Initialize a rgb struct from a color_T
+ * @relates rgb */
 #define INIT_RGB(color) \
 	{ RED_COLOR(color), GREEN_COLOR(color), BLUE_COLOR(color) }
 
-/* Locates the nearest terminal color. */
+/** Locates the nearest terminal color. */
 static inline unsigned char
 get_color(color_T color, const struct rgb *palette, int level)
 {
@@ -109,9 +111,9 @@ get_color(color_T color, const struct rgb *palette, int level)
 #undef GREEN_COLOR_MASK
 #undef BLUE_COLOR_MASK
 
-/* Controls what color ranges to use when setting the terminal color. */
-/* TODO: Part of the 256 color palette is gray scale, maybe we could experiment
- * with a grayscale mode. ;) --jonas */
+/** Controls what color ranges to use when setting the terminal color.
+ * @todo TODO: Part of the 256 color palette is gray scale, maybe we
+ * could experiment with a grayscale mode. ;) --jonas */
 enum palette_range {
        PALETTE_FULL = 0,
        PALETTE_HALF,
@@ -173,7 +175,8 @@ static const struct color_mode_info *const color_modes[] = {
 	 * only if CONFIG_TRUE_COLOR is not defined.  */
 	/* COLOR_MODE_TRUE_COLOR */ &color_mode_16,
 };
-/* Get a compile-time error if the array has the wrong size.  */
+/** Get a compile-time error if the ::color_modes array has the wrong
+ * size.  */
 typedef int assert_enough_color_modes[
 	(sizeof(color_modes) / sizeof(color_modes[0]) == COLOR_MODES)
 	? 1 : -1];
@@ -191,9 +194,11 @@ typedef int assert_enough_color_modes[
  *
  * Bright colors will be rendered bold. */
 
-/* This table is based mostly on wild guesses of mine. Feel free to
+/** Map foreground colors to more visible ones on various backgrounds.
+ * Use like: fg = fg_color[fg][bg];
+ *
+ * This table is based mostly on wild guesses of mine. Feel free to
  * correct it. --pasky */
-/* Indexed by [fg][bg]->fg: */
 static const unsigned char fg_color[16][8] = {
 	/* bk  r  gr  br  bl   m   c   w */
 
@@ -231,7 +236,7 @@ static const unsigned char fg_color[16][8] = {
 	{ 15, 15, 15, 15, 15, 15, 15, 15 },
 };
 
-/* When determining wether to use negative image we make the most significant
+/* When determining whether to use negative image we make the most significant
  * be least significant. */
 #define CMPCODE(c) (((c) << 1 | (c) >> 2) & TERM_COLOR_MASK)
 #define use_inverse(bg, fg) CMPCODE(fg & TERM_COLOR_MASK) < CMPCODE(bg)
diff --git a/src/terminal/color.h b/src/terminal/color.h
index 5ab55bb8..4ce8d31b 100644
--- a/src/terminal/color.h
+++ b/src/terminal/color.h
@@ -21,26 +21,27 @@ struct screen_char;
 #define TERM_COLOR_FOREGROUND_16(color) ((color)[0] & TERM_COLOR_MASK)
 #define TERM_COLOR_BACKGROUND_16(color) (((color)[0] >> 4) & TERM_COLOR_MASK)
 
-/* Bit flags to control how the colors are handled. */
+/** Bit flags to control how the colors are handled. */
 enum color_flags {
-	/* Use a decreased color range. */
+	/** Use a decreased color range. */
 	COLOR_DECREASE_LIGHTNESS = 1,
 
-	/* Mangle the color to stand out if attributes like underline are set.
-	 * Useful for terminals that doesn't support these attributes.  */
+	/** Mangle the color to stand out if attributes like underline are set.
+	 * Useful for terminals that don't support these attributes.  */
 	COLOR_ENHANCE_UNDERLINE = 2,
 
-	/* Adjust the forground color to be more readable by increasing the
+	/** Adjust the foreground color to be more readable by increasing the
 	 * contrast. */
 	COLOR_INCREASE_CONTRAST = 4,
 
-	/* Adjust the contrast if the back- and foregroundcolor is equal.
+	/** Adjust the contrast if the back- and foregroundcolor is equal.
 	 * If inverting should be done also pass the latter flag. */
 	COLOR_ENSURE_CONTRAST = 8,
 	COLOR_ENSURE_INVERTED_CONTRAST = 16,
 };
 
-/* These numbers are used in the terminal._template_.colors and
+/** How many colors the terminal supports.
+ * These numbers are used in the terminal._template_.colors and
  * document.dump.color_mode options.  They should be kept stable so
  * that configuration files are portable between ELinks versions.
  * Any unsupported modes should be treated as COLOR_MODE_16.
@@ -65,10 +66,12 @@ enum color_mode {
 inline void set_term_color16(struct screen_char *schar, enum color_flags flags,
 			     unsigned char fg, unsigned char bg);
 
-/* Mixes the color pair and attributes to a terminal text color. */
-/* If @flags has masked in the COLOR_INCREASE_CONTRAST the foreground color will
- * be adjusted. */
-/* XXX: @schar may not be NULL and is modified adding stuff like boldness. */
+/** Mixes the color pair and attributes to a terminal text color.
+ * If @a flags has masked in the ::COLOR_INCREASE_CONTRAST the
+ * foreground color will be adjusted.
+ *
+ * XXX: @a schar may not be NULL and is modified adding stuff like
+ * boldness. */
 void set_term_color(struct screen_char *schar, struct color_pair *pair,
 		    enum color_flags flags, enum color_mode mode);
 
diff --git a/src/terminal/draw.c b/src/terminal/draw.c
index a41ad427..6deb72a0 100644
--- a/src/terminal/draw.c
+++ b/src/terminal/draw.c
@@ -1,4 +1,5 @@
-/* Public terminal drawing API. Frontend for the screen image in memory. */
+/** Public terminal drawing API. Frontend for the screen image in memory.
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -15,7 +16,7 @@
 #include "util/color.h"
 #include "util/box.h"
 
-/* Makes sure that @x and @y are within the dimensions of the terminal. */
+/** Makes sure that @a x and @a y are within the dimensions of the terminal. */
 #define check_range(term, x, y) \
 	do { \
 		int_bounds(&(x), 0, (term)->width - 1); \
@@ -104,7 +105,7 @@ draw_char_color(struct terminal *term, int x, int y, struct color_pair *color)
 	set_screen_dirty(term->screen, y, y);
 }
 
-/* The data parameter here is like screen_char.data: UCS-4 if the
+/*! The @a data parameter here is like screen_char.data: UCS-4 if the
  * charset of the terminal is UTF-8 (possible only if CONFIG_UTF8 is
  * defined), and a byte otherwise.  */
 void
@@ -139,8 +140,8 @@ draw_char_data(struct terminal *term, int x, int y, unsigned char data)
 	set_screen_dirty(term->screen, y, y);
 }
 
-/* Updates a line in the terms screen. */
-/* When doing frame drawing @x can be different than 0. */
+/*! Used by viewer to copy over a document.
+ * When doing frame drawing @a x can be different than 0. */
 void
 draw_line(struct terminal *term, int x, int y, int l, struct screen_char *line)
 {
@@ -258,8 +259,10 @@ draw_border(struct terminal *term, struct box *box,
 }
 
 #ifdef CONFIG_UTF8
-/* Checks cells left and right to the box for broken double-width chars.
+/** Checks cells left and right to the box for broken double-width chars.
  * Replace it with UCS_ORPHAN_CELL.
+ *
+ * @verbatim
  * 1+---+3
  * 1|box|##4
  * 1|   |##4
@@ -267,6 +270,7 @@ draw_border(struct terminal *term, struct box *box,
  * 1+---+##4
  *   2#####4
  * 1,2,3,4 - needs to be checked, # - shadow , +,-,| - border
+ * @endverbatim
  */
 void
 fix_dwchar_around_box(struct terminal *term, struct box *box, int border,
diff --git a/src/terminal/draw.h b/src/terminal/draw.h
index 83405a28..988a27b0 100644
--- a/src/terminal/draw.h
+++ b/src/terminal/draw.h
@@ -7,6 +7,7 @@ struct color_pair;
 struct box;
 struct terminal;
 
+/** How many bytes we need for the colors of one character cell.  */
 #if defined(CONFIG_TRUE_COLOR)
 /* 0, 1, 2 - rgb foreground; 3, 4, 5 - rgb background */
 #define SCREEN_COLOR_SIZE	6
@@ -17,8 +18,10 @@ struct terminal;
 #define SCREEN_COLOR_SIZE	1
 #endif
 
-/* All attributes should fit inside an unsigned char. */
-/* XXX: The bold mask is used as part of the color encoding. */
+/** Attributes of a character on the screen.
+ * All attributes should fit inside an unsigned char.
+ *
+ * XXX: The bold mask is used as part of the color encoding. */
 enum screen_char_attr {
 	SCREEN_ATTR_UNSEARCHABLE = 0x01,
 	SCREEN_ATTR_BOLD	= 0x08,
@@ -28,41 +31,44 @@ enum screen_char_attr {
 	SCREEN_ATTR_FRAME	= 0x80,
 };
 
-/* One position in the terminal screen's image. */
+/** One position in the terminal screen's image. */
 struct screen_char {
-	/* Contains either character value or frame data.
-	 * If @attr includes SCREEN_ATTR_FRAME, then @data is enum
-	 * border_char; otherwise, @data is a character value.
-	 * If the charset of the terminal is UTF-8 (which is possible
-	 * only if CONFIG_UTF8 is defined), then the character value
-	 * is in UCS-4; otherwise, the charset is assumed to be
-	 * unibyte, and the character value is a byte in that
-	 * charset.  */
+	/** Contains either character value or frame data.
+	 * - If #attr includes ::SCREEN_ATTR_FRAME, then @c data is
+	 *   enum border_char.
+	 * - Otherwise, if the charset of the terminal is UTF-8, then
+	 *   @c data is a character value in UCS-4.  This is possible
+	 *   only if CONFIG_UTF8 is defined.
+	 * - Otherwise, the charset of the terminal is assumed to be
+	 *   unibyte, and @c data is a byte in that charset.  */
 #ifdef CONFIG_UTF8
 	unicode_val_T data;
 #else
 	unsigned char data;
 #endif /* CONFIG_UTF8 */
 
-	/* Attributes are screen_char_attr bits. */
+	/** Attributes are ::screen_char_attr bits. */
 	unsigned char attr;
 
-	/* The fore- and background color. */
+	/** The fore- and background color. */
 	unsigned char color[SCREEN_COLOR_SIZE];
 };
 
+/** @relates screen_char */ 
 #define copy_screen_chars(to, from, amount) \
 	do { memcpy(to, from, (amount) * sizeof(struct screen_char)); } while (0)
 
-/* Linux frame symbols table (it's magically converted to other terminals when
- * needed). */
-/* In the screen image, they have attribute SCREEN_ATTR_FRAME; you should drop them
- * to the image using draw_border_char(). */
-/* TODO: When we'll support internal Unicode, this should be changed to some
- * Unicode sequences. --pasky */
-
-/* Codes extracted from twin-0.4.6 GPL project, a Textmode WINdow environment,
- * by Massimiliano Ghilardi http://linuz.sns.it/~max/ */
+/** @name Linux frame symbols table.
+ * It is magically converted to other terminals when needed.
+ * In the screen image, they have attribute SCREEN_ATTR_FRAME;
+ * you should drop them to the image using draw_border_char().
+ *
+ * \todo TODO: When we'll support internal Unicode, this should be
+ * changed to some Unicode sequences. --pasky
+ *
+ * Codes extracted from twin-0.4.6 GPL project, a Textmode WINdow environment,
+ * by Massimiliano Ghilardi http://linuz.sns.it/~max/
+ * @{ */
 
 /* Not yet used
 #define T_UTF_16_BOX_DRAWINGS_LIGHT_VERTICAL	0x2502
@@ -149,6 +155,9 @@ struct screen_char {
 #define T_CP437_BOX_DRAWINGS_LIGHT_UP_AND_LEFT	0x00D9
 #define T_CP437_BOX_DRAWINGS_LIGHT_DOWN_AND_RIGHT	0x00DA
 
+/** @} */
+
+
 #define BD_LIGHT(XXX)  T_CP437_BOX_DRAWINGS_LIGHT_##XXX
 #define BD_DOUBLE(XXX) T_CP437_BOX_DRAWINGS_DOUBLE_##XXX
 #define BD_MIXED(XXX) 	T_CP437_BOX_DRAWINGS_##XXX
@@ -213,29 +222,29 @@ enum border_cross_direction {
 	BORDER_X_UP
 };
 
-/* Extracts a char from the screen. */
+/** Extracts a char from the screen. */
 struct screen_char *get_char(struct terminal *, int x, int y);
 
-/* Sets the color of a screen position. */
+/** Sets the color of a screen position. */
 void draw_char_color(struct terminal *term, int x, int y,
 		     struct color_pair *color);
 
-/* Sets the data of a screen position. */
+/** Sets the data of a screen position. */
 #ifdef CONFIG_UTF8
 void draw_char_data(struct terminal *term, int x, int y, unicode_val_T data);
 #else
 void draw_char_data(struct terminal *term, int x, int y, unsigned char data);
 #endif /* CONFIG_UTF8 */
 
-/* Sets the data to @border and of a screen position. */
+/** Sets the data to @a border and of a screen position. */
 void draw_border_char(struct terminal *term, int x, int y,
 		      enum border_char border, struct color_pair *color);
 
-/* Sets the cross position of two borders. */
+/** Sets the cross position of two borders. */
 void draw_border_cross(struct terminal *, int x, int y,
 		       enum border_cross_direction, struct color_pair *color);
 
-/* Draws a char. */
+/** Draws a char. */
 #ifdef CONFIG_UTF8
 void draw_char(struct terminal *term, int x, int y,
 	       unicode_val_T data, enum screen_char_attr attr,
@@ -246,16 +255,17 @@ void draw_char(struct terminal *term, int x, int y,
 	       struct color_pair *color);
 #endif /* CONFIG_UTF8 */
 
-/* Draws area defined by @box using the same colors and attributes. */
+/** Draws area defined by @a box using the same colors and attributes. */
 void draw_box(struct terminal *term, struct box *box,
 	      unsigned char data, enum screen_char_attr attr,
 	      struct color_pair *color);
 
-/* Draws a shadow of @width and @height with color @color around @box. */
+/** Draws a shadow of @a width and @a height with color @a color
+ * around @a box. */
 void draw_shadow(struct terminal *term, struct box *box,
 		 struct color_pair *color, int width, int height);
 
-/* Draw borders. */
+/** Draw borders. */
 void draw_border(struct terminal *term, struct box *box,
 		 struct color_pair *color, int width);
 
@@ -264,23 +274,22 @@ void fix_dwchar_around_box(struct terminal *term, struct box *box, int border,
 			   int shadow_width, int shadow_height);
 #endif /* CONFIG_UTF8 */
 
-/* Draws @length chars from @text. */
+/** Draws @a length chars from @a text. */
 void draw_text(struct terminal *term, int x, int y,
 	       unsigned char *text, int length,
 	       enum screen_char_attr attr,
 	       struct color_pair *color);
 
-/* Draws @length chars from @line on the screen. */
-/* Used by viewer to copy over a document. */
+/** Draws @a length chars from @a line on the screen.  */
 void draw_line(struct terminal *term, int x, int y, int length,
 	       struct screen_char *line);
 
-/* Updates the terminals cursor position. When @blockable is set the
+/** Updates the terminals cursor position. When @a blockable is set the
  * block_cursor terminal option decides whether the cursor should be put at the
  * bottom right corner of the screen. */
 void set_cursor(struct terminal *term, int x, int y, int blockable);
 
-/* Blanks the screen. */
+/** Blanks the screen. */
 void clear_terminal(struct terminal *);
 
 #endif
diff --git a/src/terminal/event.c b/src/terminal/event.c
index 5922727d..2030244e 100644
--- a/src/terminal/event.c
+++ b/src/terminal/event.c
@@ -1,4 +1,5 @@
-/* Event system support routines. */
+/** Event system support routines.
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -33,18 +34,19 @@
 #include "viewer/timer.h"
 
 
-/* Information used for communication between ELinks instances */
+/** Information used for communication between ELinks instances */
 struct terminal_interlink {
-	/* How big the input queue is and how much is free */
+	/** How big the input queue is */
 	int qlen;
+	/** How much is free */
 	int qfreespace;
 
-	/* UTF8 input key value decoding data. */
+	/** UTF-8 input key value decoding data. */
 	struct {
 		unicode_val_T ucs;
 		int len;
 		unicode_val_T min;
-		/* Modifier keys from the key event that carried the
+		/** Modifier keys from the key event that carried the
 		 * first byte of the character.  We need this because
 		 * ELinks sees e.g. ESC U+00F6 as 0x1B 0xC3 0xB6 and
 		 * converts it to Alt-0xC3 0xB6, attaching the
@@ -52,8 +54,8 @@ struct terminal_interlink {
 		term_event_modifier_T modifier;
 	} utf8;
 
-	/* This is the queue of events as coming from the other ELinks instance
-	 * owning the hosting terminal. */
+	/** This is the queue of events as coming from the other
+	 * ELinks instance owning the hosting terminal. */
 	unsigned char input_queue[1];
 };
 
diff --git a/src/terminal/event.h b/src/terminal/event.h
index 8599b55c..9de3ce1e 100644
--- a/src/terminal/event.h
+++ b/src/terminal/event.h
@@ -12,6 +12,7 @@ struct terminal;
 #define MAX_CWD_LEN	256	/* this must be multiple of 8! (alignment problems) */
 
 
+/** Type of an event received from a terminal.  */
 enum term_event_type {
 	EVENT_INIT,
 	EVENT_KBD,
@@ -21,34 +22,40 @@ enum term_event_type {
 	EVENT_ABORT,
 };
 
+/** An event received from a terminal.  This type can be changed
+ * without breaking interlink compatibility.  */
 struct term_event {
 	enum term_event_type ev;
 
 	union {
-		/* EVENT_MOUSE */
+		/** ::EVENT_MOUSE */
 		struct term_event_mouse mouse;
 
-		/* EVENT_KBD */
+		/** ::EVENT_KBD */
 		struct term_event_keyboard keyboard;
 
-		/* EVENT_INIT, EVENT_RESIZE, EVENT_REDRAW */
+		/** ::EVENT_INIT, ::EVENT_RESIZE, ::EVENT_REDRAW */
 		struct term_event_size {
 			int width, height;
 		} size;
 	} info;
 };
 
+/** An event transferred via the interlink socket.  This is quite
+ * similar to struct term_event but has a different format for
+ * keyboard events.  If you change this type, you can break interlink
+ * compatibility.  */
 struct interlink_event {
 	enum term_event_type ev;
 
 	union {
-		/* EVENT_MOUSE */
+		/* ::EVENT_MOUSE */
 		struct interlink_event_mouse mouse;
 
-		/* EVENT_KBD */
+		/* ::EVENT_KBD */
 		struct interlink_event_keyboard keyboard;
 
-		/* EVENT_INIT, EVENT_RESIZE, EVENT_REDRAW */
+		/* ::EVENT_INIT, ::EVENT_RESIZE, ::EVENT_REDRAW */
 #define interlink_event_size term_event_size
 		struct interlink_event_size size;
 	} info;
@@ -79,10 +86,12 @@ set_kbd_term_event(struct term_event *ev, int key,
 	kbd_set(&ev->info.keyboard, key, modifier);
 }
 
-/* @key can be either an 8-bit byte or a value from enum term_event_special_key.
- * In the latter case, this function negates the value, unless it is KBD_UNDEF.
- * For example, key == KBD_ENTER results in ev->info.keyboard.key = -KBD_ENTER.
- * This mapping keeps the interlink protocol compatible with ELinks 0.11.  */
+/** Initialize @c ev as an interlink keyboard event.
+ * @a key can be either an 8-bit byte or a value from enum
+ * term_event_special_key.  In the latter case, this function negates
+ * the value, unless it is KBD_UNDEF.  For example, key == KBD_ENTER
+ * results in ev->info.keyboard.key = -KBD_ENTER.  This mapping keeps
+ * the interlink protocol compatible with ELinks 0.11.  */
 static inline void
 set_kbd_interlink_event(struct interlink_event *ev, int key,
 			term_event_modifier_T modifier)
@@ -126,32 +135,34 @@ set_wh_interlink_event(struct interlink_event *ev, enum term_event_type type, in
 #define set_resize_interlink_event(ev, w, h) set_wh_interlink_event(ev, EVENT_RESIZE, w, h)
 
 
-/* This holds the information used when handling the initial connection between
- * a dumb and master terminal. */
-/* XXX: We might be connecting to an older ELinks or an older ELinks is
+/** This holds the information used when handling the initial
+ * connection between a dumb and master terminal.
+ *
+ * XXX: We might be connecting to an older ELinks or an older ELinks is
  * connecting to a newer ELinks master so for the sake of compatibility it
  * would be unwise to just change the layout of the struct. If you do have to
  * add new members add them at the bottom and use magic variables to
  * distinguish them when decoding the terminal info. */
 struct terminal_info {
-	struct interlink_event event;		/* The EVENT_INIT event */
-	unsigned char name[MAX_TERM_LEN];	/* $TERM environment name */
-	unsigned char cwd[MAX_CWD_LEN];		/* Current working directory */
-	int system_env;				/* System info (X, screen) */
-	int length;				/* Length of @data member */
-	int session_info;			/* Value depends on @magic */
-	int magic;				/* Identity of the connector */
+	struct interlink_event event;		/**< The ::EVENT_INIT event */
+	unsigned char name[MAX_TERM_LEN];	/**< $TERM environment name */
+	unsigned char cwd[MAX_CWD_LEN];		/**< Current working directory */
+	int system_env;				/**< System info (X, screen) */
+	int length;				/**< Length of #data member */
+	int session_info;			/**< Value depends on #magic */
+	int magic;				/**< Identity of the connector */
 
-	/* In the master that is connected to all bytes after @data will be
-	 * interpreted as URI string information. */
+	/** In the master that is connected to all bytes after @c data
+	 * will be interpreted as URI string information. */
 	unsigned char data[1];
 };
 
-/* The @data member has to have size of one for portability but it can be
- * empty/zero so when reading and writing it we need to ignore the byte. */
+/** The terminal_info.data member has to have size of one for
+ * portability but it can be empty/zero so when reading and writing it
+ * we need to ignore the byte. */
 #define TERMINAL_INFO_SIZE offsetof(struct terminal_info, data)
 
-/* We use magic numbers to signal the identity of the dump client terminal.
+/** We use magic numbers to signal the identity of the dump client terminal.
  * Magic numbers are composed by the INTERLINK_MAGIC() macro. It is a negative
  * magic to be able to distinguish the oldest format from the newer ones. */
 #define INTERLINK_MAGIC(major, minor) -(((major) << 8) + (minor))
@@ -162,7 +173,8 @@ struct terminal_info {
 void term_send_event(struct terminal *, struct term_event *);
 void in_term(struct terminal *);
 
-/* For keyboard events handling */
+/** @name For keyboard events handling
+ * @{ */
 #define get_kbd_key(event)		(kbd_get_key(&(event)->info.keyboard))
 #define check_kbd_key(event, key)	(kbd_key_is(&(event)->info.keyboard, (key)))
 
@@ -171,9 +183,11 @@ void in_term(struct terminal *);
 
 #define check_kbd_textinput_key(event)	(get_kbd_key(event) >= ' ' && check_kbd_modifier(event, KBD_MOD_NONE))
 #define check_kbd_label_key(event)	(get_kbd_key(event) > ' ' && (check_kbd_modifier(event, KBD_MOD_NONE) || check_kbd_modifier(event, KBD_MOD_ALT)))
+/** @} */
 
 
-/* For mouse events handling */
+/** @name For mouse events handling
+ * @{ */
 #define get_mouse_action(event)		 (mouse_get_action(&(event)->info.mouse))
 #define check_mouse_action(event, value) (mouse_action_is(&(event)->info.mouse, (value)))
 
@@ -183,6 +197,7 @@ void in_term(struct terminal *);
 
 #define check_mouse_position(event, box) \
 	mouse_is_in_box(&(event)->info.mouse, box)
+/** @} */
 
 
 #endif /* EL__TERMINAL_EVENT_H */
diff --git a/src/terminal/hardio.c b/src/terminal/hardio.c
index 05c31f60..e3f039e3 100644
--- a/src/terminal/hardio.c
+++ b/src/terminal/hardio.c
@@ -1,4 +1,5 @@
-/* Low-level terminal-suitable I/O routines */
+/** Low-level terminal-suitable I/O routines
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/src/terminal/itrm.h b/src/terminal/itrm.h
index 53a15e99..2b5276a5 100644
--- a/src/terminal/itrm.h
+++ b/src/terminal/itrm.h
@@ -4,7 +4,7 @@
 
 #define ITRM_OUT_QUEUE_SIZE	16384
 
-/* Currently, ELinks treats control sequences as text if they are
+/** Currently, ELinks treats control sequences as text if they are
  * longer than ITRM_IN_QUEUE_SIZE bytes.  So it should be defined
  * as greater than the length of any control sequence that ELinks
  * is expected to receive.  These are the longest so far:
@@ -15,44 +15,44 @@
 struct itrm_queue {
 	unsigned char *data;
 
-	/* The amount of data in the queue, in bytes.  This may be
+	/** The amount of data in the queue, in bytes.  This may be
 	 * less than the amount of memory allocated for the buffer;
 	 * struct itrm_queue does not keep track of that, and has
 	 * no global policy on whether the buffer can be resized.  */
 	int len;
 };
 
-/* Things coming into an itrm, whether from the terminal or from the
+/** Things coming into an itrm, whether from the terminal or from the
  * master.  */
 struct itrm_in {
-	/* A file descriptor for the standard input.  In some ports,
+	/** A file descriptor for the standard input.  In some ports,
 	 * this is the terminal device itself; in others, this is a
 	 * pipe from an input thread.  In principle, the data format
 	 * depends on the terminal.  */
 	int std;
 
-	/* In a slave process, a file descriptor for a socket from
+	/** In a slave process, a file descriptor for a socket from
 	 * which it reads data sent by the master process.  The other
 	 * end of the socket connection is terminal.fdout in the
 	 * master process.  The format of these data is almost the
-	 * same as could be sent to the terminal (via itrm.out.std),
+	 * same as could be sent to the terminal (via itrm_out.std),
 	 * but there are special commands that begin with a null byte.
 	 *
-	 * In the master process, @sock is the same as itrm.out.std,
+	 * In the master process, @c sock is the same as itrm_out.std,
 	 * but nothing actually uses it.  */
 	int sock;
 
-	/* A file descriptor for controlling the standard input.  This
-	 * is always the terminal device itself, thus the same as @std
+	/** A file descriptor for controlling the standard input.  This
+	 * is always the terminal device itself, thus the same as #std
 	 * in some ports.  ELinks doesn't read or write with this file
-	 * descriptor; it only does things like tcsetattr.  */
+	 * descriptor; it only does things like tcsetattr().  */
 	int ctl;
 
-	/* Bytes that have been received from @std but not yet
-	 * converted to events.  queue.data is allocated for
-	 * ITRM_IN_QUEUE_SIZE bytes and never resized.  The itrm
+	/** Bytes that have been received from #std but not yet
+	 * converted to events.  itrm_queue.data is allocated for
+	 * ::ITRM_IN_QUEUE_SIZE bytes and never resized.  The itrm
 	 * layer cannot parse control sequences longer than that.
-	 * Anything that modifies queue.len should also call
+	 * Anything that modifies itrm_queue.len should also call
 	 * unhandle_itrm_stdin() if the queue becomes full, or
 	 * handle_itrm_stdin() if the queue stops being full.
 	 * Those functions are internal to kbd.c.  */
@@ -62,14 +62,14 @@ struct itrm_in {
 /* Things going out from an itrm, whether to the terminal or to the
  * master.  */
 struct itrm_out {
-	/* A file descriptor for the standard output.  In some ports,
+	/** A file descriptor for the standard output.  In some ports,
 	 * this is the terminal device itself; in others, this is a
 	 * pipe to an output thread.  The data format depends on the
 	 * terminal in principle, but this has not yet been
 	 * implemented; see bug 96.  */
 	int std;
 
-	/* A file descriptor for a pipe or socket to which this
+	/** A file descriptor for a pipe or socket to which this
 	 * process sends input events.  The other end of the pipe or
 	 * socket connection is terminal.fdin in the master process.
 	 * If the connection is from the master process to itself, it
@@ -79,36 +79,36 @@ struct itrm_out {
 	 * sent.  */
 	int sock;
 
-	/* Bytes that should be written to @sock.  They will be
+	/** Bytes that should be written to #sock.  They will be
 	 * written when select() indicates the write won't block.  To
 	 * add data here, call itrm_queue_event(), which reallocates
-	 * queue.data if appropriate.  The size of this queue is
-	 * unrelated to ITRM_OUT_QUEUE_SIZE.  */
+	 * itrm_queue.data if appropriate.  The size of this queue is
+	 * unrelated to ::ITRM_OUT_QUEUE_SIZE.  */
 	struct itrm_queue queue;
 };
 
-/* A connection between a terminal and a master ELinks process.
+/** A connection between a terminal and a master ELinks process.
  * Normally, only one struct itrm exists in each master or slave
- * process, and the global pointer @ditrm (not declared here)
+ * process, and the global pointer ::ditrm (not declared here)
  * points to it.  */
 struct itrm {
-	struct itrm_in in;		/* Input */
-	struct itrm_out out;		/* Output */
+	struct itrm_in in;		/**< Input */
+	struct itrm_out out;		/**< Output */
 
-	timer_id_T timer;		/* ESC timeout timer */
-	struct termios t;		/* For restoring original attributes */
-	void *mouse_h;			/* Mouse handle */
-	unsigned char *orig_title;	/* For restoring window title */
+	timer_id_T timer;		/**< ESC timeout timer */
+	struct termios t;		/**< For restoring original attributes */
+	void *mouse_h;			/**< Mouse handle */
+	unsigned char *orig_title;	/**< For restoring window title */
 
-	unsigned int blocked:1;		/* Whether it was blocked */
-	unsigned int altscreen:1;	/* Whether to use alternate screen */
-	unsigned int touched_title:1;	/* Whether the term title was changed */
-	/* The @remote flag is not set in regular slave terminals.
+	unsigned int blocked:1;		/**< Whether it was blocked */
+	unsigned int altscreen:1;	/**< Whether to use alternate screen */
+	unsigned int touched_title:1;	/**< Whether the term title was changed */
+	/*! The @c remote flag is not set in regular slave terminals.
 	 * Instead, it means the itrm controls a preexisting terminal,
 	 * and windows should not be displayed on the terminal of the
 	 * itrm (but see bug 776: the master clears the terminal anyway);
 	 * thus the terminal init and done strings are not sent.  */
-	unsigned int remote:1;		/* Whether it is a remote session */
+	unsigned int remote:1;		/**< Whether it is a remote session */
 };
 
 #endif
diff --git a/src/terminal/kbd.c b/src/terminal/kbd.c
index 67def6ad..c9b704fe 100644
--- a/src/terminal/kbd.c
+++ b/src/terminal/kbd.c
@@ -1,4 +1,8 @@
-/* Support for keyboard interface */
+/** Support for keyboard interface
+ * @file
+ *
+ * \todo TODO: move stuff from here to itrm.{c,h} and mouse.{c,h}
+ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -37,8 +41,6 @@
 #include "util/string.h"
 #include "util/time.h"
 
-/* TODO: move stuff from here to itrm.{c,h} and mouse.{c,h} */
-
 struct itrm *ditrm = NULL;
 
 static void free_itrm(struct itrm *);
@@ -49,7 +51,7 @@ static void handle_itrm_stdin(struct itrm *);
 static void unhandle_itrm_stdin(struct itrm *);
 
 #ifdef CONFIG_DEBUG
-/* This hack makes GCC put enum term_event_special_key in the debug
+/** This hack makes GCC put enum term_event_special_key in the debug
  * information even though it is not otherwise used.  The const
  * prevents an unused-variable warning.  */
 static const enum term_event_special_key dummy_term_event_special_key;
@@ -70,9 +72,9 @@ free_all_itrms(void)
 }
 
 
-/* A select_handler_T write_func for itrm->out.sock.  This is called
- * when there is data in itrm->out.queue and it is possible to write
- * it to itrm->out.sock.  When itrm->out.queue becomes empty, this
+/** A select_handler_T write_func for itrm_out.sock.  This is called
+ * when there is data in \c itrm->out.queue and it is possible to write
+ * it to \c itrm->out.sock.  When \c itrm->out.queue becomes empty, this
  * handler is temporarily removed.  */
 static void
 itrm_queue_write(struct itrm *itrm)
@@ -154,8 +156,8 @@ kbd_ctrl_c(void)
 	hard_write(fd, seq, sizeof(seq) - 1)
 
 
-#define INIT_TERMINAL_SEQ	"\033)0\0337"	/* Special Character and Line Drawing Set, Save Cursor */
-#define INIT_ALT_SCREEN_SEQ	"\033[?47h"	/* Use Alternate Screen Buffer */
+#define INIT_TERMINAL_SEQ	"\033)0\0337"	/**< Special Character and Line Drawing Set, Save Cursor */
+#define INIT_ALT_SCREEN_SEQ	"\033[?47h"	/**< Use Alternate Screen Buffer */
 
 static void
 send_init_sequence(int h, int altscreen)
@@ -171,9 +173,9 @@ send_init_sequence(int h, int altscreen)
 #endif
 }
 
-#define DONE_CLS_SEQ		"\033[2J"	/* Erase in Display, Clear All */
-#define DONE_TERMINAL_SEQ	"\0338\r \b"	/* Restore Cursor (DECRC) + ??? */
-#define DONE_ALT_SCREEN_SEQ	"\033[?47l"	/* Use Normal Screen Buffer */
+#define DONE_CLS_SEQ		"\033[2J"	/**< Erase in Display, Clear All */
+#define DONE_TERMINAL_SEQ	"\0338\r \b"	/**< Restore Cursor (DECRC) + ??? */
+#define DONE_ALT_SCREEN_SEQ	"\033[?47l"	/**< Use Normal Screen Buffer */
 
 static void
 send_done_sequence(int h, int altscreen)
@@ -242,7 +244,7 @@ setraw(int fd, struct termios *p)
 	return 0;
 }
 
-/* Construct the struct itrm of this process, make ditrm point to it,
+/** Construct the struct itrm of this process, make ::ditrm point to it,
  * set up select() handlers, and send the initial interlink packet.
  *
  * The first five parameters are file descriptors that this function
@@ -250,23 +252,25 @@ setraw(int fd, struct termios *p)
  * set select() handlers.  Please see the definitions of struct
  * itrm_in and struct itrm_out for further explanations.
  *
- * param     member    file if process is master    file if process is slave
- * ------    ------    -------------------------    ------------------------
- * std_in    in.std    read tty device (or pipe)    read tty device (or pipe)
- * std_out   out.std   write tty device (or pipe)   write tty device (or pipe)
- * sock_in   in.sock   ==std_out (masterhood flag)  read socket from master
- * sock_out  out.sock  write pipe to same process   write socket to master
- * ctl_in    in.ctl    control tty device           control tty device
+ * @param std_in	itrm_in.std: read tty device (or pipe)
+ * @param std_out	itrm_out.std: write tty device (or pipe)
+ * @param sock_in	itrm_in.sock
+ *			- If master: == @a std_out (masterhood flag)
+ *			- If slave: read socket from master
+ * @param sock_out	itrm_out.sock
+ *			- If master: write pipe to same process
+ *			- If slave: write socket to master
+ * @param ctl_in	itrm_in.ctl: control tty device
  *
  * The remaining three parameters control the initial interlink packet.
  *
- * init_string = A string to be passed to the master process.  Need
- *               not be null-terminated.  If remote==0, this is a URI.
- *               Otherwise, this is a remote command.
- * init_len    = The length of init_string, in bytes.
- * remote      = 0 if asking the master to start a new session
- *               and display it via this process.  Otherwise,
- *               enum remote_session_flags.  */
+ * @param init_string	A string to be passed to the master process.  Need
+ *			not be null-terminated.  If @a remote == 0, this is
+ *			a URI.  Otherwise, this is a remote command.
+ * @param init_len	The length of init_string, in bytes.
+ * @param remote	= 0 if asking the master to start a new session
+ *			and display it via this process.  Otherwise,
+ *			enum ::remote_session_flags.  */
 void
 handle_trm(int std_in, int std_out, int sock_in, int sock_out, int ctl_in,
 	   void *init_string, int init_len, int remote)
@@ -342,7 +346,7 @@ handle_trm(int std_in, int std_out, int sock_in, int sock_out, int ctl_in,
 }
 
 
-/* A select_handler_T read_func and error_func for the pipe (long) h.
+/** A select_handler_T read_func and error_func for the pipe (long) @a h.
  * This is called when the subprocess started on the terminal of this
  * ELinks process exits.  ELinks then resumes using the terminal.  */
 static void
@@ -435,9 +439,9 @@ free_itrm(struct itrm *itrm)
 	mem_free(itrm);
 }
 
-/* Resize terminal to dimensions specified by @text string.
- * @text should look like "width,height,old-width,old-height" where width and
- * height are integers. */
+/** Resize terminal to dimensions specified by @a text string.
+ * @a text should look like "width,height,old-width,old-height"
+ * where width and height are integers. */
 static inline void
 resize_terminal_from_str(unsigned char *text)
 {
@@ -501,7 +505,7 @@ safe_hard_write(int fd, unsigned char *buf, int len)
 	done_draw();
 }
 
-/* A select_handler_T read_func for itrm->in.sock.  A slave process
+/** A select_handler_T read_func for itrm_in.sock.  A slave process
  * calls this when the master sends it data to be displayed.  The
  * master process never calls this.  */
 static void
@@ -632,7 +636,7 @@ free_and_return:
 }
 
 
-/* Parse an ECMA-48 control sequence that was received from a
+/** Parse an ECMA-48 control sequence that was received from a
  * terminal.  Extract the Final Byte (if there are no Intermediate
  * Bytes) and the value of the first parameter (if it is an integer).
  *
@@ -640,10 +644,10 @@ free_and_return:
  * CONTROL SEQUENCE INTRODUCER encoded as ESC [.  (ECMA-48 also allows
  * 0x9B as a single-byte CSI, but we don't support that here.)
  *
- * Return one of:
- *   -1 if the control sequence is not yet complete; the caller sets a timer.
- *   0 if the control sequence does not comply with ECMA-48.
- *   The length of the control sequence otherwise.  */
+ * @returns one of:
+ * - -1 if the control sequence is not yet complete; the caller sets a timer.
+ * - 0 if the control sequence does not comply with ECMA-48.
+ * - The length of the control sequence otherwise.  */
 static inline int
 get_esc_code(unsigned char *str, int len, unsigned char *final_byte,
 	     int *first_param_value)
@@ -706,16 +710,16 @@ get_esc_code(unsigned char *str, int len, unsigned char *final_byte,
 #include <ctype.h>	/* isprint() isspace() */
 #endif
 
-/* Decode a control sequence that begins with CSI (CONTROL SEQUENCE
- * INTRODUCER) encoded as ESC [, and set *@ev accordingly.
+/** Decode a control sequence that begins with CSI (CONTROL SEQUENCE
+ * INTRODUCER) encoded as ESC [, and set @a *ev accordingly.
  * (ECMA-48 also allows 0x9B as a single-byte CSI, but we don't
  * support that here.)
  *
- * Return one of:
- *   -1 if the control sequence is not yet complete; the caller sets a timer.
- *   0 if the control sequence should be parsed by some other function.
- *   The length of the control sequence otherwise.
- * Returning >0 does not imply this function has altered *ev.  */
+ * @returns one of:
+ * - -1 if the control sequence is not yet complete; the caller sets a timer.
+ * - 0 if the control sequence should be parsed by some other function.
+ * - The length of the control sequence otherwise.
+ * Returning >0 does not imply this function has altered @a *ev.  */
 static int
 decode_terminal_escape_sequence(struct itrm *itrm, struct interlink_event *ev)
 {
@@ -874,13 +878,13 @@ decode_terminal_escape_sequence(struct itrm *itrm, struct interlink_event *ev)
 	return el;
 }
 
-/* Decode an escape sequence that begins with SS3 (SINGLE SHIFT 3).
+/** Decode an escape sequence that begins with SS3 (SINGLE SHIFT 3).
  * These are used for application cursor keys and the application keypad.
- * Return one of:
- *   -1 if the escape sequence is not yet complete; the caller sets a timer.
- *   0 if the escape sequence should be parsed by some other function.
- *   The length of the escape sequence otherwise.
- * Returning >0 does not imply this function has altered *ev.  */
+ * @returns one of:
+ * - -1 if the escape sequence is not yet complete; the caller sets a timer.
+ * - 0 if the escape sequence should be parsed by some other function.
+ * - The length of the escape sequence otherwise.
+ * Returning >0 does not imply this function has altered @a *ev.  */
 static int
 decode_terminal_application_key(struct itrm *itrm, struct interlink_event *ev)
 {
@@ -930,11 +934,8 @@ decode_terminal_application_key(struct itrm *itrm, struct interlink_event *ev)
 }
 
 
-/* Initialize *@ev to match the byte @key received from the terminal.
- * Actually, @key could also be a value from enum term_event_special_key;
- * but callers that use those values generally don't need the mapping
- * provided by this function, so they call set_kbd_interlink_event()
- * directly.  */
+/** Initialize @a *ev to match the byte @a key received from the terminal.
+ * @a key must not be a value from enum term_event_special_key.  */
 static void
 set_kbd_event(struct interlink_event *ev,
 	      int key, term_event_modifier_T modifier)
@@ -975,7 +976,7 @@ set_kbd_event(struct interlink_event *ev,
 	set_kbd_interlink_event(ev, key, modifier);
 }
 
-/* Timer callback for @itrm->timer.  As explained in @install_timer,
+/** Timer callback for itrm.timer.  As explained in install_timer(),
  * this function must erase the expired timer ID from all variables.  */
 static void
 kbd_timeout(struct itrm *itrm)
@@ -1012,11 +1013,12 @@ kbd_timeout(struct itrm *itrm)
 	while (process_queue(itrm));
 }
 
-/* Parse one event from itrm->in.queue and append to itrm->out.queue.
- * Return the number of bytes removed from itrm->in.queue; at least 0.
- * If this function leaves the queue not full, it also reenables reading
- * from itrm->in.std.  (Because it does not add to the queue, it never
- * need disable reading.)  On entry, the itrm must not be blocked.  */
+/** Parse one event from itrm_in.queue and append to itrm_out.queue.
+ * @pre On entry, @a *itrm must not be blocked.
+ * @returns the number of bytes removed from itrm->in.queue; at least 0.
+ * @post If this function leaves the queue not full, it also reenables
+ * reading from itrm->in.std.  (Because it does not add to the queue,
+ * it never need disable reading.)  */
 static int
 process_queue(struct itrm *itrm)
 {
@@ -1146,7 +1148,7 @@ return_without_event:
 }
 
 
-/* A select_handler_T read_func for itrm->in.std.  This is called when
+/** A select_handler_T read_func for itrm_in.std.  This is called when
  * characters typed by the user arrive from the terminal. */
 static void
 in_kbd(struct itrm *itrm)
@@ -1179,7 +1181,7 @@ in_kbd(struct itrm *itrm)
 	while (process_queue(itrm));
 }
 
-/* Enable reading from itrm->in.std.  ELinks will read any available
+/** Enable reading from itrm_in.std.  ELinks will read any available
  * bytes from the tty into itrm->in.queue and then parse them.
  * Reading should be enabled whenever itrm->in.queue is not full and
  * itrm->blocked is 0.  */
@@ -1190,7 +1192,7 @@ handle_itrm_stdin(struct itrm *itrm)
 		     (select_handler_T) free_itrm, itrm);
 }
 
-/* Disable reading from itrm->in.std.  Reading should be disabled
+/** Disable reading from itrm_in.std.  Reading should be disabled
  * whenever itrm->in.queue is full (there is no room for the data)
  * or itrm->blocked is 1 (other processes may read the data).  */
 static void
diff --git a/src/terminal/kbd.h b/src/terminal/kbd.h
index f5b6d879..e886f8cb 100644
--- a/src/terminal/kbd.h
+++ b/src/terminal/kbd.h
@@ -5,28 +5,28 @@
 
 struct itrm;
 
-/* A character received from a terminal.  */
+/** A character received from a terminal.  */
 #ifdef CONFIG_UTF8
 typedef unicode_val_T term_event_char_T; /* in UCS-4 */
 #else
 typedef unsigned char term_event_char_T; /* in the charset of the terminal */
 #endif
 
-/* A key received from a terminal, without modifiers.  The value is
+/** A key received from a terminal, without modifiers.  The value is
  * either from term_event_char_T or from enum term_event_special_key.
  * To check which one it is, use is_kbd_character().
  *
- * Values <= -0x100 are special; from enum term_event_special_key.
- * Values between -0xFF and -2 are not used yet; treat as special.
- * Value  == -1 is KBD_UNDEF; not sent via socket.
- * Values >= 0 are characters; from term_event_char_T.
+ * - Values <= -0x100 are special; from enum term_event_special_key.
+ * - Values between -0xFF and -2 are not used yet; treat as special.
+ * - Value  == -1 is KBD_UNDEF; not sent via socket.
+ * - Values >= 0 are characters; from term_event_char_T.
  *
  * Any at least 32-bit signed integer type would work here; using an
  * exact-width type hurts portability in principle, but some other
  * parts of ELinks already require the existence of uint32_t.  */
 typedef int32_t term_event_key_T;
 
-/* Values for term_event_keyboard.modifier and
+/** Values for term_event_keyboard.modifier and
  * interlink_event_keyboard.modifier */
 typedef enum {
 	KBD_MOD_NONE	= 0,
@@ -35,36 +35,36 @@ typedef enum {
 	KBD_MOD_ALT	= 4
 } term_event_modifier_T;
 
-/* A key received from a terminal, with modifiers.  */
+/** A key received from a terminal, with modifiers.  */
 struct term_event_keyboard {
 	term_event_key_T key;
 	term_event_modifier_T modifier;
 };
 
-/* Like struct term_event_keyboard but used in the interlink protocol
+/** Like struct term_event_keyboard but used in the interlink protocol
  * between ELinks processes.  Because the processes may be running
  * different versions of ELinks, especially if a new version has just
  * been installed, this structure should be kept binary compatible as
  * long as possible.  See bug 793 for a list of pending changes to the
  * protocol.  */
 struct interlink_event_keyboard {
-	/* This is like term_event_key_T but carries individual bytes
+	/** This is like term_event_key_T but carries individual bytes
 	 * rather than entire characters, and uses different values
 	 * for special keys.
 	 *
-	 * Values <= -2 are not used, for ELinks 0.11 compatibility.
-	 * Value  == -1 is KBD_UNDEF; not sent via socket.
-	 * Values between 0 and 0xFF are bytes received from the terminal.
-	 * Values >= 0x100 are special; absolute values of constants
-	 * from enum term_event_special_key, e.g. -KBD_ENTER.  */
+	 * - Values <= -2 are not used, for ELinks 0.11 compatibility.
+	 * - Value  == -1 is KBD_UNDEF; not sent via socket.
+	 * - Values between 0 and 0xFF are bytes received from the terminal.
+	 * - Values >= 0x100 are special; absolute values of constants
+	 *   from enum term_event_special_key, e.g. -KBD_ENTER.  */
 	int key;
-	/* The values are from term_event_modifier_T, but the type
+	/** The values are from term_event_modifier_T, but the type
 	 * must be int so that the representation remains compatible
 	 * with ELinks 0.11.  */
 	int modifier;
 };
 
-/* Codes of special keys, for use in term_event_key_T.
+/** Codes of special keys, for use in term_event_key_T.
  * The enum has a tag mainly to let you cast numbers to it in GDB and see
  * their names.  ELinks doesn't use this enum type as term_event_key_T,
  * because it might be 16-bit and Unicode characters wouldn't then fit.  */
@@ -106,11 +106,11 @@ static inline int is_kbd_fkey(term_event_key_T key) { return key <= KBD_F1 && ke
 #define number_to_kbd_fkey(num) (KBD_F1 - (num) + 1)
 #define kbd_fkey_to_number(key) (KBD_F1 - (key) + 1)
 
-/* int is_kbd_character(term_event_key_T key);
- * Check whether @key is a character or a special key.
- * Return true if @key is a character from term_event_char_T.
+/**Check whether @a key is a character or a special key.
+ * @code int is_kbd_character(term_event_key_T key); @endcode
+ * Return true if @a key is a character from ::term_event_char_T.
  * (The character is not necessarily printable.)
- * Return false if @key is a special key from enum term_event_special_key.  */
+ * Return false if @a key is a special key from enum term_event_special_key.  */
 #define is_kbd_character(key) ((key) >= 0)
 
 void
diff --git a/src/terminal/mouse.c b/src/terminal/mouse.c
index 7af40ee2..8744cd7c 100644
--- a/src/terminal/mouse.c
+++ b/src/terminal/mouse.c
@@ -1,4 +1,5 @@
-/* Support for mouse interface */
+/** Support for mouse interface
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -45,8 +46,8 @@ extern struct itrm *ditrm;
 	hard_write(fd, seq, sizeof(seq) - 1)
 
 
-#define INIT_TWIN_MOUSE_SEQ	"\033[?9h"	/* Send MIT Mouse Row & Column on Button Press */
-#define INIT_XWIN_MOUSE_SEQ	"\033[?1000h"	/* Send Mouse X & Y on button press and release */
+#define INIT_TWIN_MOUSE_SEQ	"\033[?9h"	/**< Send MIT Mouse Row & Column on Button Press */
+#define INIT_XWIN_MOUSE_SEQ	"\033[?1000h"	/**< Send Mouse X & Y on button press and release */
 
 void
 send_mouse_init_sequence(int h)
@@ -55,8 +56,8 @@ send_mouse_init_sequence(int h)
 	write_sequence(h, INIT_XWIN_MOUSE_SEQ);
 }
 
-#define DONE_TWIN_MOUSE_SEQ	"\033[?9l"	/* Don't Send MIT Mouse Row & Column on Button Press */
-#define DONE_XWIN_MOUSE_SEQ	"\033[?1000l"	/* Don't Send Mouse X & Y on button press and release */
+#define DONE_TWIN_MOUSE_SEQ	"\033[?9l"	/**< Don't Send MIT Mouse Row & Column on Button Press */
+#define DONE_XWIN_MOUSE_SEQ	"\033[?1000l"	/**< Don't Send Mouse X & Y on button press and release */
 
 void
 send_mouse_done_sequence(int h)
@@ -123,7 +124,7 @@ decode_mouse_position(struct itrm *itrm, int from)
 #define TW_BUTT_MIDDLE	2
 #define TW_BUTT_RIGHT	4
 
-/* Returns length of the escape sequence or -1 if the caller needs to set up
+/** @returns length of the escape sequence or -1 if the caller needs to set up
  * the ESC delay timer. */
 int
 decode_terminal_mouse_escape_sequence(struct itrm *itrm, struct interlink_event *ev,
diff --git a/src/terminal/palette.inc b/src/terminal/palette.inc
index 610822f8..7f29c437 100644
--- a/src/terminal/palette.inc
+++ b/src/terminal/palette.inc
@@ -1,7 +1,10 @@
-/* Terminal color palettes. */
-/* TODO: We should probably autogenerate this using xterm's perl script. */
+/** Terminal color palettes.
+ * @file
+ *
+ * \todo TODO: We should probably autogenerate this using xterm's perl
+ * script. */
 
-/* The 16 ANSI colors. */
+/** The 16 ANSI colors. */
 static const struct rgb palette16[] = {
 #if defined(PALA)
 	{0x00, 0x00, 0x00},
@@ -58,10 +61,11 @@ static const struct rgb palette16[] = {
 };
 
 #ifdef CONFIG_88_COLORS
-/* Regexp'd from Dickey's xterm 88colres.h file. */
-/* Colors  0-15 are the ANSI colors (and the same as palette16[]).
- * Colors 16-79 are a 4x4x4 color cube
- * Colors 80-91 are a grayscale ramp (with black and white left out). */
+/** The 88 xterm colors.
+ * Regexp'd from Dickey's xterm 88colres.h file.
+ * - Colors  0-15 are the ANSI colors (and the same as palette16[]).
+ * - Colors 16-79 are a 4x4x4 color cube
+ * - Colors 80-91 are a grayscale ramp (with black and white left out). */
 static const struct rgb palette88[] = {
 	{0x00, 0x00, 0x00}, /* 0 */
 	{0x80, 0x00, 0x00}, /* 1 */
@@ -160,11 +164,12 @@ static const struct rgb palette88[] = {
 #endif
 
 #ifdef CONFIG_256_COLORS
-/* Regexp'd from Dickey's xterm 256colres.h file. */
-/* Colors   0- 15 are the ANSI colors (from xterm-215/XTerm-col.ad
- *                and Xorg's rgb.txt, not the same as palette16[]).
- * Colors  16-231 are a 6x6x6 color cube
- * Colors 232-255 are a grayscale ramp (with black and white left out).
+/** The 256 xterm colors.
+ * Regexp'd from Dickey's xterm 256colres.h file.
+ * - Colors   0- 15 are the ANSI colors (from xterm-215/XTerm-col.ad
+ *                  and Xorg's rgb.txt, not the same as palette16[]).
+ * - Colors  16-231 are a 6x6x6 color cube
+ * - Colors 232-255 are a grayscale ramp (with black and white left out).
  *
  * The 6x6x6 color cube of xterm uses brightnesses 00-5f-87-af-d7-ff
  * whereas the "web-safe" palette uses 00-33-66-99-cc-ff, which then
@@ -179,19 +184,21 @@ static const struct rgb palette88[] = {
  * function, which passes through all six points and has a continuous
  * positive first derivative:
  *
+ * @verbatim
  * y = (765/11) - sqrt(585225/121 - (2601/55)*x) when x <= 0x5f
  * x = (-55/2601)*y^2 + (150/51)*y               when x <= 0x5f
  * y = (51/40)*x + (-561/8)                      when x >= 0x5f
+ * @endverbatim
+ */
+/* If you use Emacs, just run eval-last-sexp (C-x C-e) on the following:
  *
- * If you use Emacs then here is how to do it easily:
- *
- * (while (re-search-forward "0x\\([[:xdigit:]]+\\)" nil t)
-     (let* ((x (string-to-number (match-string 1) 16))
-	    (y (if (<= x #x5f)
-		 (- (/ 765.0 11.0)
-		    (sqrt (- (/ 585225.0 121.0) (* (/ 2601.0 55.0) x))))
-		 (+ (* (/ 51.0 40.0) x) (/ -561.0 8.0)))))
-       (replace-match (format "%.2x" (round y)) nil t nil 1)))
+ * (while (re-search-forward "0x\\([[:xdigit:]]+\\)" nil t)		#@3
+ *   (let* ((x (string-to-number (match-string 1) 16))			#@3
+ *	    (y (if (<= x #x5f)						#@3
+ *		 (- (/ 765.0 11.0)					#@3
+ *		    (sqrt (- (/ 585225.0 121.0) (* (/ 2601.0 55.0) x))))#@3
+ *		 (+ (* (/ 51.0 40.0) x) (/ -561.0 8.0)))))		#@3
+ *     (replace-match (format "%.2x" (round y)) nil t nil 1)))
  */
 static const struct rgb palette256[] = {
 	{0x00, 0x00, 0x00}, /* 0 black */
diff --git a/src/terminal/screen.c b/src/terminal/screen.c
index 62a923ff..2233d282 100644
--- a/src/terminal/screen.c
+++ b/src/terminal/screen.c
@@ -1,4 +1,5 @@
-/* Terminal screen drawing routines. */
+/** Terminal screen drawing routines.
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -28,10 +29,17 @@
 
 /* TODO: We must use termcap/terminfo if available! --pasky */
 
+/** Mapping from (enum border_char - 0xB0) to ASCII characters.  */
 const unsigned char frame_dumb[48] =	"   ||||++||++++++--|-+||++--|-+----++++++++     ";
+
+/** Mapping from (enum border_char - 0xB0) to VT100 line-drawing
+ * characters.  */
 static const unsigned char frame_vt100[48] =	"aaaxuuukkuxkjjjkmvwtqnttmlvwtqnvvwwmmllnnjla    ";
 
-/* For UTF-8 I/O */
+/** Mapping from (enum border_char - 0xB0) to VT100 line-drawing
+ * characters encoded in CP437.
+ * When UTF-8 I/O is enabled, ELinks uses this array instead of
+ * frame_vt100[], and converts the characters from CP437 to UTF-8.  */
 static const unsigned char frame_vt100_u[48] = {
 	177, 177, 177, 179, 180, 180, 180, 191,
 	191, 180, 179, 191, 217, 217, 217, 191,
@@ -41,11 +49,15 @@ static const unsigned char frame_vt100_u[48] = {
 	197, 217, 218, 177,  32, 32,  32,  32
 };
 
-/* This is for FreeBSD fonts that place graphics characters in the
+/** Mapping from (enum border_char - 0xB0) to obsolete FreeBSD ACS
+ * graphics.
+ *
+ * This is for FreeBSD fonts that place graphics characters in the
  * 0x80...0x9F range, which ISO 8859 does not use.  The characters are
  * supposed to be sorted according to the codes used in VT100 or in
  * the terminfo "acsc" capability:
  *
+ * @verbatim
  *	0x80	U+2588	'0'	ACS_BLOCK
  *	0x81	U+25C6	'`'	ACS_DIAMOND
  *	0x82	U+2592	'a'	ACS_CKBOARD
@@ -78,6 +90,7 @@ static const unsigned char frame_vt100_u[48] = {
  *	0x9D	U+2260	'|'	ACS_NEQUAL
  *	0x9E	U+00A3	'}'	ACS_STERLING
  *	0x9F	U+00B7	'~'	ACS_BULLET
+ * @endverbatim
  *
  * (Ncurses 5.5 defines ACS_BOARD using 'h' and ACS_LANTERN using 'i',
  * but those are not the characters meant above.)
@@ -98,10 +111,15 @@ static const unsigned char frame_freebsd[48] = {
 	143, 139, 141, 128, 128, 128, 128, 128,
 };
 
-/* For UTF-8 I/O.  Derived from frame_freebsd[] by converting the
- * characters to Unicode and back to CP437.  frame_freebsd[1] = 138 =
- * 0x8a = U+240B SYMBOL FOR VERTICAL TABULATION does not exist in
- * CP437, so we substitute U+2592 MEDIUM SHADE.  */
+/** Mapping from (enum border_char - 0xB0) to obsolete FreeBSD ACS
+ * graphics encoded in CP437.
+ * When UTF-8 I/O is enabled, ELinks uses this array instead of
+ * frame_freebsd[], and converts the characters from CP437 to UTF-8.
+ *
+ * Derived from frame_freebsd[] by converting the characters to
+ * Unicode and back to CP437.  frame_freebsd[1] = 138 = 0x8a = U+240B
+ * SYMBOL FOR VERTICAL TABULATION does not exist in CP437, so we
+ * substitute U+2592 MEDIUM SHADE.  */
 static const unsigned char frame_freebsd_u[48] = {
 	177, 177, 219, 179, 180, 180, 180, 191,
 	191, 180, 179, 191, 217, 217, 217, 191,
@@ -111,6 +129,7 @@ static const unsigned char frame_freebsd_u[48] = {
 	197, 217, 218, 219, 219, 219, 219, 219,
 };
 
+/** Mapping from (enum border_char - 0xB0) to KOI8-R.  */
 static const unsigned char frame_koi[48] = {
 	144, 145, 146, 129, 135, 178, 180, 167,
 	166, 181, 161, 168, 174, 173, 172, 131,
@@ -120,7 +139,10 @@ static const unsigned char frame_koi[48] = {
 	188, 133, 130, 141, 140, 142, 143, 139,
 };
 
-/* Most of this table is just 176 + <index in table>. */
+/** Mapping from (enum border_char - 0xB0) to CP850 or CP852.  Most of
+ * this table is just 0xB0 + @<index in table>, because these codepages
+ * are quite similar to CP437.  However, they lack some line-drawing
+ * characters, so we must use others instead.  */
 static const unsigned char frame_restrict[48] = {
 	176, 177, 178, 179, 180, 179, 186, 186,
 	205, 185, 186, 187, 188, 186, 205, 191,
@@ -132,58 +154,67 @@ static const unsigned char frame_restrict[48] = {
 
 #define TERM_STRING(str) INIT_STRING(str, sizeof(str) - 1)
 
-/* Like add_string_to_string but has fewer checks to slow it down.  */
+/** Like add_string_to_string but has fewer checks to slow it down.  */
 #define add_term_string(str, tstr) \
 	add_bytes_to_string(str, (tstr).source, (tstr).length)
 
-/* ECMA-48: CSI Ps... 06/13 = SGR - SELECT GRAPHIC RENDITION
- * Ps = 10 = primary (default) font
- * Ps = 11 = first alternative font */
+/** Frame begin/end sequences that switch fonts with ECMA-48 SGR.
+ * ECMA-48: CSI Ps... 06/13 = SGR - SELECT GRAPHIC RENDITION
+ * - Ps = 10 = primary (default) font
+ * - Ps = 11 = first alternative font */
 static const struct string m11_hack_frame_seqs[] = {
 	/* end border: */	TERM_STRING("\033[10m"),
 	/* begin border: */	TERM_STRING("\033[11m"),
 };
 
+/** Frame begin/end sequences for VT100.  */
 static const struct string vt100_frame_seqs[] = {
 	/* end border: */	TERM_STRING("\x0f"),
 	/* begin border: */	TERM_STRING("\x0e"),
 };
 
+/** Underline begin/end sequences using ECMA-48 SGR.
+ * ECMA-48: CSI Ps... 06/13 = SGR - SELECT GRAPHIC RENDITION
+ * - Ps =  4 = singly underlined
+ * - Ps = 21 = doubly underlined
+ * - Ps = 24 = not underlined (neither singly nor doubly) */
 static const struct string underline_seqs[] = {
-	/* begin underline: */	TERM_STRING("\033[24m"),
-	/* end underline: */	TERM_STRING("\033[4m"),
+	/* end underline: */	TERM_STRING("\033[24m"),
+	/* begin underline: */	TERM_STRING("\033[4m"),
 };
 
-/* Used in {add_char*()} and {redraw_screen()} to reduce the logic. It is
- * updated from terminal._template_.* using option change_hooks. */
-/* TODO: termcap/terminfo can maybe gradually be introduced via this
- *	 structure. We'll see. --jonas */
+/** Used in @c add_char*() and @c redraw_screen() to reduce the logic.
+ * It is updated from terminal._template_.* using option.change_hook.
+ *
+ * @todo TODO: termcap/terminfo can maybe gradually be introduced via
+ *	       this structure. We'll see. --jonas */
 struct screen_driver {
 	LIST_HEAD(struct screen_driver);
 
-	/* The terminal._template_.type. Together with the @name member the
+	/** The terminal._template_.type. Together with the #name member they
 	 * uniquely identify the screen_driver. */
 	enum term_mode_type type;
 
+	/** set_screen_driver_opt() sets these.  */
 	struct screen_driver_opt {
-		/* Charsets when doing UTF8 I/O. */
-		/* [0] is the common charset and [1] is the frame charset.
-		 * Test whether to use UTF8 I/O using the use_utf8_io() macro.  */
+		/** Charsets when doing UTF-8 I/O.
+		 * [0] is the common charset and [1] is the frame charset.
+		 * Test whether to use UTF-8 I/O using the use_utf8_io() macro.  */
 		int charsets[2];
 
-		/* The frame translation table. May be NULL. */
+		/** The frame translation table. May be NULL. */
 		const unsigned char *frame;
 
-		/* The frame mode setup and teardown sequences. May be NULL. */
+		/** The frame mode setup and teardown sequences. May be NULL. */
 		const struct string *frame_seqs;
 
-		/* The underline mode setup and teardown sequences. May be NULL. */
+		/** The underline mode setup and teardown sequences. May be NULL. */
 		const struct string *underline;
 
-		/* The color mode */
+		/** The color mode */
 		enum color_mode color_mode;
 
-		/* These are directly derived from the terminal options. */
+		/** These are directly derived from the terminal options. */
 		unsigned int transparent:1;
 
 #ifdef CONFIG_UTF8
@@ -198,6 +229,7 @@ struct screen_driver {
 	unsigned char name[1]; /* XXX: Keep last! */
 };
 
+/** Default options for ::TERM_DUMB.  */
 static const struct screen_driver_opt dumb_screen_driver_opt = {
 	/* charsets: */		{ -1, -1 },	/* No UTF8 I/O */
 	/* frame: */		frame_dumb,
@@ -210,6 +242,7 @@ static const struct screen_driver_opt dumb_screen_driver_opt = {
 #endif /* CONFIG_UTF8 */
 };
 
+/** Default options for ::TERM_VT100.  */
 static const struct screen_driver_opt vt100_screen_driver_opt = {
 	/* charsets: */		{ -1, -1 },	/* No UTF8 I/O */
 	/* frame: */		frame_vt100,
@@ -222,6 +255,7 @@ static const struct screen_driver_opt vt100_screen_driver_opt = {
 #endif /* CONFIG_UTF8 */
 };
 
+/** Default options for ::TERM_LINUX.  */
 static const struct screen_driver_opt linux_screen_driver_opt = {
 	/* charsets: */		{ -1, -1 },	/* No UTF8 I/O */
 	/* frame: */		NULL,		/* No restrict_852 */
@@ -234,6 +268,7 @@ static const struct screen_driver_opt linux_screen_driver_opt = {
 #endif /* CONFIG_UTF8 */
 };
 
+/** Default options for ::TERM_KOI8.  */
 static const struct screen_driver_opt koi8_screen_driver_opt = {
 	/* charsets: */		{ -1, -1 },	/* No UTF8 I/O */
 	/* frame: */		frame_koi,
@@ -246,6 +281,7 @@ static const struct screen_driver_opt koi8_screen_driver_opt = {
 #endif /* CONFIG_UTF8 */
 };
 
+/** Default options for ::TERM_FREEBSD.  */
 static const struct screen_driver_opt freebsd_screen_driver_opt = {
 	/* charsets: */		{ -1, -1 },	/* No UTF8 I/O */
 	/* frame: */		frame_freebsd,
@@ -258,7 +294,8 @@ static const struct screen_driver_opt freebsd_screen_driver_opt = {
 #endif /* CONFIG_UTF8 */
 };
 
-/* XXX: Keep in sync with enum term_mode_type. */
+/** Default options for all the different types of terminals.
+ * XXX: Keep in sync with enum term_mode_type. */
 static const struct screen_driver_opt *const screen_driver_opts[] = {
 	/* TERM_DUMB: */	&dumb_screen_driver_opt,
 	/* TERM_VT100: */	&vt100_screen_driver_opt,
@@ -269,10 +306,10 @@ static const struct screen_driver_opt *const screen_driver_opts[] = {
 
 #define use_utf8_io(driver)	((driver)->opt.charsets[0] != -1)
 
-static INIT_LIST_HEAD(active_screen_drivers);
+static INIT_LIST_OF(struct screen_driver, active_screen_drivers);
 
-/* Set driver->opt according to driver->type and term_spec.
- * Other members of *driver need not have been initialized.
+/** Set screen_driver.opt according to screen_driver.type and \a term_spec.
+ * Other members of \a *driver need not have been initialized.
  *
  * If you modify anything here, check whether option descriptions
  * should be updated.  */
@@ -430,7 +467,7 @@ get_screen_driver(struct terminal *term)
 	return add_screen_driver(type, term, len);
 }
 
-/* Release private screen drawing utilities. */
+/** Release private screen drawing utilities. */
 void
 done_screen_drivers(struct module *xxx)
 {
@@ -438,8 +475,8 @@ done_screen_drivers(struct module *xxx)
 }
 
 
-/* Adds the term code for positioning the cursor at @x and @y to @string.
- * The template term code is: "\033[<@y>;<@x>H" */
+/** Adds the term code for positioning the cursor at @a x and @a y to
+ * @a string.  The template term code is: "\033[<@a y>;<@a x>H" */
 static inline struct string *
 add_cursor_move_to_string(struct string *screen, int y, int x)
 {
@@ -469,7 +506,7 @@ struct screen_state {
 	unsigned char underline;
 	unsigned char bold;
 	unsigned char attr;
-	/* Following should match struct screen_char color field. */
+	/** Following should match the screen_char.color field. */
 	unsigned char color[SCREEN_COLOR_SIZE];
 };
 
@@ -620,7 +657,7 @@ add_char_data(struct string *screen, struct screen_driver *driver,
 	}
 }
 
-/* Time critical section. */
+/** Time critical section. */
 static inline void
 add_char16(struct string *screen, struct screen_driver *driver,
 	   struct screen_char *ch, struct screen_state *state)
@@ -772,7 +809,7 @@ add_char_color(struct string *screen, const struct string *seq, unsigned char co
 #define add_background_color(str, seq, chr) add_char_color(str, &(seq)[1], (chr)->color[1])
 #define add_foreground_color(str, seq, chr) add_char_color(str, &(seq)[0], (chr)->color[0])
 
-/* Time critical section. */
+/** Time critical section. */
 static inline void
 add_char256(struct string *screen, struct screen_driver *driver,
 	    struct screen_char *ch, struct screen_state *state)
@@ -887,7 +924,7 @@ add_char_true_color(struct string *screen, const struct string *seq, unsigned ch
 	add_char_to_string(screen, 'm');
 }
 
-/* Time critical section. */
+/** Time critical section. */
 static inline void
 add_char_true(struct string *screen, struct screen_driver *driver,
 	    struct screen_char *ch, struct screen_state *state)
@@ -1007,8 +1044,8 @@ add_char_true(struct string *screen, struct screen_driver *driver,
 	}									\
 }
 
-/* Updating of the terminal screen is done by checking what needs to be updated
- * using the last screen. */
+/*! Updating of the terminal screen is done by checking what needs to
+ * be updated using the last screen. */
 void
 redraw_screen(struct terminal *term)
 {
@@ -1127,8 +1164,9 @@ init_screen(void)
 	return screen;
 }
 
-/* The two images are allocated in one chunk. */
-/* TODO: It seems allocation failure here is fatal. We should do something! */
+/*! The two images are allocated in one chunk.
+ * \todo TODO: It seems allocation failure here is fatal.
+ *             We should do something! */
 void
 resize_screen(struct terminal *term, int width, int height)
 {
@@ -1171,7 +1209,7 @@ done_screen(struct terminal_screen *screen)
 
 struct module terminal_screen_module = struct_module(
 	/* Because this module is a submodule of terminal_module,
-	 * which is listed main_modules rather than in builtin_modules,
+	 * which is listed in main_modules rather than in builtin_modules,
 	 * its name does not appear in the user interface and
 	 * so need not be translatable.  */
 	/* name: */		"Terminal Screen",
diff --git a/src/terminal/screen.h b/src/terminal/screen.h
index 35cd4351..9513a51e 100644
--- a/src/terminal/screen.h
+++ b/src/terminal/screen.h
@@ -6,24 +6,24 @@ struct module;
 struct screen_char;
 struct terminal;
 
-/* The terminal's screen manages */
+/** The terminal's screen manages */
 struct terminal_screen {
-	/* This is the screen's image, character by character. */
+	/** This is the screen's image, character by character. */
 	struct screen_char *image;
 
-	/* The previous screen's image, used for optimizing actual drawing. */
+	/** The previous screen's image, used for optimizing actual drawing. */
 	struct screen_char *last_image;
 
-	/* The current and the previous cursor positions. */
+	/** The current and the previous cursor positions. */
 	int cx, cy;
 	int lcx, lcy;
 
-	/* The range of line numbers that are out of sync with the physical
-	 * screen. @dirty_from > @dirty_to means not dirty. */
+	/** The range of line numbers that are out of sync with the physical
+	 * screen. #dirty_from > #dirty_to means not dirty. */
 	int dirty_from, dirty_to;
 };
 
-/* Mark the screen ready for redrawing. */
+/** Mark the screen ready for redrawing. */
 static inline void
 set_screen_dirty(struct terminal_screen *screen, int from, int to)
 {
@@ -31,23 +31,23 @@ set_screen_dirty(struct terminal_screen *screen, int from, int to)
 	int_lower_bound(&screen->dirty_to, to);
 }
 
-/* Initializes a screen. Returns NULL upon allocation failure. */
+/** Initializes a screen. Returns NULL upon allocation failure. */
 struct terminal_screen *init_screen(void);
 
-/* Cleans up after the screen. */
+/** Cleans up after the screen. */
 void done_screen(struct terminal_screen *screen);
 
-/* Update the size of the previous and the current screen image to hold @x time
- * @y chars. */
+/** Update the size of the previous and the current screen image to
+ * hold @a x time @a y chars. */
 void resize_screen(struct terminal *term, int x, int y);
 
-/* Updates the terminal screen. */
+/** Updates the terminal screen. */
 void redraw_screen(struct terminal *term);
 
-/* Erases the entire screen and moves the cursor to the upper left corner. */
+/** Erases the entire screen and moves the cursor to the upper left corner. */
 void erase_screen(struct terminal *term);
 
-/* Meeep! */
+/** Meeep! */
 void beep_terminal(struct terminal *term);
 
 extern struct module terminal_screen_module;
diff --git a/src/terminal/tab.c b/src/terminal/tab.c
index 8aaf8a38..b9795483 100644
--- a/src/terminal/tab.c
+++ b/src/terminal/tab.c
@@ -1,4 +1,5 @@
-/* Tab-style (those containing real documents) windows infrastructure. */
+/** Tab-style (those containing real documents) windows infrastructure.
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -60,7 +61,7 @@ found_pos:
 	return win;
 }
 
-/* Number of tabs at the terminal (in term->windows) */
+/** Number of tabs at the terminal (in term->windows) */
 inline int
 number_of_tabs(struct terminal *term)
 {
@@ -73,7 +74,7 @@ number_of_tabs(struct terminal *term)
 	return result;
 }
 
-/* Number of tab */
+/** Number of tab */
 int
 get_tab_number(struct window *window)
 {
@@ -93,7 +94,7 @@ get_tab_number(struct window *window)
 	return num;
 }
 
-/* Get tab of an according index */
+/** Get tab of an according index */
 struct window *
 get_tab_by_number(struct terminal *term, int num)
 {
@@ -106,14 +107,14 @@ get_tab_by_number(struct terminal *term, int num)
 
 	/* Ensure that the return value actually points to a struct
 	 * window.  */
-	assertm((struct list_head *) win != &term->windows,
+	assertm((LIST_OF(struct window) *) win != &term->windows,
 	        "tab number out of range");
 	if_assert_failed return term->windows.next;
 
 	return win;
 }
 
-/* Returns number of the tab at @xpos, or -1 if none. */
+/** Returns number of the tab at @a xpos, or -1 if none. */
 int
 get_tab_number_by_xpos(struct terminal *term, int xpos)
 {
@@ -130,7 +131,7 @@ get_tab_number_by_xpos(struct terminal *term, int xpos)
 	return -1;
 }
 
-/* if @tabs_count > 0, then it is taken as the result of a recent
+/*! If @a tabs_count > 0, then it is taken as the result of a recent
  * call to number_of_tabs() so it just uses this value. */
 void
 switch_to_tab(struct terminal *term, int tab, int tabs_count)
diff --git a/src/terminal/terminal.c b/src/terminal/terminal.c
index 9140742b..5217cc68 100644
--- a/src/terminal/terminal.c
+++ b/src/terminal/terminal.c
@@ -1,4 +1,5 @@
-/* Terminal interface - low-level displaying implementation. */
+/** Terminal interface - low-level displaying implementation.
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -36,7 +37,7 @@
 #include "viewer/text/textarea.h"
 
 
-INIT_LIST_HEAD(terminals);
+INIT_LIST_OF(struct terminal, terminals);
 
 static void check_if_no_terminal(void);
 
diff --git a/src/terminal/terminal.h b/src/terminal/terminal.h
index f661e02a..4c2f7c33 100644
--- a/src/terminal/terminal.h
+++ b/src/terminal/terminal.h
@@ -11,7 +11,7 @@ struct terminal_screen;
 struct terminal_interlink;
 
 
-/* The terminal type, meaningful for frames (lines) drawing. */
+/** The terminal type, meaningful for frames (lines) drawing. */
 enum term_mode_type {
 	TERM_DUMB = 0,
 	TERM_VT100,
@@ -20,136 +20,139 @@ enum term_mode_type {
 	TERM_FREEBSD,
 };
 
-/* This is a bitmask describing the environment we are living in,
+/** This is a bitmask describing the environment we are living in,
  * terminal-wise. We can then conditionally use various features available
  * in such an environment. */
 enum term_env_type {
-	/* This basically means that we can use the text i/o :). Always set. */
+	/** This basically means that we can use the text i/o :). Always set. */
 	ENV_CONSOLE = 1,
-	/* We are running in a xterm-compatible box in some windowing
+	/** We are running in a xterm-compatible box in some windowing
 	 * environment. */
 	ENV_XWIN = 2,
-	/* We are running under a screen. */
+	/** We are running under a screen. */
 	ENV_SCREEN = 4,
-	/* We are running in a OS/2 VIO terminal. */
+	/** We are running in a OS/2 VIO terminal. */
 	ENV_OS2VIO = 8,
-	/* BeOS text terminal. */
+	/** BeOS text terminal. */
 	ENV_BE = 16,
-	/* We live in a TWIN text-mode windowing environment. */
+	/** We live in a TWIN text-mode windowing environment. */
 	ENV_TWIN = 32,
-	/* Microsoft Windows cmdline thing. */
+	/** Microsoft Windows cmdline thing. */
 	ENV_WIN32 = 64,
-	/* Match all terminal environments */
+	/** Match all terminal environments */
 	ENV_ANY = ~0,
 };
 
 enum term_redrawing_state {
-	TREDRAW_READY = 0,	/* Can redraw */
-	TREDRAW_BUSY = 1,	/* Redrawing already in progress */
-	TREDRAW_DELAYED = 2,	/* Do not redraw for now */
+	TREDRAW_READY = 0,	/**< Can redraw */
+	TREDRAW_BUSY = 1,	/**< Redrawing already in progress */
+	TREDRAW_DELAYED = 2,	/**< Do not redraw for now */
 };
 
-/* This is one of the axis of ELinks' user interaction. {struct terminal}
+/** This is one of the axis of ELinks' user interaction. struct terminal
  * defines the terminal ELinks is running on --- each ELinks instance has
  * one. It contains the basic terminal attributes, the settings associated
  * with this terminal, screen content (and more abstract description of what
  * is currently displayed on it) etc. It also maintains some runtime
- * information about the actual ELinks instance owning this terminal. */
-/* TODO: Regroup the following into logical chunks. --pasky */
+ * information about the actual ELinks instance owning this terminal.
+ *
+ * \todo TODO: Regroup the following into logical chunks. --pasky */
 struct terminal {
-	LIST_HEAD(struct terminal); /* {terminals} */
+	LIST_HEAD(struct terminal); /*!< ::terminals is the sentinel.  */
 
-	/* This is (at least partially) a stack of all the windows living in
+	/** This is (at least partially) a stack of all the windows living in
 	 * this terminal. A window can be wide range of stuff, from a menu box
 	 * through classical dialog window to a tab. See terminal/window.h for
 	 * more on windows.
 	 *
 	 * Tabs are special windows, though, and you never want to display them
-	 * all, but only one of them. ALWAYS check {inactive_tab} during
+	 * all, but only one of them. ALWAYS check inactive_tab() during
 	 * iterations through this list (unless it is really useless or you
 	 * are sure what are you doing) to make sure that you don't distribute
 	 * events etc to inactive tabs.
 	 *
-	 * The stack is top-down, thus .next is the stack's top, the
-	 * current window; and .prev is the bottom, covered by others.
+	 * The stack is top-down, thus @c .next is the stack's top, the
+	 * current window; and @c .prev is the bottom, covered by others.
 	 * - Dialogs or active menus are at the top.
-	 * - Next come all tabs (window.type == WINDOW_TAB).  The tab
+	 * - Next come all tabs (window.type == ::WINDOW_TAB).  The tab
 	 *   listed leftmost in the tab bar is at the top, and the tab
-	 *   listed rightmost is at the bottom; but current_tab controls
+	 *   listed rightmost is at the bottom; but #current_tab controls
 	 *   which tab is actually displayed.
 	 * - If the main menu is inactive, then it is at the very bottom,
 	 *   hidden under the tabs.
-	 * Call assert_window_stacking to verify this.
+	 * Call assert_window_stacking() to verify this.
 	 *
-	 * FIXME: Tabs violate the stack nature of this list, they appear there
-	 * randomly but always in the order in which they were inserted there.
-	 * Eventually, they should all live at the stack bottom, with the
-	 * actual tab living on the VERY bottom. --pasky
+	 * @todo FIXME: Tabs violate the stack nature of this list, they
+	 * appear there randomly but always in the order in which they were
+	 * inserted there.  Eventually, they should all live at the stack
+	 * bottom, with the actual tab living on the VERY bottom. --pasky
 	 *
 	 *   Keeping the current tab at the very bottom would require storing
 	 *   tab numbers explicitly, rather than computing them from the
 	 *   stack order as is done now.  Also, what should be done with the
 	 *   inactive main menu?  --KON */
-	struct list_head windows; /* {struct window} */
+	LIST_OF(struct window) windows;
 
-	/* The specification of terminal in terms of terminal options. */
+	/** The specification of terminal in terms of terminal options. */
 	struct option *spec;
 
-	/* This is the terminal's current title, as perhaps displayed somewhere
-	 * in the X window frame or so. */
+	/** This is the terminal's current title, as perhaps displayed
+	 * somewhere in the X window frame or so. */
 	unsigned char *title;
 
-	/* This is the screen. See terminal/screen.h */
+	/** This is the screen. See terminal/screen.h */
 	struct terminal_screen *screen;
 
-	/* This is for displaying main menu */
+	/** This is for displaying main menu */
 	struct menu *main_menu;
-	/* These are pipes for communication with the ELinks instance owning
-	 * this terminal. */
+
+	/** These are pipes for communication with the ELinks instance owning
+	 * this terminal.
+	 * @see struct itrm */
 	int fdin, fdout;
 
-	/* This indicates that the terminal is blocked, that is nothing should
+	/** This indicates that the terminal is blocked, that is nothing should
 	 * be drawn on it etc. Typically an external program is running on it
 	 * right now. This is a file descriptor. */
 	int blocked;
 
-	/* Terminal dimensions. */
+	/** Terminal dimensions. */
 	int width, height;
 
-	/* Indicates whether we are currently in the process of redrawing the
+	/** Indicates whether we are currently in the process of redrawing the
 	 * stuff being displayed on the terminal. It is typically used to
 	 * prevent redrawing inside of redrawing. */
 	enum term_redrawing_state redrawing;
 
-	/* Indicates the master terminal, that is the terminal under
+	/** Indicates the master terminal, that is the terminal under
 	 * supervision of the master ELinks instance (the one doing all the
 	 * work and even maintaining these structures ;-). */
 	unsigned int master:1;
 
 #ifdef CONFIG_UTF8
-	/* Indicates whether the charset of the terminal is UTF-8.  */
+	/** Indicates whether the charset of the terminal is UTF-8.  */
 	unsigned int utf8_cp:1;
 
-	/* Indicates whether UTF-8 I/O is used.  Forced on if the
+	/** Indicates whether UTF-8 I/O is used.  Forced on if the
 	 * UTF-8 charset is selected.  (bug 827) */
 	unsigned int utf8_io:1;
 #endif /* CONFIG_UTF8 */
 
-	/* The current tab number. */
+	/** The current tab number. */
 	int current_tab;
 
 #ifdef CONFIG_LEDS
-	/* Current length of leds part of status bar. */
+	/** Current length of leds part of status bar. */
 	int leds_length;
 #endif
 
-	/* The type of environment this terminal lives in. */
+	/** The type of environment this terminal lives in. */
 	enum term_env_type environment;
 
-	/* The current working directory for this terminal / ELinks instance. */
+	/** The current working directory for this terminal / ELinks instance. */
 	unsigned char cwd[MAX_CWD_LEN];
 
-	/* For communication between instances */
+	/** For communication between instances */
 	struct terminal_interlink *interlink;
 
 	struct term_event_mouse prev_mouse_event;
@@ -158,8 +161,8 @@ struct terminal {
 #define do_not_ignore_next_mouse_event(term) \
 	memset(&(term)->prev_mouse_event, 0, sizeof((term)->prev_mouse_event))
 
-/* We keep track about all the terminals in this list. */
-extern struct list_head terminals;
+/** We keep track about all the terminals in this list. */
+extern LIST_OF(struct terminal) terminals;
 
 
 extern const unsigned char frame_dumb[];
@@ -175,24 +178,26 @@ void destroy_all_terminals(void);
 void exec_thread(unsigned char *, int);
 void close_handle(void *);
 
-/* Operations that can be requested with do_terminal_function().
+/** Operations that can be requested with do_terminal_function().
  * The interlink protocol passes these values as one byte in a
  * null-terminated string, so zero cannot be used.  */
-#define TERM_FN_TITLE	1
-#define TERM_FN_RESIZE	2
+enum {
+	TERM_FN_TITLE	= 1,
+	TERM_FN_RESIZE	= 2
+};
 
-/* How to execute a program in a terminal.  These values are used in
+/** How to execute a program in a terminal.  These values are used in
  * the interlink protocol and must fit in one byte.  */
 enum term_exec {
-	/* Execute in the background.  ELinks keeps using the terminal
+	/** Execute in the background.  ELinks keeps using the terminal
 	 * and the program should not use it.  */
 	TERM_EXEC_BG = 0,
 
-	/* Execute in the foreground.  The program may use the terminal.
+	/** Execute in the foreground.  The program may use the terminal.
 	 * ELinks will redraw when the program exits.  */
 	TERM_EXEC_FG = 1,
 
-	/* Execute in the background and in a new process group.  */
+	/** Execute in the background and in a new process group.  */
 	TERM_EXEC_NEWWIN = 2
 };
 
diff --git a/src/terminal/window.c b/src/terminal/window.c
index 3bad556d..d4cd6c1b 100644
--- a/src/terminal/window.c
+++ b/src/terminal/window.c
@@ -1,4 +1,5 @@
-/* Terminal windows stuff. */
+/** Terminal windows stuff.
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -174,7 +175,7 @@ add_empty_window(struct terminal *term, void (*fn)(void *), void *data)
 }
 
 #if CONFIG_DEBUG
-/* Check that term->windows are in the documented order.  */
+/** Check that terminal.windows are in the documented order.  */
 void
 assert_window_stacking(struct terminal *term)
 {
diff --git a/src/terminal/window.h b/src/terminal/window.h
index a75e7cbb..1490a7c5 100644
--- a/src/terminal/window.h
+++ b/src/terminal/window.h
@@ -8,13 +8,13 @@ struct terminal;
 struct window;
 
 enum window_type {
-	/* Normal windows: */
-	/* Used for things like dialogs. The default type when adding windows
+	/** Normal windows.
+	 * Used for things like dialogs. The default type when adding windows
 	 * with add_window(). */
 	WINDOW_NORMAL,
 
-	/* Tab windows: */
-	/* Tabs are a separate session and has separate history, current
+	/** Tab windows.
+	 * Tabs are a separate session and has separate history, current
 	 * document and action-in-progress .. basically a separate browsing
 	 * state. */
 	WINDOW_TAB,
@@ -23,26 +23,26 @@ enum window_type {
 typedef void (window_handler_T)(struct window *, struct term_event *);
 
 struct window {
-	LIST_HEAD(struct window);
+	LIST_HEAD(struct window); /*!< terminal.windows is the sentinel.  */
 
 	enum window_type type;
 
-	/* The window event handler */
+	/** The window event handler */
 	window_handler_T *handler;
 
-	/* For tab windows the session is stored in @data. For normal windows
-	 * it can contain dialog data. */
-	/* It is free()'d by delete_window() */
+	/** For tab windows the session is stored in @c data.
+	 * For normal windows it can contain dialog data.
+	 * It is free()'d by delete_window() */
 	void *data;
 
-	/* The terminal (and screen) that hosts the window */
+	/** The terminal (and screen) that hosts the window */
 	struct terminal *term;
 
-	/* Used for tabs focus detection. */
+	/** Used for tabs focus detection. */
 	int xpos, width;
 	int x, y;
 
-	/* For delayed tab resizing */
+	/** For delayed tab resizing */
 	unsigned int resize:1;
 };
 
diff --git a/src/util/base64.c b/src/util/base64.c
index fc777174..8046cc9c 100644
--- a/src/util/base64.c
+++ b/src/util/base64.c
@@ -1,4 +1,5 @@
-/* Base64 encode/decode implementation. */
+/** Base64 encode/decode implementation.
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -75,8 +76,13 @@ base64_decode(register unsigned char *in)
 	return base64_decode_bin(in, strlen(in), NULL);
 }
 
-/* base64_decode:  @in string to decode
- *		   returns the string decoded (must be freed by the caller) */
+/** Decode a Base64 string.
+ * @param in		Input Base64 string
+ * @param inlen		Length of @a in, in bytes
+ * @param[out] outlen	Length of decoded string
+ *
+ * @returns the string decoded (must be freed by the caller)
+ * or NULL if an error occurred (syntax error or out of memory) */
 unsigned char *
 base64_decode_bin(register unsigned char *in, int inlen, int *outlen)
 {
diff --git a/src/util/bitfield.h b/src/util/bitfield.h
index 0c8d7cd1..53086104 100644
--- a/src/util/bitfield.h
+++ b/src/util/bitfield.h
@@ -7,19 +7,23 @@
 
 /* Bitfield operations: */
 
+/** A vector of bits.  The size is fixed at initialization time.  */
 struct bitfield {
-	unsigned int bitsize;	/* Number of bits in the bitfield. */
-	unsigned char bits[1];	/* Strawberry bitfields forever. */
+	unsigned int bitsize;	/**< Number of bits in the bitfield. */
+	unsigned char bits[1];	/**< Strawberry bitfields forever. */
 };
 
+/** @relates bitfield */
 #define foreach_bitfield_set(bit, bitfield) \
 	for ((bit) = 0; (bit) < (bitfield)->bitsize; (bit)++) \
 		if (test_bitfield_bit(bitfield, bit))
 
+/** @relates bitfield */
 #define foreachback_bitfield_set(bit, bitfield) \
 	for ((bit) = (bitfield)->bitsize; (bit) > 0;) \
 		if (test_bitfield_bit(bitfield, --bit))
 
+/** @relates bitfield */
 #define foreach_bitfield_cleared(bit, bitfield) \
 	for ((bit) = 0; (bit) < (bitfield)->bitsize; (bit)++) \
 		if (!test_bitfield_bit(bitfield, bit))
@@ -31,7 +35,8 @@ struct bitfield {
 /* +7 to round up to nearest byte. */
 #define get_bitfield_byte_size(bits)	((size_t) (((bits) + 7) / 8))
 
-/* Allocate a bitfield containing @bits number of bits. */
+/** Allocate a bitfield containing @a bits number of bits.
+ * @relates bitfield */
 static inline struct bitfield *
 init_bitfield(size_t bits)
 {
@@ -44,7 +49,9 @@ init_bitfield(size_t bits)
 	return bitfield;
 }
 
-/* Update @bitfield with the @size bytes from the @bits string in @bits. */
+/** Update @a bitfield with the @a bytesize bytes from the bit string
+ * in @a bits.
+ * @relates bitfield */
 static inline void
 copy_bitfield(struct bitfield *bitfield,
 	      const unsigned char *bits, unsigned int bytesize)
@@ -54,7 +61,8 @@ copy_bitfield(struct bitfield *bitfield,
 		memcpy(bitfield->bits, bits, bytesize);
 }
 
-/* Test whether @bit is set in the bitfield. */
+/** Test whether @a bit is set in the @a bitfield.
+ * @relates bitfield */
 static inline int
 test_bitfield_bit(struct bitfield *bitfield, unsigned int bit)
 {
@@ -69,7 +77,8 @@ test_bitfield_bit(struct bitfield *bitfield, unsigned int bit)
 	return !!(bitfield->bits[byte_offset] & bit_offset);
 }
 
-/* Set @bit in the bitfield. */
+/** Set @a bit in the @a bitfield.
+ * @relates bitfield */
 static inline void
 set_bitfield_bit(struct bitfield *bitfield, unsigned int bit)
 {
@@ -84,7 +93,8 @@ set_bitfield_bit(struct bitfield *bitfield, unsigned int bit)
 	bitfield->bits[byte_offset] |= bit_offset;
 }
 
-/* Unset @bit in the bitfield. */
+/** Unset @a bit in the @a bitfield.
+ * @relates bitfield */
 static inline void
 clear_bitfield_bit(struct bitfield *bitfield, unsigned int bit)
 {
@@ -99,6 +109,8 @@ clear_bitfield_bit(struct bitfield *bitfield, unsigned int bit)
 	bitfield->bits[byte_offset] &= ~bit_offset;
 }
 
+/** Count the set bits in @a bitfield.
+ * @relates bitfield */
 static inline unsigned int
 get_bitfield_set_count(struct bitfield *bitfield)
 {
@@ -110,6 +122,8 @@ get_bitfield_set_count(struct bitfield *bitfield)
 	return count;
 }
 
+/** Count the unset bits in @a bitfield.
+ * @relates bitfield */
 static inline unsigned int
 get_bitfield_cleared_count(struct bitfield *bitfield)
 {
@@ -121,6 +135,8 @@ get_bitfield_cleared_count(struct bitfield *bitfield)
 	return count;
 }
 
+/** Check whether all bits of @a bitfield are set.
+ * @relates bitfield */
 static inline unsigned int
 bitfield_is_set(struct bitfield *bitfield)
 {
@@ -132,6 +148,8 @@ bitfield_is_set(struct bitfield *bitfield)
 	return 1;
 }
 
+/** Check whether all bits of @a bitfield are unset.
+ * @relates bitfield */
 static inline unsigned int
 bitfield_is_cleared(struct bitfield *bitfield)
 {
diff --git a/src/util/box.h b/src/util/box.h
index 74f5bb4f..b155dd2b 100644
--- a/src/util/box.h
+++ b/src/util/box.h
@@ -1,6 +1,7 @@
 #ifndef EL__UTIL_BOX_H
 #define EL__UTIL_BOX_H
 
+/** A rectangular part of a drawing surface, such as the screen.  */
 struct box {
 	int x;
 	int y;
@@ -8,6 +9,7 @@ struct box {
 	int height;
 };
 
+/** @relates box */
 static inline int
 is_in_box(struct box *box, int x, int y)
 {
@@ -16,19 +18,23 @@ is_in_box(struct box *box, int x, int y)
 		&& y < box->y + box->height);
 }
 
+/** @relates box */
 static inline int
 row_is_in_box(struct box *box, int y)
 {
 	return (y >= box->y && y < box->y + box->height);
 }
 
+/** @relates box */
 static inline int
 col_is_in_box(struct box *box, int x)
 {
 	return (x >= box->x && x < box->x + box->width);
 }
 
-/* Mainly intended for use with double-width characters.  */
+/** Check whether a span of columns is in @a box.
+ * Mainly intended for use with double-width characters.
+ * @relates box */
 static inline int
 colspan_is_in_box(struct box *box, int x, int span)
 {
@@ -36,6 +42,7 @@ colspan_is_in_box(struct box *box, int x, int span)
 }
 
 
+/** @relates box */
 static inline void
 set_box(struct box *box, int x, int y, int width, int height)
 {
@@ -45,6 +52,7 @@ set_box(struct box *box, int x, int y, int width, int height)
 	box->height = int_max(0, height);
 }
 
+/** @relates box */
 static inline void
 copy_box(struct box *dst, struct box *src)
 {
diff --git a/src/util/color.c b/src/util/color.c
index 8aa0b01c..5b7872a5 100644
--- a/src/util/color.c
+++ b/src/util/color.c
@@ -1,4 +1,5 @@
-/* Color parser */
+/** Color parser
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -40,7 +41,7 @@ colors_list_reset(void)
 	internal_pointer = color_specs;
 }
 
-/* Returns a pointer to a struct that contains
+/** Returns a pointer to a struct that contains
  * current key and data pointers and increment
  * internal pointer.
  * It returns NULL when key is NULL. */
diff --git a/src/util/color.h b/src/util/color.h
index 7fb6c46e..80ad9f8b 100644
--- a/src/util/color.h
+++ b/src/util/color.h
@@ -10,21 +10,23 @@ struct color_pair {
 
 #define INIT_COLOR_PAIR(bg, fg) { bg, fg }
 
-/* Decode the color string. */
-/* The color string can either contain '#FF0044' style declarations or
+/** Decode the color string.
+ * The color string can either contain '@#FF0044' style declarations or
  * color names. */
 int decode_color(unsigned char *str, int slen, color_T *color);
 
-/* Returns a string containing the color info. If no ``English'' name can be
- * found the hex color (#rrggbb) is returned in the given buffer. */
+/** Returns a string containing the color info. If no 'English' name can be
+ * found the hex color (@#rrggbb) is returned in the given buffer. */
 const unsigned char *get_color_string(color_T color, unsigned char hexcolor[8]);
 
-/* Translate rgb color to string in #rrggbb format. str should be a pointer to
- * a 8 bytes memory space. */
+/** Translate rgb color to string in @#rrggbb format.
+ * @a str should be a pointer to an 8 bytes memory space. */
 void color_to_string(color_T color, unsigned char str[8]);
 
-/* Fastfind lookup management. */
+/** @name Fastfind lookup management.
+ * @{ */
 void init_colors_lookup(void);
 void free_colors_lookup(void);
+/** @} */
 
 #endif
diff --git a/src/util/conv.c b/src/util/conv.c
index 13c27f69..e35ecdce 100644
--- a/src/util/conv.c
+++ b/src/util/conv.c
@@ -1,4 +1,5 @@
-/* Conversion functions */
+/** Conversion functions
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -22,30 +23,33 @@
 
 
 
-/* This function takes string @s and stores the @number (of a result width
- * @width) in string format there, starting at position [*@slen]. If the number
- * would take more space than @width, it is truncated and only the _last_
- * digits of it are inserted to the string. If the number takes less space than
- * @width, it is padded by @fillchar from left.
- * @base defined which base should be used (10, 16, 8, 2, ...)
- * @upper selects either hexa uppercased chars or lowercased chars.
+/** This function takes string @a s and stores the @a number (of a
+ * result width @a width) in string format there, starting at position
+ * [*@a slen]. If the number would take more space than @a width, it
+ * is truncated and only the _last_ digits of it are inserted to the
+ * string. If the number takes less space than @a width, it is padded
+ * by @a fillchar from left.
+ * @a base defined which base should be used (10, 16, 8, 2, ...)
+ * @a upper selects either hexa uppercased chars or lowercased chars.
  *
- * A NUL char is always added at the end of the string. @s must point to a
- * sufficiently large memory space, at least *@slen + @width + 1.
+ * A NUL char is always added at the end of the string. @a s must point
+ * to a sufficiently large memory space, at least *@a slen + @a width + 1.
  *
  * Examples:
  *
+ * @code
  * elinks_ulongcat(s, NULL, 12345, 4, 0, 10, 0) : s = "2345"
  * elinks_ulongcat(s, NULL, 255, 4, '*', 16, 1) : s = "**FF"
  * elinks_ulongcat(s, NULL, 123, 5, '0', 10, 0) : s = "00123"
+ * @endcode
  *
  * Note that this function exists to provide a fast and efficient, however
  * still quite powerful alternative to sprintf(). It is optimized for speed and
  * is *MUCH* faster than sprintf(). If you can use it, use it ;-). But do not
  * get too enthusiastic, do not use it in cases where it would break i18n.
- */
-/* The function returns 0 if OK or width needed for the whole number to fit
- * there, if it had to be truncated. A negative value signs an error. */
+ *
+ * @returns 0 if OK or width needed for the whole number to fit there,
+ * if it had to be truncated. A negative value signs an error. */
 int inline
 elinks_ulongcat(unsigned char *s, unsigned int *slen,
 		unsigned long number, unsigned int width,
@@ -103,7 +107,7 @@ elinks_ulongcat(unsigned char *s, unsigned int *slen,
 	return ret;
 }
 
-/* Similar to elinks_ulongcat() but for long number. */
+/** Similar to elinks_ulongcat() but for @c long number. */
 int inline
 elinks_longcat(unsigned char *s, unsigned int *slen,
 	       long number, unsigned int width,
@@ -123,6 +127,7 @@ elinks_longcat(unsigned char *s, unsigned int *slen,
 }
 
 
+/** @relates string */
 struct string *
 add_long_to_string(struct string *string, long number)
 {
@@ -139,6 +144,7 @@ add_long_to_string(struct string *string, long number)
 	return add_bytes_to_string(string, buffer, length);
 }
 
+/** @relates string */
 struct string *
 add_knum_to_string(struct string *string, long num)
 {
@@ -165,6 +171,7 @@ add_knum_to_string(struct string *string, long num)
 	return string;
 }
 
+/** @relates string */
 struct string *
 add_xnum_to_string(struct string *string, off_t xnum)
 {
@@ -198,6 +205,7 @@ add_xnum_to_string(struct string *string, off_t xnum)
 	return string;
 }
 
+/** @relates string */
 struct string *
 add_duration_to_string(struct string *string, long seconds)
 {
@@ -232,6 +240,7 @@ add_duration_to_string(struct string *string, long seconds)
 	return string;
 }
 
+/** @relates string */
 struct string *
 add_timeval_to_string(struct string *string, timeval_T *timeval)
 {
@@ -469,8 +478,8 @@ month2num(const unsigned char *str)
 	}
 }
 
-/* This function drops control chars, nbsp char and limit the number of consecutive
- * space chars to one. It modifies its argument. */
+/** This function drops control chars, nbsp char and limit the number
+ * of consecutive space chars to one. It modifies its argument. */
 void
 clr_spaces(unsigned char *str)
 {
@@ -492,7 +501,7 @@ clr_spaces(unsigned char *str)
 	*dest = '\0';
 }
 
-/* Replace invalid chars in @title with ' ' and trim all starting/ending
+/** Replace invalid chars in @a title with ' ' and trim all starting/ending
  * spaces. */
 void
 sanitize_title(unsigned char *title)
@@ -508,7 +517,7 @@ sanitize_title(unsigned char *title)
 	trim_chars(title, ' ', NULL);
 }
 
-/* Returns 0 if @url contains invalid chars, 1 if ok.
+/** Returns 0 if @a url contains invalid chars, 1 if ok.
  * It trims starting/ending spaces. */
 int
 sanitize_url(unsigned char *url)
diff --git a/src/util/conv.h b/src/util/conv.h
index 8f5c2b12..605388bb 100644
--- a/src/util/conv.h
+++ b/src/util/conv.h
@@ -17,23 +17,23 @@ is_safe_in_shell(unsigned char c)
 
 long strtolx(unsigned char *, unsigned char **);
 
-/* Convert a decimal number to hexadecimal (lowercase) (0 <= a <= 15). */
+/** Convert a decimal number to hexadecimal (lowercase) (0 <= @a a <= 15). */
 static inline unsigned char
 hx(register int a)
 {
 	return a >= 10 ? a + 'a' - 10 : a + '0';
 }
 
-/* Convert a decimal number to hexadecimal (uppercase) (0 <= a <= 15). */
+/** Convert a decimal number to hexadecimal (uppercase) (0 <= @a a <= 15). */
 static inline unsigned char
 Hx(register int a)
 {
 	return a >= 10 ? a + 'A' - 10 : a + '0';
 }
 
-/* Convert an hexadecimal char ([0-9][a-z][A-Z]) to
- * its decimal value (0 <= result <= 15)
- * returns -1 if parameter is not an hexadecimal char. */
+/** Convert an hexadecimal char ([0-9][a-z][A-Z]) to
+ * its decimal value (0 <= result <= 15).
+ * Returns -1 if parameter is not an hexadecimal char. */
 static inline int
 unhx(register unsigned char a)
 {
@@ -51,58 +51,70 @@ struct string *add_duration_to_string(struct string *string, long seconds);
 struct string *add_timeval_to_string(struct string *string, timeval_T *timeval);
 
 #ifdef HAVE_STRFTIME
-/* Uses strftime() to add @fmt time format to @string. If @time is NULL
- * time(NULL) will be used. */
+/** Uses strftime() to format @a time according to @a format and adds
+ * the result to @a string. If @a time is NULL, time(NULL) will be
+ * used.
+ * @relates string */
 struct string *add_date_to_string(struct string *string,
 				  const unsigned char *format,
 				  const time_t *time);
 #endif
 
 
-/* Encoders: */
-/* They encode and add to the string. This way we don't need to first allocate
+/** @name Encoders:
+ * They encode and add to the string. This way we don't need to first allocate
  * and encode a temporary string, add it and then free it. Can be used as
- * backends for encoder. */
+ * backends for encoder.
+ * @{ */
 
-/* A simple generic encoder. Should maybe take @replaceable as a string so we
- * could also use it for adding shell safe strings. */
+/** A simple generic encoder. Should maybe take @a replaceable as a
+ * string so we could also use it for adding shell safe strings.
+ * @relates string */
 struct string *
 add_string_replace(struct string *string, unsigned char *src, int len,
 		   unsigned char replaceable, unsigned char replacement);
 
+/** @relates string */
 #define add_optname_to_string(str, src, len) \
 	add_string_replace(str, src, len, '.', '*')
 
-/* Maybe a bad name but it is actually the real name, but you may also think of
- * it as adding the decoded option name. */
+/** Maybe a bad name but it is actually the real name, but you may
+ * also think of it as adding the decoded option name.
+ * @relates string */
 #define add_real_optname_to_string(str, src, len) \
 	add_string_replace(str, src, len, '*', '.')
 
-/* Convert reserved chars to html &#xx;.  This function copies bytes
+/** Convert reserved chars to html @&@#xx;.  This function copies bytes
  * 0x80...0xFF unchanged, so the caller should ensure that the
  * resulting HTML will be parsed with the same charset as the original
- * string.  (This function cannot use the &#160; syntax for non-ASCII,
+ * string.  (This function cannot use the @&@#160; syntax for non-ASCII,
  * because HTML wants Unicode numbers there and this function does not
- * know the charset of the input data.)  */
+ * know the charset of the input data.)
+ * @relates string */
 struct string *add_html_to_string(struct string *string, const unsigned char *html, int htmllen);
 
-/* Convert reserved or non-ASCII chars to html &#xx;.  The resulting
+/** Convert reserved or non-ASCII chars to html @&@#xx;.  The resulting
  * string can be correctly parsed in any charset where bytes
- * 0x20...0x7E match ASCII.  */
+ * 0x20...0x7E match ASCII.
+ * @relates string */
 struct string *add_cp_html_to_string(struct string *string, int src_codepage,
 				     const unsigned char *html, int htmllen);
 
-/* Escapes \ and " with a \ */
+/** Escapes @\ and " with a @\
+ * @relates string */
 struct string *add_quoted_to_string(struct string *string, const unsigned char *q, int qlen);
 
-/* Adds ', |len| bytes of |src| with all single-quotes converted to '\'',
- * and ' to |string|. */
+/** Adds ', @a len bytes of @a src with all single-quotes converted to '\'',
+ * and ' to @a string.
+ * @relates string */
 struct string *add_shell_quoted_to_string(struct string *string,
 					  unsigned char *src, int len);
 
-/* Escapes non shell safe chars with '_'. */
+/* Escapes non shell safe chars with '_'.
+ * @relates string */
 struct string *add_shell_safe_to_string(struct string *string, unsigned char *cmd, int cmdlen);
 
+/** @} */
 
 /* These are fast functions to convert integers to string, or to hexadecimal string. */
 
@@ -115,7 +127,7 @@ int elinks_longcat(unsigned char *s, unsigned int *slen, long number,
 		   unsigned int upper);
 
 /* Type casting is enforced, to shorten calls. --Zas */
-/* unsigned long to decimal string */
+/** unsigned long to decimal string */
 #define ulongcat(s, slen, number, width, fillchar) \
 	elinks_ulongcat((unsigned char *) (s), \
 			(unsigned int *) (slen), \
@@ -125,7 +137,7 @@ int elinks_longcat(unsigned char *s, unsigned int *slen, long number,
 			(unsigned int) 10, \
 			(unsigned int) 0)
 
-/* signed long to decimal string */
+/** signed long to decimal string */
 #define longcat(s, slen, number, width, fillchar) \
 	 elinks_longcat((unsigned char *) (s), \
 			(unsigned int *) (slen), \
@@ -135,7 +147,7 @@ int elinks_longcat(unsigned char *s, unsigned int *slen, long number,
 			(unsigned int) 10, \
 			(unsigned int) 0)
 
-/* unsigned long to hexadecimal string */
+/** unsigned long to hexadecimal string */
 #define ulonghexcat(s, slen, number, width, fillchar, upper) \
 	elinks_ulongcat((unsigned char *) (s), \
 			(unsigned int *) (slen), \
@@ -146,19 +158,15 @@ int elinks_longcat(unsigned char *s, unsigned int *slen, long number,
 			(unsigned int) (upper))
 
 
-/* XXX: Compatibility only. Remove these at some time. --Zas */
-#define snprint(str, len, num) ulongcat(str, NULL, num, len, 0);
-#define snzprint(str, len, num) longcat(str, NULL, num, len, 0);
-
-/* Return 0 if starting with jan, 11 for dec, -1 for failure.
- * @month must be a lowercased string. */
+/** Return 0 if starting with jan, 11 for dec, -1 for failure.
+ * @a month must be a lowercased string. */
 int month2num(const unsigned char *month);
 
 #include <string.h>
 
-/* Trim starting and ending chars equal to @c in string @s.
- * If @len != NULL, it stores new string length in pointed integer.
- * It returns @s for convenience. */
+/** Trim starting and ending chars equal to @a c in string @a s.
+ * If @a len != NULL, it stores new string length in pointed integer.
+ * It returns @a s for convenience. */
 static inline unsigned char *
 trim_chars(unsigned char *s, unsigned char c, int *len)
 {
@@ -174,7 +182,8 @@ trim_chars(unsigned char *s, unsigned char c, int *len)
 	return s;
 }
 
-/* Convert uppercase letters in @string with the given @length to lowercase. */
+/** Convert uppercase letters in @a string with the given @a length to
+ * lowercase. */
 static inline void
 convert_to_lowercase(unsigned char *string, int length)
 {
@@ -183,15 +192,15 @@ convert_to_lowercase(unsigned char *string, int length)
 			string[length] = tolower(string[length]);
 }
 
-/* This function drops control chars, nbsp char and limit the number of consecutive
- * space chars to one. It modifies its argument. */
+/** This function drops control chars, nbsp char and limit the number
+ * of consecutive space chars to one. It modifies its argument. */
 void clr_spaces(unsigned char *str);
 
-/* Replace invalid chars in @title with ' ' and trim all starting/ending
+/** Replace invalid chars in @a title with ' ' and trim all starting/ending
  * spaces. */
 void sanitize_title(unsigned char *title);
 
-/* Returns 0 if @url contains invalid chars, 1 if ok.
+/** Returns 0 if @a url contains invalid chars, 1 if ok.
  * It trims starting/ending spaces. */
 int sanitize_url(unsigned char *url);
 
diff --git a/src/util/env.c b/src/util/env.c
index 6a948a1c..d9bc42c8 100644
--- a/src/util/env.c
+++ b/src/util/env.c
@@ -1,4 +1,5 @@
-/* Environment variables handling */
+/** Environment variables handling
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -16,11 +17,11 @@
 #include "util/memory.h"
 #include "util/string.h"
 
-/* Set @name environment variable to @value or a substring of it:
+/** Set @a name environment variable to @a value or a substring of it:
  * On success, it returns 0.
- * If @value is NULL and on error, it returns -1.
- * If @length >= 0 and smaller than true @value length, it will
- * set @name to specified substring of @value.
+ * If @a value is NULL and on error, it returns -1.
+ * If @a length >= 0 and smaller than true @a value length, it will
+ * set @a name to specified substring of @a value.
  */
 int
 env_set(unsigned char *name, unsigned char *value, int length)
diff --git a/src/util/error.c b/src/util/error.c
index 34e4c88f..f3a6f3e9 100644
--- a/src/util/error.c
+++ b/src/util/error.c
@@ -1,4 +1,5 @@
-/* Error handling and debugging stuff */
+/** Error handling and debugging stuff
+ * @file */
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE /* Needed for vasprintf() */
diff --git a/src/util/error.h b/src/util/error.h
index a97c921b..0a8867f1 100644
--- a/src/util/error.h
+++ b/src/util/error.h
@@ -1,26 +1,27 @@
-#ifndef EL__UTIL_ERROR_H
-#define EL__UTIL_ERROR_H
-
-
-/* Here you will found a chunk of functions useful for error states --- from
+/** Error handling and debugging stuff
+ * @file
+ *
+ * Here you will found a chunk of functions useful for error states --- from
  * reporting of various problems to generic error tests/workarounds to some
  * tools to be used when you got into an error state already. Some of the
  * functions are also useful for debugging. */
 
+#ifndef EL__UTIL_ERROR_H
+#define EL__UTIL_ERROR_H
 
 /* This errfile thing is needed, as we don't have var-arg macros in standart,
  * only as gcc extension :(. */
 extern int errline;
 extern const unsigned char *errfile;
 
-/* @DBG(format_string) is used for printing of debugging information. It
+/** @c DBG(format_string) is used for printing of debugging information. It
  * should not be used anywhere in the official codebase (although it is often
  * lying there commented out, as it may get handy). */
 #undef DBG
 #define DBG errfile = __FILE__, errline = __LINE__, elinks_debug
 void elinks_debug(unsigned char *fmt, ...);
 
-/* @WDBG(format_string) is used for printing of debugging information, akin
+/** @c WDBG(format_string) is used for printing of debugging information, akin
  * to DBG(). However, it sleep(1)s, therefore being useful when it is going
  * to be overdrawn or so. It should not be used anywhere in the official
  * codebase (although it is often lying there commented out, as it may get
@@ -29,7 +30,7 @@ void elinks_debug(unsigned char *fmt, ...);
 #define WDBG errfile = __FILE__, errline = __LINE__, elinks_wdebug
 void elinks_wdebug(unsigned char *fmt, ...);
 
-/* @ERROR(format_string) is used to report non-fatal unexpected errors during
+/** @c ERROR(format_string) is used to report non-fatal unexpected errors during
  * the ELinks run. It tries to (not that agressively) draw user's attention to
  * the error, but never dumps core or so. Note that this should be used only in
  * cases of non-severe internal inconsistences etc, never as an indication of
@@ -39,7 +40,7 @@ void elinks_wdebug(unsigned char *fmt, ...);
 #define ERROR errfile = __FILE__, errline = __LINE__, elinks_error
 void elinks_error(unsigned char *fmt, ...);
 
-/* @INTERNAL(format_string) is used to report fatal errors during the ELinks
+/** @c INTERNAL(format_string) is used to report fatal errors during the ELinks
  * run. It tries to draw user's attention to the error and dumps core if ELinks
  * is running in the CONFIG_DEBUG mode. */
 #undef INTERNAL
@@ -47,7 +48,7 @@ void elinks_error(unsigned char *fmt, ...);
 void elinks_internal(unsigned char *fmt, ...);
 
 
-/* @usrerror(format_string) is used to report user errors during a peaceful
+/** @c usrerror(format_string) is used to report user errors during a peaceful
  * ELinks run. It does not belong to the family above - it doesn't print code
  * location, beep nor sleep, it just wraps around fprintf(stderr, "...\n");. */
 void usrerror(unsigned char *fmt, ...);
@@ -55,16 +56,18 @@ void usrerror(unsigned char *fmt, ...);
 
 #ifdef HAVE_VARIADIC_MACROS
 #ifdef CONFIG_DEBUG
-/* The LOG_*() macros can be used to log to a file, however, by default log
+/** The @c LOG_*() macros can be used to log to a file, however, by default log
  * messages are written to stderr. Set the following environment variables
  * to configure the log behavior:
  *
- *	ELINKS_LOG	- The path to the log file, it is opened for appending
- *	ELINKS_MSG	- A comma separated list containing "error", "warn",
- *			  "info" and/or "debug" which can be used to limit
- *			  what messages to emit to the log.
- *	ELINKS_FILES	- A comma separated list of which files names to
- *			  emit log messages from.
+ * <dl>
+ * <dt>ELINKS_LOG	<dd>The path to the log file, it is opened for appending
+ * <dt>ELINKS_MSG	<dd>A comma separated list containing "error", "warn",
+ *			    "info" and/or "debug" which can be used to limit
+ *			    what messages to emit to the log.
+ * <dt>ELINKS_FILES	<dd>A comma separated list of which files names to
+ *			    emit log messages from.
+ * </dl>
  */
 void
 elinks_log(unsigned char *msg, unsigned char *file, int line,
@@ -91,10 +94,10 @@ elinks_log(unsigned char *msg, unsigned char *file, int line,
 
 
 
-/* This is our smart assert(). It is basically equivalent to if (x) INTERNAL(),
+/** This is our smart assert(). It is basically equivalent to if (x) INTERNAL(),
  * but it generates a uniform message and mainly does not do the test if we are
  * supposed to be lightning fast. Use it, use it a lot! And never forget the
- * recovery path, see below if_assert_failed. */
+ * recovery path, see below ::if_assert_failed. */
 
 #undef assert
 #ifdef CONFIG_FASTMEM
@@ -107,7 +110,7 @@ do { if (!assert_failed && (assert_failed = !(x))) { \
 #endif
 
 
-/* This is extended assert() version, it can print additional user-specified
+/** This is extended assert() version, it can print additional user-specified
  * message. Quite useful not only to detect that _something_ is wrong, but also
  * _how_ wrong is it ;-). Note that the format string must always be a regular
  * string, not a variable reference. Also, be careful _what_ will you attempt
@@ -152,29 +155,31 @@ void elinks_assertm(int x, unsigned char *fmt, ...)
 #endif /* HAVE_VARIADIC_MACROS */
 
 
-/* To make recovery path possible (assertion failed may not mean end of the
+/** Whether an assertion has failed and the failure has not yet been handled.
+ * To make recovery path possible (assertion failed may not mean end of the
  * world, the execution goes on if we're outside of CONFIG_DEBUG and CONFIG_FASTMEM),
- * @assert_failed is set to true if the last assert() failed, otherwise it's
+ * @c assert_failed is set to true if the last assert() failed, otherwise it's
  * zero. Note that you must never change assert_failed value, sorry guys.
  *
- * You should never test assert_failed directly anyway. Use if_assert_failed
+ * You should never test @c assert_failed directly anyway. Use ::if_assert_failed
  * instead, it will attempt to hint compiler to optimize out the recovery path
  * if we're CONFIG_FASTMEM. So it should go like:
  *
+ * @code
  * assertm(1 == 1, "The world's gonna blow up!");
- * if_assert_failed { schedule_time_machine(); return; } */
-
-/* In-depth explanation: this restriction is here because in the CONFIG_FASTMEM mode,
- * assert_failed is initially initialized to zero and then not ever touched
+ * if_assert_failed { schedule_time_machine(); return; }
+ * @endcode
+ *
+ * In-depth explanation: this restriction is here because in the CONFIG_FASTMEM mode,
+ * @c assert_failed is initially initialized to zero and then not ever touched
  * anymore. So if you change it to non-zero failure, your all further recovery
  * paths will get hit (and since developers usually don't test CONFIG_FASTMEM mode
  * extensively...). So better don't mess with it, even if you would do that
  * with awareness of this fact. We don't want to iterate over tens of spots all
  * over the code when we change one detail regarding CONFIG_FASTMEM operation.
  *
- * This is not that actual after introduction of if_assert_failed, but it's
+ * This is not that actual after introduction of ::if_assert_failed, but it's
  * a safe recommendation anyway, so... ;-) */
-
 extern int assert_failed;
 
 #undef if_assert_failed
@@ -186,17 +191,18 @@ extern int assert_failed;
 
 
 
-/* This will print some fancy message, version string and possibly do something
- * else useful. Then, it will dump core. */
+/** This will print some fancy message, version string and possibly do
+ * something else useful. Then, it will dump core. */
 #ifdef CONFIG_DEBUG
 void force_dump(void);
 #endif
 
 
-/* This function does nothing, except making compiler not to optimize certains
+/** This function does nothing, except making compiler not to optimize certains
  * spots of code --- this is useful when that particular optimization is buggy.
- * So we are just workarounding buggy compilers. */
-/* This function should be always used only in context of compiler version
+ * So we are just workarounding buggy compilers.
+ *
+ * This function should be always used only in context of compiler version
  * specific macros. */
 void do_not_optimize_here(void *x);
 
@@ -219,11 +225,12 @@ void do_not_optimize_here(void *x);
 #endif
 
 
-/* This function dumps backtrace (or whatever similiar it founds on the stack)
- * nicely formatted and with symbols resolved to @f. When @trouble is set, it
- * tells it to be extremely careful and not use dynamic memory allocation
- * functions etc (useful in SIGSEGV handler etc). */
-/* Note that this function just calls system-specific backend provided by the
+/** This function dumps backtrace (or whatever similar it founds on the stack)
+ * nicely formatted and with symbols resolved to @a f. When @a trouble is set,
+ * it tells it to be extremely careful and not use dynamic memory allocation
+ * functions etc (useful in SIGSEGV handler etc).
+ *
+ * Note that this function just calls system-specific backend provided by the
  * libc, so it is available only on some systems. CONFIG_BACKTRACE is defined
  * if it is available on yours. */
 #ifdef CONFIG_BACKTRACE
@@ -231,7 +238,7 @@ void do_not_optimize_here(void *x);
 void dump_backtrace(FILE *f, int trouble);
 #endif
 
-/* This is needed for providing info about features when dumping core */
+/** This is needed for providing info about features when dumping core */
 extern unsigned char full_static_version[1024];
 
 #endif
diff --git a/src/util/fastfind.c b/src/util/fastfind.c
index 3ee3bb5f..9279dc59 100644
--- a/src/util/fastfind.c
+++ b/src/util/fastfind.c
@@ -1,4 +1,57 @@
-/* Very fast search_keyword_in_list. */
+/** Very fast search_keyword_in_list.
+ * @file
+ *
+ *
+ * It replaces bsearch() + strcasecmp() + callback + ...
+ *
+ * Following conditions should be met:
+ *
+ * - list keys are C strings.
+ * - keys should not be greater than 255 characters, and optimally < 20
+ *   characters. It can work with greater keys but then memory usage will
+ *   grow a lot.
+ * - each key must be unique and non empty.
+ * - list do not have to be ordered.
+ * - total number of unique characters used in all keys should be <= 128
+ * - idealy total number of keys should be <= 512 (but see below)
+ *
+ *  (c) 2003 Laurent MONIN (aka Zas)
+ * Feel free to do whatever you want with that code.
+ *
+ *
+ * These routines use a tree search. First, a big tree is composed from the
+ * keys on input. Then, when searching we just go through the tree. If we will
+ * end up on an 'ending' node, we've got it.
+ *
+ * Hm, okay. For keys { 'head', 'h1', 'body', 'bodyrock', 'bodyground' }, it
+ * would look like:
+ *
+ * @verbatim
+ *             [root]
+ *          b          h
+ *          o        e   1
+ *          d        a
+ *          Y        D
+ *        g   r
+ *        r   o
+ *        o   c
+ *        u   K
+ *        D
+ * @endverbatim
+ *
+ * (the ending nodes are upcased just for this drawing, not in real)
+ *
+ * To optimize this for speed, leafs of nodes are organized in per-node arrays
+ * (so-called 'leafsets'), indexed by symbol value of the key's next character.
+ * But to optimize that for memory, we first compose own alphabet consisting
+ * only from the chars we ever use in the key strings. fastfind_info.uniq_chars
+ * holds that alphabet and fastfind_info.idxtab is used to translate between it
+ * and ASCII.
+ *
+ * Tree building: O((L+M)*N)
+ * 			(L: mean key length, M: alphabet size,
+ * 			 N: number of items).
+ * String lookup: O(N) (N: string length). */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -17,61 +70,12 @@
 
 #ifdef USE_FASTFIND
 
-/* It replaces bsearch() + strcasecmp() + callback + ...
- *
- * Following conditions should be met:
- *
- * - list keys are C strings.
- * - keys should not be greater than 255 characters, and optimally < 20
- *   characters. It can work with greater keys but then memory usage will
- *   grow a lot.
- * - each key must be unique and non empty.
- * - list do not have to be ordered.
- * - total number of unique characters used in all keys should be <= 128
- * - idealy total number of keys should be <= 512 (but see below)
- *
- *  (c) 2003 Laurent MONIN (aka Zas)
- * Feel free to do whatever you want with that code. */
-
-
-/* These routines use a tree search. First, a big tree is composed from the
- * keys on input. Then, when searching we just go through the tree. If we will
- * end up on an 'ending' node, we've got it.
- *
- * Hm, okay. For keys { 'head', 'h1', 'body', 'bodyrock', 'bodyground' }, it
- * would look like:
- *
- *             [root]
- *          b          h
- *          o        e   1
- *          d        a
- *          Y        D
- *        g   r
- *        r   o
- *        o   c
- *        u   K
- *        D
- *
- * (the ending nodes are upcased just for this drawing, not in real)
- *
- * To optimize this for speed, leafs of nodes are organized in per-node arrays
- * (so-called 'leafsets'), indexed by symbol value of the key's next character.
- * But to optimize that for memory, we first compose own alphabet consisting
- * only from the chars we ever use in the key strings. @uniq_chars holds that
- * alphabet and @idxtab is used to translate between it and ASCII.
- *
- * Tree building: O((L+M)*N)
- * 			(L: mean key length, M: alphabet size,
- * 			 N: number of items).
- * String lookup: O(N) (N: string length). */
-
-
-/* Define it to generate performance and memory usage statistics to stderr. */
+/** Define it to generate performance and memory usage statistics to stderr. */
 #if 0
 #define DEBUG_FASTFIND
 #endif
 
-/* Define whether to use 32 or 64 bits per compressed element. */
+/** Define whether to use 32 or 64 bits per compressed element. */
 #if 1
 #define USE_32_BITS
 #endif
@@ -114,16 +118,16 @@
 #endif
 
 struct ff_node {
-	/* End leaf -> p is significant */
+	/** End leaf -> p is significant */
 	unsigned int e:END_LEAF_BITS;
 
-	/* Compressed */
+	/** Compressed */
 	unsigned int c:COMPRESSED_BITS;
 
-	/* Index in pointers */
+	/** Index in pointers */
 	unsigned int p:POINTER_INDEX_BITS;
 
-	/* Index in leafsets */
+	/** Index in leafsets */
 	unsigned int l:LEAFSET_INDEX_BITS;
 };
 
@@ -141,7 +145,7 @@ struct ff_node_c {
 	unsigned int p:POINTER_INDEX_BITS;
 	unsigned int l:LEAFSET_INDEX_BITS;
 
-	/* Index of char when compressed. */
+	/** Index of char when compressed. */
 	unsigned int ch:COMP_CHAR_INDEX_BITS;
 };
 
@@ -212,7 +216,7 @@ struct fastfind_info {
 	} while (0)
 #define FF_DBG_comment(x, str) do { (x)->debug.comment = empty_string_or_(str); } while (0)
 
-/* Update search stats. */
+/** Update search stats. */
 static void
 FF_DBG_search_stats(struct fastfind_info *info, int key_len)
 {
@@ -222,7 +226,7 @@ FF_DBG_search_stats(struct fastfind_info *info, int key_len)
 	info->debug.itertmp = info->debug.iterations;
 }
 
-/* Dump all stats. */
+/** Dump all stats. */
 static void
 FF_DBG_dump_stats(struct fastfind_info *info)
 {
@@ -296,7 +300,7 @@ init_fastfind(struct fastfind_index *index, enum fastfind_flags flags)
 	return info;
 }
 
-/* Return 1 on success, 0 on allocation failure */
+/** @returns 1 on success, 0 on allocation failure */
 static int
 alloc_ff_data(struct fastfind_info *info)
 {
@@ -315,7 +319,7 @@ alloc_ff_data(struct fastfind_info *info)
 	return 1;
 }
 
-/* Add pointer and its key length to correspondant arrays, incrementing
+/** Add pointer and its key length to correspondant arrays, incrementing
  * internal counter. */
 static void
 add_to_ff_data(void *p, int key_len, struct fastfind_info *info)
@@ -327,7 +331,7 @@ add_to_ff_data(void *p, int key_len, struct fastfind_info *info)
 	data->keylen = key_len;
 }
 
-/* Return 1 on success, 0 on allocation failure */
+/** @returns 1 on success, 0 on allocation failure */
 static int
 alloc_leafset(struct fastfind_info *info)
 {
@@ -542,7 +546,7 @@ return_error:
 #undef ifcase
 
 
-/* This macro searchs for the key in indexed list */
+/** This macro searchs for the key in indexed list */
 #define FF_SEARCH(what) do {							\
 	int i;									\
 										\
@@ -729,14 +733,14 @@ struct list list[] = {
 
 struct list *internal_pointer;
 
-/* Reset internal list pointer */
+/** Reset internal list pointer */
 void
 reset_list(void)
 {
 	internal_pointer = list;
 }
 
-/* Returns a pointer to a struct that contains
+/** Returns a pointer to a struct that contains
  * current key and data pointers and increment
  * internal pointer.
  * It returns NULL when key is NULL. */
diff --git a/src/util/fastfind.h b/src/util/fastfind.h
index 4f50ea3d..27a03407 100644
--- a/src/util/fastfind.h
+++ b/src/util/fastfind.h
@@ -1,7 +1,7 @@
 #ifndef EL__UTIL_FASTFIND_H
 #define EL__UTIL_FASTFIND_H
 
-/* Whether to use these routines or not. */
+/** Whether to use these routines or not. */
 #ifndef CONFIG_SMALL
 #define USE_FASTFIND 1
 #else
@@ -17,39 +17,43 @@ struct fastfind_key_value {
 
 enum fastfind_flags {
 	FF_NONE = 0,
-	FF_CASE_AWARE = 1,	/* honour case when comparing */
-	FF_COMPRESS = 2,	/* compress nodes if possible */
+	FF_CASE_AWARE = 1,	/**< honour case when comparing */
+	FF_COMPRESS = 2,	/**< compress nodes if possible */
 };
 
 struct fastfind_index {
-	/* Description useful for debugging mode. */
+	/** Description useful for debugging mode. */
 	unsigned char *comment;
-	/* Start over. */
+	/** Start over. */
 	void (*reset)(void);
-	/* Get next struct fastfind_key_value in line. */
+	/** Get next struct fastfind_key_value in line. */
 	struct fastfind_key_value *(*next)(void);
-	/* Internal reference */
+	/** Internal reference */
 	void *handle;
 };
 
 #define INIT_FASTFIND_INDEX(comment, reset, next) \
 	{ (comment), (reset), (next) }
 
-/* Initialize and index a list of keys. */
-/* Keys are iterated using:
- * @index		index info
- * @flags 		control case sensitivity, compression */
-/* This function must be called once and only once per list. */
-/* Failure is not an option, so call it at startup. */
+/** Initialize and index a list of keys.
+ * Keys are iterated using:
+ * @param index		index info
+ * @param flags 	control case sensitivity, compression
+ *
+ * This function must be called once and only once per list.
+ * Failure is not an option, so call it at startup.
+ * @relates fastfind_index */
 struct fastfind_index *fastfind_index(struct fastfind_index *index, enum fastfind_flags flags);
 
 /* The main reason of all that stuff is here. */
-/* Search the index for @key with length @key_len using the
- * @index' handle created with fastfind_index(). */
+/** Search the index for @a key with length @a key_len using the
+ * @a index' handle created with fastfind_index().
+ * @relates fastfind_index */
 void *fastfind_search(struct fastfind_index *index, unsigned char *key, int key_len);
 
-/* Fastfind cleanup. It frees the index given by the @fastfind_handle. */
-/* Must be called once per list. */
+/** Fastfind cleanup. It frees the given @a index.
+ * Must be called once per list.
+ * @relates fastfind_index */
 void fastfind_done(struct fastfind_index *index);
 
 #endif
diff --git a/src/util/file.c b/src/util/file.c
index d44d83b0..2c2c2bc5 100644
--- a/src/util/file.c
+++ b/src/util/file.c
@@ -1,4 +1,5 @@
-/* File utilities */
+/** File utilities
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -283,7 +284,8 @@ safe_mkstemp(unsigned char *template)
 }
 
 
-/* The stat_* functions set the various attributes for directory entries. */
+/** @name The stat_* functions set the various attributes for directory entries.
+ * @{ */
 
 static inline void
 stat_type(struct string *string, struct stat *stp)
@@ -476,6 +478,8 @@ stat_date(struct string *string, struct stat *stp)
 	add_to_string(string, "             ");
 }
 
+/** @} */
+
 
 static int
 compare_dir_entries(struct directory_entry *d1, struct directory_entry *d2)
@@ -488,8 +492,8 @@ compare_dir_entries(struct directory_entry *d1, struct directory_entry *d2)
 }
 
 
-/* This function decides whether a file should be shown in directory listing or
- * not. Returns according boolean value. */
+/** This function decides whether a file should be shown in directory
+ * listing or not. @returns according boolean value. */
 static inline int
 file_visible(unsigned char *name, int get_hidden_files, int is_root_directory)
 {
@@ -510,9 +514,8 @@ file_visible(unsigned char *name, int get_hidden_files, int is_root_directory)
 	return get_hidden_files;
 }
 
-/* First information such as permissions is gathered for each directory entry.
- * All entries are then sorted and finally the sorted entries are added to the
- * @data->fragment one by one. */
+/** First information such as permissions is gathered for each directory entry.
+ * All entries are then sorted. */
 struct directory_entry *
 get_directory_entries(unsigned char *dirname, int get_hidden)
 {
@@ -585,7 +588,7 @@ get_directory_entries(unsigned char *dirname, int get_hidden)
 	return entries;
 }
 
-/* Recursively create directories in a path. The last element in the path is
+/** Recursively create directories in @a path. The last element in the path is
  * taken to be a filename, and simply ignored */
 int
 mkalldirs(const unsigned char *path)
diff --git a/src/util/file.h b/src/util/file.h
index 32121337..18e62e87 100644
--- a/src/util/file.h
+++ b/src/util/file.h
@@ -4,18 +4,18 @@
 
 #include <stdio.h>
 
+/** Data read about an entry in a directory.
+ * The strings pointed to by this structure are in the system
+ * charset (i.e. LC_CTYPE) and must be freed with mem_free().  */
 struct directory_entry {
-	/* The strings pointed to by this structure are in the system
-	 * charset (i.e. LC_CTYPE) and must be freed with mem_free.  */
-
-	/* The various attribute info collected with the stat_* functions. */
+	/** The various attribute info collected with the @c stat_* functions. */
 	unsigned char *attrib;
 
-	/* The full path of the dir entry. */
+	/** The full path of the dir entry. */
 	unsigned char *name;
 };
 
-/* First information such as permissions is gathered for each directory entry.
+/** First information such as permissions is gathered for each directory entry.
  * All entries are then sorted. */
 struct directory_entry *
 get_directory_entries(unsigned char *dirname, int get_hidden_files);
@@ -24,37 +24,38 @@ int file_exists(const unsigned char *filename);
 int file_can_read(const unsigned char *filename);
 int file_is_dir(const unsigned char *filename);
 
-/* Strips all directory stuff from @filename and returns the
+/** Strips all directory stuff from @a filename and returns the
  * position of where the actual filename starts */
 unsigned char *get_filename_position(unsigned char *filename);
 
-/* Tilde is only expanded for the current users homedir (~/). */
-/* The returned file name is allocated. */
+/** Tilde is only expanded for the current users homedir (~/).
+ * The returned file name is allocated. */
 unsigned char *expand_tilde(unsigned char *filename);
 
-/* Generate a unique file name by trial and error based on the @fileprefix by
- * adding suffix counter (e.g. '.42'). */
-/* The returned file name is allocated if @fileprefix is not unique. */
+/*! \brief Generate a unique file name by trial and error based on the
+ * @a fileprefix by adding suffix counter (e.g. '.42').
+ *
+ * The returned file name is allocated if @a fileprefix is not unique. */
 unsigned char *get_unique_name(unsigned char *fileprefix);
 
-/* Checks various environment variables to get the name of the temp dir.
+/** Checks various environment variables to get the name of the temp dir.
  * Returns a filename by concatenating "<tmpdir>/<name>". */
 unsigned char *get_tempdir_filename(unsigned char *name);
 
-/* Read a line from @file into the dynamically allocated @line, increasing
- * @line if necessary. Ending whitespace is trimmed. If a line ends
- * with "\" the next line is read too. */
-/* If @line is NULL the returned line is allocated and if file reading fails
- * @line is free()d. */
+/** Read a line from @a file into the dynamically allocated @a line,
+ * increasing @a line if necessary. Ending whitespace is trimmed.
+ * If a line ends with "\" the next line is read too.
+ * If @a line is NULL the returned line is allocated and if file
+ * reading fails @a line is free()d. */
 unsigned char *file_read_line(unsigned char *line, size_t *linesize,
 			      FILE *file, int *linenumber);
 
-/* Safe wrapper for mkstemp().
+/** Safe wrapper for mkstemp().
  * It enforces permissions by calling umask(0177), call mkstemp(), then
  * restore previous umask(). */
 int safe_mkstemp(unsigned char *template);
 
-/* Recursively create directories in a path. The last element in the path is
+/** Recursively create directories in @a path. The last element in the path is
  * taken to be a filename, and simply ignored */
 int mkalldirs(const unsigned char *path);
 
diff --git a/src/util/hash.c b/src/util/hash.c
index 6d0036ad..a52f87e5 100644
--- a/src/util/hash.c
+++ b/src/util/hash.c
@@ -1,4 +1,5 @@
-/* Hashing infrastructure */
+/** Hashing infrastructure
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -50,12 +51,14 @@ init_hash(unsigned int width, hash_func_T func)
 	return hash;
 }
 
+/** @relates hash */
 struct hash *
 init_hash8(void)
 {
 	return init_hash(8, &strhash);
 }
 
+/** @relates hash */
 void
 free_hash(struct hash **hashp)
 {
@@ -71,11 +74,13 @@ free_hash(struct hash **hashp)
 }
 
 
-/* I've no much idea about what to set here.. I think it doesn't matter much
+/** Initialization vector for the hash function.
+ * I've no much idea about what to set here.. I think it doesn't matter much
  * anyway.. ;) --pasky */
 #define HASH_MAGIC 0xdeadbeef
 
-/* Returns hash_item if ok, NULL if error. */
+/** @returns hash_item if ok, NULL if error.
+ * @relates hash */
 struct hash_item *
 add_hash_item(struct hash *hash, unsigned char *key, unsigned int keylen,
 	      void *value)
@@ -96,6 +101,7 @@ add_hash_item(struct hash *hash, unsigned char *key, unsigned int keylen,
 	return item;
 }
 
+/** @relates hash */
 struct hash_item *
 get_hash_item(struct hash *hash, unsigned char *key, unsigned int keylen)
 {
@@ -123,8 +129,10 @@ get_hash_item(struct hash *hash, unsigned char *key, unsigned int keylen)
 
 #undef HASH_MAGIC
 
-/* If key and/or value were dynamically allocated, think about freeing them.
- * This function doesn't do that. */
+/** Delete @a item from @a hash.
+ * If key and/or value were dynamically allocated, think about freeing them.
+ * This function doesn't do that.
+ * @relates hash */
 void
 del_hash_item(struct hash *hash, struct hash_item *item)
 {
@@ -138,11 +146,14 @@ del_hash_item(struct hash *hash, struct hash_item *item)
 
 #ifdef X31_HASH
 
-/* Fast string hashing. */
+/** Fast string hashing.
+ * @param k		the key
+ * @param length	the length of the key
+ * @param initval	the previous hash, or an arbitrary value */
 static hash_value_T
-strhash(unsigned char *k, /* the key */
-	unsigned int length, /* the length of the key */
-	hash_value_T initval /* the previous hash, or an arbitrary value */)
+strhash(unsigned char *k,
+	unsigned int length,
+	hash_value_T initval)
 {
 	const unsigned char *p = (const unsigned char *) k;
 	hash_value_T h = initval;
@@ -260,10 +271,14 @@ strhash(unsigned char *k, /* the key */
 			+ ((hash_value_T) (k[(a)+2])<<16) \
 			+ ((hash_value_T) (k[(a)+3])<<24))
 
+/** Hash an array of bytes.
+ * @param k		the key
+ * @param length	the length of the key
+ * @param initval	the previous hash, or an arbitrary value */
 static hash_value_T
-strhash(unsigned char *k, /* the key */
-	unsigned int length, /* the length of the key */
-	hash_value_T initval /* the previous hash, or an arbitrary value */)
+strhash(unsigned char *k,
+	unsigned int length,
+	hash_value_T initval)
 {
 	int len;
 	hash_value_T a, b, c;
diff --git a/src/util/hash.h b/src/util/hash.h
index d79da0a0..fd306a77 100644
--- a/src/util/hash.h
+++ b/src/util/hash.h
@@ -3,7 +3,7 @@
 
 #include "util/lists.h"
 
-/* This should be hopefully always 32bit at least. I'm not sure what will
+/** This should be hopefully always 32bit at least. I'm not sure what will
  * happen when this will be of other length, but it should still work ok.
  * --pasky */
 typedef unsigned long hash_value_T;
@@ -18,9 +18,9 @@ struct hash_item {
 };
 
 struct hash {
-	unsigned int width; /* Number of bits - hash array must be 2^width long. */
+	unsigned int width; /**< Number of bits - hash array must be 2^width long. */
 	hash_func_T func;
-	struct list_head hash[1]; /* Must be at end ! */
+	struct list_head hash[1]; /**< Must be at end ! */
 };
 
 struct hash *init_hash8(void);
@@ -31,6 +31,7 @@ struct hash_item *add_hash_item(struct hash *hash, unsigned char *key, unsigned
 struct hash_item *get_hash_item(struct hash *hash, unsigned char *key, unsigned int keylen);
 void del_hash_item(struct hash *hash, struct hash_item *item);
 
+/** @relates hash */
 #define foreach_hash_item(item, hash_table, iterator) \
 	for (iterator = 0; iterator < (1 << (hash_table).width); iterator++) \
 		foreach (item, (hash_table).hash[iterator])
diff --git a/src/util/lists.h b/src/util/lists.h
index 9cfaddcd..d1f8fdef 100644
--- a/src/util/lists.h
+++ b/src/util/lists.h
@@ -14,7 +14,7 @@
  *
  * Fixing this would be a nice and needed janitorial project. */
 
-/* Lists debugging
+/** Lists debugging.
  * Two unsigned int magic number will be put before and after the next and
  * prev pointers, these will be check on list operations.
  * Some pointers are set to specific values after action. */
@@ -56,7 +56,6 @@ struct xlist_head {
 #define LIST_HEAD(x) x *next; x *prev
 #define LIST_SET_MAGIC(x) list_magic_set(*(x))
 
-
 #else /* LISTDEBUG */
 
 #define LISTMAGIC1 ((void *) 0xdadababa)
@@ -82,7 +81,7 @@ do { \
 } while (0)
 
 
-/* Backend for list_magic_check() and list_magic_chkbool(). */
+/** Backend for list_magic_check() and list_magic_chkbool(). */
 #define list_magic_correct(x) ((x).magic1 == LISTMAGIC1 && (x).magic2 == LISTMAGIC2)
 
 #define list_magic_check(x, where) \
@@ -116,7 +115,17 @@ struct xlist_head {
 
 #endif /* LISTDEBUG */
 
-#define INIT_LIST_HEAD(x) struct list_head x = { D_LIST_HEAD(x) }
+/** Define and initialize a list variable.  The @a element_T parameter
+ * currently serves as documentation only; the compiler does not check
+ * that it matches.  */
+#define INIT_LIST_OF(element_T, x) struct list_head x = { D_LIST_HEAD(x) }
+
+/** A list intended to contain elements of a specific type.  The
+ * @a element_T parameter currently serves as documentation only;
+ * the compiler does not check that it matches.  Doxyfile defines
+ * this macro differently in order to get better collaboration
+ * diagrams.  */
+#define LIST_OF(element_T) struct list_head
 
 #ifdef HAVE_TYPEOF
 #define list_typeof(x) typeof(x)
diff --git a/src/util/math.h b/src/util/math.h
index d30f1b5b..0d5c0f3a 100644
--- a/src/util/math.h
+++ b/src/util/math.h
@@ -38,22 +38,22 @@ int_max(register int x, register int y)
 }
 
 
-/* Limit @what pointed value to upper bound @limit. */
+/** Limit @a what pointed value to upper bound @a limit. */
 static inline void
 int_upper_bound(register int *what, register int limit)
 {
 	if (*what > limit) *what = limit;
 }
 
-/* Limit @what pointed value to lower bound @limit. */
+/** Limit @a what pointed value to lower bound @a limit. */
 static inline void
 int_lower_bound(register int *what, register int limit)
 {
 	if (*what < limit) *what = limit;
 }
 
-/* Limit @what pointed value to lower bound @lower_limit and to upper bound
- * @upper_limit. */
+/** Limit @a what pointed value to lower bound @a lower_limit and to
+ * upper bound @a upper_limit. */
 static inline void
 int_bounds(register int *what, register int lower_limit,
 	   register int upper_limit)
@@ -65,7 +65,8 @@ int_bounds(register int *what, register int lower_limit,
 }
 
 
-/* This is supposed to evaluate at compile time, giving no performance hit. */
+/** Swap values @a a and @a b, both of type @a type.
+ * This is supposed to evaluate at compile time, giving no performance hit. */
 #define swap_values(type, a, b)			\
 	do {					\
 		type swap_register_ = (a);	\
diff --git a/src/util/md5.c b/src/util/md5.c
index 0785848a..71b7e60d 100644
--- a/src/util/md5.c
+++ b/src/util/md5.c
@@ -1,6 +1,7 @@
-/* MD5 implementation (RFC 1321) */
-
-/* This code implements the MD5 message-digest algorithm. The algorithm is due
+/** MD5 implementation (RFC 1321)
+ * @file
+ *
+ * This code implements the MD5 message-digest algorithm. The algorithm is due
  * to Ron Rivest.
  *
  * This code was written by Colin Plumb in 1993, no copyright is claimed.  This
@@ -26,8 +27,9 @@
 
 static void transform_md5(uint32_t buf[4], uint32_t const in[16]);
 
-/* This code is harmless on little-endian machines. */
-/* FIXME: Optimize it away on little-endian machines. */
+/** Swap the bytes of each uint32_t, if necessary.
+ * This code is harmless on little-endian machines.
+ * \todo FIXME: Optimize it away on little-endian machines. */
 static void
 reverse_md5_bytes(unsigned char *buf, unsigned int longs)
 {
@@ -41,8 +43,9 @@ reverse_md5_bytes(unsigned char *buf, unsigned int longs)
 	} while (--longs);
 }
 
-/* Start MD5 accumulation. Set bit count to 0 and buffer to mysterious
- * initialization constants. */
+/** Start MD5 accumulation. Set bit count to 0 and buffer to mysterious
+ * initialization constants.
+ * @relates md5_context */
 void
 init_md5(struct md5_context *ctx)
 {
@@ -55,8 +58,9 @@ init_md5(struct md5_context *ctx)
 	ctx->bits[1] = 0;
 }
 
-/* Update context to reflect the concatenation of another buffer full
- * of bytes. */
+/** Update context to reflect the concatenation of another buffer full
+ * of bytes.
+ * @relates md5_context */
 void
 update_md5(struct md5_context *ctx, const unsigned char *buf, unsigned long len)
 {
@@ -103,10 +107,11 @@ update_md5(struct md5_context *ctx, const unsigned char *buf, unsigned long len)
 	memmove(ctx->in, buf, len);
 }
 
-/* Final wrapup - pad to 64-byte boundary with the bit pattern 1 0* (64-bit
- * count of bits processed, MSB-first) */
+/** Final wrapup - pad to 64-byte boundary with the bit pattern 1 0* (64-bit
+ * count of bits processed, MSB-first)
+ * @relates md5_context */
 void
-done_md5(struct md5_context *ctx, unsigned char digest[16])
+done_md5(struct md5_context *ctx, md5_digest_bin_T digest)
 {
 	unsigned int count;
 	unsigned char *p;
@@ -150,7 +155,7 @@ done_md5(struct md5_context *ctx, unsigned char digest[16])
 
 unsigned char *
 digest_md5(const unsigned char *data, unsigned long length,
-	   unsigned char digest[16])
+	   md5_digest_bin_T digest)
 {
 	struct md5_context ctx;
 
@@ -172,11 +177,11 @@ digest_md5(const unsigned char *data, unsigned long length,
 #define F3(x, y, z) (x ^ y ^ z)
 #define F4(x, y, z) (y ^ (x | ~z))
 
-/* This is the central step in the MD5 algorithm. */
+/** This is the central step in the MD5 algorithm. */
 #define MD5STEP(f, w, x, y, z, data, s) \
 	( w += f(x, y, z) + data,  w = w<<s | w>>(32-s),  w += x )
 
-/* The core of the MD5 algorithm, this alters an existing MD5 hash to reflect
+/** The core of the MD5 algorithm, this alters an existing MD5 hash to reflect
  * the addition of 16 longwords of new data. md5_update() blocks the data and
  * converts bytes into longwords for this routine. */
 static void
diff --git a/src/util/md5.h b/src/util/md5.h
index f4f7f4c4..f23caf8b 100644
--- a/src/util/md5.h
+++ b/src/util/md5.h
@@ -37,13 +37,14 @@ void init_md5(struct md5_context *context);
 void update_md5(struct md5_context *context, const unsigned char *data, unsigned long length);
 void done_md5(struct md5_context *context, md5_digest_bin_T digest);
 
-/* Digest the passed @data with the given length and stores the MD5 digest in
- * the @digest parameter. */
+/** Digest the passed @a data with the given length and stores the MD5
+ * digest in the @a digest parameter. */
 unsigned char *
 digest_md5(const unsigned char *data, unsigned long length, md5_digest_bin_T digest);
 
 #ifdef CONFIG_MD5
-/* Provide compatibility with the OpenSSL interface: */
+/** @name Provide compatibility with the OpenSSL interface:
+ * @{ */
 
 typedef struct md5_context MD5_CTX;
 #define MD5_Init(context)		init_md5(context)
@@ -51,6 +52,7 @@ typedef struct md5_context MD5_CTX;
 #define MD5_Final(md5, context)		done_md5(context, md5)
 #define MD5(data, len, md5)		digest_md5(data, len, md5)
 
+/** @} */
 #endif /* CONFIG_MD5 */
 
 #endif
diff --git a/src/util/memdebug.c b/src/util/memdebug.c
index 612a9156..8551c523 100644
--- a/src/util/memdebug.c
+++ b/src/util/memdebug.c
@@ -1,6 +1,7 @@
-/* Memory debugging (leaks, overflows & co) */
-
-/* Wrappers for libc memory managment providing protection against common
+/** Memory debugging (leaks, overflows & co)
+ * @file
+ *
+ * Wrappers for libc memory managment providing protection against common
  * pointers manipulation mistakes - bad realloc()/free() pointers, double
  * free() problem, using uninitialized/freed memory, underflow/overflow
  * protection, leaks tracking...
@@ -52,49 +53,49 @@
 
 #ifdef DEBUG_MEMLEAK
 
-/* Eat less memory, but sacrifice speed?
+/** Eat less memory, but sacrifice speed?
  * Default is defined. */
 #define LESS_MEMORY_SPEED
 
-/* Fill memory on alloc() ?
+/** Fill memory on alloc() ?
  * Default is defined. */
 #define FILL_ON_ALLOC
 #define FILL_ON_ALLOC_VALUE 'X'
 
-/* Fill memory on realloc() ?
+/** Fill memory on realloc() ?
  * Default is defined. */
 #define FILL_ON_REALLOC
 #define FILL_ON_REALLOC_VALUE 'Y'
 
-/* Fill memory before free() ?
+/** Fill memory before free() ?
  * Default is undef. */
 #undef FILL_ON_FREE
 #define FILL_ON_FREE_VALUE 'Z'
 
-/* Check alloc_header block sanity ?
+/** Check alloc_header block sanity ?
  * Default is defined. */
 #define CHECK_AH_SANITY
 #define AH_SANITY_MAGIC 0xD3BA110C
 
-/* Check for useless reallocation ?
+/** Check for useless reallocation ?
  * If oldsize is equal to newsize, print a message to stderr.
  * It may help to find inefficient code.
  * Default is undefined.
  */
 #undef CHECK_USELESS_REALLOC
 
-/* Check for validity of address passed to free() ?
+/** Check for validity of address passed to free() ?
  * Note that this is VERY slow, as we iterate through whole memory_list each
  * time. We can't check magics etc, as it would break double free() check.
  * Default is undef. */
 #undef CHECK_INVALID_FREE
 
-/* Check for double free ?
+/** Check for double free ?
  * Default is defined. */
 #define CHECK_DOUBLE_FREE
 #define AH_FREE_MAGIC 0xD3BF110C
 
-/* Check for overflows and underflows ?
+/** Check for overflows and underflows ?
  * Default is defined. */
 #define CHECK_XFLOWS
 #define XFLOW_MAGIC (char) 0xFA
@@ -118,7 +119,7 @@ struct alloc_header {
 	unsigned char *comment;
 
 #ifdef CHECK_XFLOWS
-	/* This is a little magic. We want to keep the main pointer aligned,
+	/** This is a little magic. We want to keep the main pointer aligned,
 	 * that means we want to have the xflow underflow mark in the
 	 * alloc_header space, but at the _end_ of the aligned reserved space.
 	 * This means we in fact live at [SIZE_AH_ALIGNED - 1], not here. (Of
@@ -163,7 +164,7 @@ struct alloc_header {
 
 struct mem_stats mem_stats;
 
-INIT_LIST_HEAD(memory_list);
+INIT_LIST_OF(struct alloc_header, memory_list);
 
 #ifdef LOG_MEMORY_ALLOC
 static void
diff --git a/src/util/memlist.c b/src/util/memlist.c
index 934ff433..038ad7f0 100644
--- a/src/util/memlist.c
+++ b/src/util/memlist.c
@@ -1,4 +1,5 @@
-/* These routines represent handling of struct memory_list. */
+/** These routines represent handling of struct memory_list.
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -14,7 +15,8 @@
 #include "util/memory.h"
 
 
-/*
+/**
+ * \struct memory_list
  * memory_list is used to track information about all allocated memory
  * belonging to something. Then we can free it when we won't need it
  * anymore, but the one who allocated it won't be able to get control
@@ -23,9 +25,10 @@
 
 #define ML_SIZE(n) (sizeof(struct memory_list) + (n) * sizeof(void *))
 
-/* Create a memory list. If p is NULL or allocation fails, it will
- * returns NULL.
- * It always stops at first NULL element. */
+/** Create a memory list. If @a p is NULL or allocation fails, it will
+ * return NULL.
+ * It always stops at first NULL element.
+ * @relates memory_list */
 #if defined(DEBUG_MEMLIST) && defined(HAVE_VARIADIC_MACROS)
 struct memory_list *
 debug_getml(unsigned char *file, int line, void *p, ...)
@@ -65,10 +68,11 @@ getml(void *p, ...)
 	return ml;
 }
 
-/* Add elements to a memory list.
+/** Add elements to a memory list.
  * If memory list exists, it enlarges it, else it creates it.
  * if there's no elements or first element is NULL, it does nothing.
- * It always stops at first NULL element. */
+ * It always stops at first NULL element.
+ * @relates memory_list */
 #if defined(DEBUG_MEMLIST) && defined(HAVE_VARIADIC_MACROS)
 void
 debug_add_to_ml(unsigned char *file, int line, struct memory_list **ml, ...)
@@ -122,6 +126,7 @@ add_to_ml(struct memory_list **ml, ...)
 	va_end(ap);
 }
 
+/** @relates memory_list */
 #ifdef DEBUG_MEMLIST
 void
 debug_add_one_to_ml(unsigned char *file, int line, struct memory_list **ml, void *p)
@@ -161,8 +166,9 @@ add_one_to_ml(struct memory_list **ml, void *p)
 }
 
 
-/* Free elements and memory list.
- * It returns safely if passed a NULL pointer. */
+/** Free elements and memory list.
+ * It returns safely if passed a NULL pointer.
+ * @relates memory_list */
 void
 freeml(struct memory_list *ml)
 {
diff --git a/src/util/memory.c b/src/util/memory.c
index 78ef23d2..4a067adb 100644
--- a/src/util/memory.c
+++ b/src/util/memory.c
@@ -1,4 +1,5 @@
-/* Memory allocation manager */
+/** Memory allocation manager
+ * @file */
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE /* MREMAP_MAYMOVE */
@@ -128,8 +129,9 @@ mem_realloc(void *p, size_t size)
 
 static int page_size;
 
-/* This tries to prevent useless reallocations, especially since they are quite
- * expensive in the mremap()-less case. */
+/** Round up to a full page.
+ * This tries to prevent useless reallocations, especially since they
+ * are quite expensive in the mremap()-less case. */
 static size_t
 round_size(size_t size)
 {
@@ -140,7 +142,7 @@ round_size(size_t size)
 	return (size / page_size + 1) * page_size;
 }
 
-/* Some systems may not have MAP_ANON but MAP_ANONYMOUS instead. */
+/** Some systems may not have MAP_ANON but MAP_ANONYMOUS instead. */
 #if defined(MAP_ANONYMOUS) && !defined(MAP_ANON)
 #define MAP_ANON MAP_ANONYMOUS
 #endif
diff --git a/src/util/memory.h b/src/util/memory.h
index 9fab2fd4..b8925189 100644
--- a/src/util/memory.h
+++ b/src/util/memory.h
@@ -5,17 +5,17 @@
  * if not defined, we'll try to continue. */
 /* #define CRASH_IF_ALLOC_MAXTRIES */
 
-/* Max. number of retry in case of memory allocation failure. */
+/** Max. number of retry in case of memory allocation failure. */
 #define ALLOC_MAXTRIES 3
 
-/* Delay in seconds between each alloc try. */
+/** Delay in seconds between each alloc try. */
 #define ALLOC_DELAY 3
 
 #define fmem_alloc(x) mem_alloc(x)
 #define fmem_free(x) mem_free(x)
 
 
-/* Cygwin wants some size_t definition here... let's try to make it happy
+/** Cygwin wants some size_t definition here... let's try to make it happy
  * then. Hrmpf. */
 #include <sys/types.h>
 #include <stddef.h>
@@ -108,17 +108,17 @@ void *mem_realloc(void *, size_t);
 #endif /* DEBUG_MEMLEAK */
 
 
-/* Granular memory allocation. */
+/** @name Granular memory allocation.
+ * The granularity used by the aligned memory functions below must be a mask
+ * with all bits set from but not including the most significant bit and down.
+ * So if an alignment of 256 is wanted use 0xFF.
+ * @{ */
 
-/* The ``old'' style granularity. XXX: Must be power of 2 */
+/** The 'old' style granularity. XXX: Must be power of 2 */
 #define ALLOC_GR 0x100
 
 #include <string.h> /* for memset() */
 
-/* The granularity used by the aligned memory functions below must be a mask
- * with all bits set from but not including the most significant bit and down.
- * So if an alignment of 256 is wanted use 0xFF. */
-
 #define ALIGN_MEMORY_SIZE(x, gr) (((x) + (gr)) & ~(gr))
 
 static inline void *
@@ -159,10 +159,14 @@ mem_align_alloc__(
 	mem_align_alloc__((void **) ptr, old, new, sizeof(**ptr), mask)
 #endif
 
+/** @} */
 
-/* Maybe-free macros */
-/* TODO: Think about making what they do more obvious in their identifier, they
- * could be obfuscating their users a little for the newcomers otherwise. */
+
+/** @name Maybe-free macros
+ * \todo TODO: Think about making what they do more obvious in their
+ * identifier, they could be obfuscating their users a little for the
+ * newcomers otherwise.
+ * @{ */
 
 #define mem_free_set(x, v) do { if (*(x)) mem_free(*(x)); *(x) = (v); } while (0)
 #define mem_free_if(x) do { register void *p = (x); if (p) mem_free(p); } while (0)
@@ -172,6 +176,7 @@ mem_align_alloc__(
 #undef mem_free_if
 #define mem_free_if(x) mem_free_set(&x, NULL)
 #endif
+/** @} */
 
 
 /* This is out of place, but there is no better place. */
diff --git a/src/util/profile.h b/src/util/profile.h
index c06d8e5c..6568c6e2 100644
--- a/src/util/profile.h
+++ b/src/util/profile.h
@@ -1,3 +1,6 @@
+/** Process' CPU time utilities 
+ * @file*/
+
 #ifndef EL__UTIL_PROFILE_H
 #define EL__UTIL_PROFILE_H
 
@@ -5,31 +8,30 @@
 #include "config.h"
 #endif
 
-/* Process' CPU time utilities */
 #ifdef CONFIG_DEBUG
 #include <time.h>
 
-/* CLK_DECL(n) declares an array of @n clock_t to be used by CLK_* macros.
- * Must occur before any CLK_* macros call. */
+/** @c CLK_DECL(n) declares an array of @a n clock_t to be used by
+ * CLK_* macros.  Must occur before any CLK_* macros call. */
 #define CLK_DECL(n) clock_t clk_start[n], clk_end[n], clk_diff[n]; int clk_start_line[n], clk_stop_line[n]
 
-/* CLK_START(n) starts clock @n.
+/** @c CLK_START(n) starts clock @a n.
  * Must occur after CLK_DECL() and before CLK_STOP(). */
 #define CLK_START(n) do { clk_start_line[n] = __LINE__; clk_start[n] = clock(); } while (0)
 
-/* CLK_STOP(n) stops clock @n.
+/* @c CLK_STOP(n) stops clock @a n.
  * Must occur after CLK_START() and before CLK_DUMP(). */
 #define CLK_STOP(n) do { clk_end[n] = clock(); clk_diff[n] = clk_end[n] - clk_start[n]; clk_stop_line[n] = __LINE__; } while (0)
 
-/* CLK_DUMP(n) echoes cpu time spent between CLK_START(@n) and CLK_STOP(@n).
- * Must occur after CLK_START() and  CLK_STOP(). */
+/* @c CLK_DUMP(n) echoes cpu time spent between CLK_START(@a n) and
+ * CLK_STOP(@a n).  Must occur after CLK_START() and CLK_STOP(). */
 #define CLK_DUMP(n) do { \
 	fprintf(stderr, "%s:%d->%d CLK[%d]= %.16f sec.\n", \
 		__FILE__, clk_start_line[n], clk_stop_line[n], \
 		n, (double) clk_diff[n] / (double) CLOCKS_PER_SEC);\
 } while (0)
 
-/* Shortcuts for function profiling.
+/** Shortcuts for function profiling.
  * CLK_STA() must be at end of local declarations.
  * CLK_STO() must be just before end of function. */
 #define CLK_STA() CLK_DECL(1); CLK_START(0)
diff --git a/src/util/scanner.c b/src/util/scanner.c
index 3f7da6c0..d2440967 100644
--- a/src/util/scanner.c
+++ b/src/util/scanner.c
@@ -1,4 +1,5 @@
-/* A pretty generic scanner */
+/** A pretty generic scanner
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -116,7 +117,8 @@ get_scanner_token_debug(struct scanner *scanner)
 #endif
 
 
-/* Initializers */
+/** @name Initializers
+ * @{ */
 
 static inline void
 init_scanner_info(struct scanner_info *scanner_info)
@@ -170,3 +172,5 @@ init_scanner(struct scanner *scanner, struct scanner_info *scanner_info,
 	scanner->info = scanner_info;
 	scanner->info->scan(scanner);
 }
+
+/** @} */
diff --git a/src/util/scanner.h b/src/util/scanner.h
index 2bbe99f8..7949507a 100644
--- a/src/util/scanner.h
+++ b/src/util/scanner.h
@@ -6,19 +6,19 @@
 /* Define if you want a talking scanner */
 /* #define DEBUG_SCANNER */
 
-/* The {struct scanner_token} describes one scanner state. There are two kinds
+/** The struct scanner_token describes one scanner state. There are two kinds
  * of tokens: char and non-char tokens. Char tokens contains only one char and
  * simply have their char value as type. They are tokens having special control
  * meaning in the code, like ':', ';', '{', '}' and '*'. Non char tokens has
  * one or more chars and contain stuff like number or indentifier strings.  */
 struct scanner_token {
-	/* The type the token */
+	/** The type of the token */
 	int type;
 
-	/* Some precedence value */
+	/** Some precedence value */
 	int precedence;
 
-	/* The start of the token string and the token length */
+	/** The start of the token string and the token length */
 	unsigned char *string;
 	int length;
 };
@@ -27,11 +27,11 @@ struct scanner_token {
  * "static" strings (I don't have a better word) so the macro name should
  * be short. --jonas */
 
-/* Compare the string of @token with @string */
+/** Compare the string of @a token with @a str */
 #define scanner_token_strlcasecmp(token, str, len) \
 	((token) && !strlcasecmp((token)->string, (token)->length, str, len))
 
-/* Also compares the token string but using a "static" string */
+/** Also compares the token string but using a "static" string */
 #define scanner_token_contains(token, str) \
 	scanner_token_strlcasecmp(token, str, sizeof(str) - 1)
 
@@ -63,100 +63,108 @@ struct scanner_string_mapping {
 struct scanner;
 
 struct scanner_info {
-	/* Table containing how to map strings to token types */
+	/** Table containing how to map strings to token types */
 	const struct scanner_string_mapping *mappings;
 
-	/* Information for how to initialize the scanner table */
+	/** Information for how to initialize the scanner table */
 	const struct scan_table_info *scan_table_info;
 
-	/* Fills the scanner with tokens. Already scanned tokens which have not
-	 * been requested remain and are moved to the start of the scanners
-	 * token table. */
-	/* Returns the current token or NULL if there are none. */
+	/** Fills the scanner with tokens. Already scanned tokens
+	 * which have not been requested remain and are moved to the
+	 * start of the scanners token table.
+	 * @returns the current token or NULL if there are none. */
 	struct scanner_token *(*scan)(struct scanner *scanner);
 
-	/* The scanner table */
-	/* Contains bitmaps for the various characters groups.
-	 * Idea sync'ed from mozilla browser. */
+	/** The scanner table.  Contains bitmaps for the various
+	 * characters groups.  Idea sync'ed from mozilla browser. */
 	int scan_table[SCAN_TABLE_SIZE];
 
-	/* Has the scanner info been initialized? */
+	/** Has the scanner info been initialized? */
 	unsigned int initialized:1;
 };
 
 
-/* Initializes the scanner. */
+/** Initializes the scanner.
+ * @relates scanner */
 void init_scanner(struct scanner *scanner, struct scanner_info *scanner_info,
 		  unsigned char *string, unsigned char *end);
 
-/* The number of tokens in the scanners token table:
+/** The number of tokens in the scanners token table:
  * At best it should be big enough to contain properties with space separated
  * values and function calls with up to 3 variables like rgb(). At worst it
  * should be no less than 2 in order to be able to peek at the next token in
  * the scanner. */
 #define SCANNER_TOKENS 10
 
-/* The {struct scanner} describes the current state of the scanner. */
+/** The struct scanner describes the current state of the scanner. */
 struct scanner {
-	/* The very start of the scanned string, the position in the string
-	 * where to scan next and the end of the string. If position is NULL it
-	 * means that no more tokens can be retrieved from the string. */
+	/** The very start of the scanned string, the position in the string
+	 * where to scan next and the end of the string. If #position is NULL
+	 * it means that no more tokens can be retrieved from the string. */
 	unsigned char *string, *position, *end;
 
-	/* The current token and number of scanned tokens in the table.
-	 * If the number of scanned tokens is less than SCANNER_TOKENS
+	/** The current token and number of scanned tokens in the table.
+	 * If the number of scanned tokens is less than ::SCANNER_TOKENS
 	 * it is because there are no more tokens in the string. */
 	struct scanner_token *current;
 	int tokens;
 
-	/* The 'meta' scanner information */
+	/** The 'meta' scanner information */
 	struct scanner_info *info;
 
 #ifdef DEBUG_SCANNER
-	/* Debug info about the caller. */
+	/** @name Debug info about the caller.
+	 * @{ */
 	unsigned char *file;
 	int line;
+	/** @} */
 #endif
 
-	/* Some state indicator only meaningful to the scanner internals */
+	/** Some state indicator only meaningful to the scanner internals */
 	int state;
 
-	/* The table contain already scanned tokens. It is maintained in
+	/** The table contain already scanned tokens. It is maintained in
 	 * order to optimize the scanning a bit and make it possible to look
 	 * ahead at the next token. You should always use the accessors
 	 * (defined below) for getting tokens from the scanner. */
 	struct scanner_token table[SCANNER_TOKENS];
 };
 
+/** @relates scanner  */
 #define scanner_has_tokens(scanner) \
 	((scanner)->tokens > 0 && (scanner)->current < (scanner)->table + (scanner)->tokens)
 
-/* This macro checks if the current scanner state is valid. Meaning if the
+/** This macro checks if the current scanner state is valid. Meaning if the
  * scanners table is full the last token skipping or get_next_scanner_token()
- * call made it possible to get the type of the next token. */
+ * call made it possible to get the type of the next token.
+ * @relates scanner */
 #define check_scanner(scanner) \
 	(scanner->tokens < SCANNER_TOKENS \
 	 || scanner->current + 1 < scanner->table + scanner->tokens)
 
 
-/* Scanner table accessors and mutators */
+/** @name Scanner table accessors and mutators
+ * @{ */
 
-/* Checks the type of the next token */
+/** Checks the type of the next token
+ * @relates scanner */
 #define check_next_scanner_token(scanner, token_type)				\
 	(scanner_has_tokens(scanner)					\
 	 && ((scanner)->current + 1 < (scanner)->table + (scanner)->tokens)	\
 	 && (scanner)->current[1].type == (token_type))
 
-/* Access current and next token. Getting the next token might cause
+/** Access current and next token. Getting the next token might cause
  * a rescan so any token pointers that has been stored in a local variable
- * might not be valid after the call. */
+ * might not be valid after the call.
+ * @relates scanner */
 static inline struct scanner_token *
 get_scanner_token(struct scanner *scanner)
 {
 	return scanner_has_tokens(scanner) ? scanner->current : NULL;
 }
 
-/* Do a scanning if we do not have also have access to next token. */
+/** Do a scanning if we do not have also have access to next token.
+ * @relates scanner */
 static inline struct scanner_token *
 get_next_scanner_token(struct scanner *scanner)
 {
@@ -165,29 +173,35 @@ get_next_scanner_token(struct scanner *scanner)
 		? scanner->info->scan(scanner) : get_scanner_token(scanner));
 }
 
-/* This should just make the code more understandable .. hopefully */
+/** This should just make the code more understandable .. hopefully
+ * @relates scanner */
 #define skip_scanner_token(scanner) get_next_scanner_token(scanner)
 
-/* Removes tokens from the scanner until it meets a token of the given type.
- * This token will then also be skipped. */
+/** Removes tokens from the scanner until it meets a token of the given type.
+ * This token will then also be skipped.
+ * @relates scanner */
 struct scanner_token *
 skip_scanner_tokens(struct scanner *scanner, int skipto, int precedence);
 
-/* Looks up the string from @ident to @end to in the scanners string mapping
- * table */
+/** @} */
+
+/** Looks up the string from @a ident to @a end to in the scanners
+ * string mapping table
+ * @relates scanner */
 int
 map_scanner_string(struct scanner *scanner,
 		   unsigned char *ident, unsigned char *end, int base_type);
 
 #ifdef DEBUG_SCANNER
+/** @relates scanner */
 void dump_scanner(struct scanner *scanner);
 #endif
 
 /* The begin_token_scanning() and end_token_scanning() functions provide the
  * basic setup and teardown for the rescan function made public via the
- * scanner_info->scan member. */
-
-/* Returns NULL if it is not necessary to try to scan for more tokens */
+ * scanner_info->scan member.
+ * @returns NULL if it is not necessary to try to scan for more tokens
+ * @relates scanner */
 static inline struct scanner_token *
 begin_token_scanning(struct scanner *scanner)
 {
@@ -221,10 +235,12 @@ begin_token_scanning(struct scanner *scanner)
 	return table;
 }
 
-/* Updates the @scanner struct after scanning has been done. The position
- * _after_ the last valid token is taken as the @end argument. */
-/* It is ok for @end to be < scanner->table since scanner->tokens will become
- * <= 0 anyway. */
+/* Updates the @a scanner struct after scanning has been done. The position
+ * _after_ the last valid token is taken as the @a end argument.
+ *
+ * It is ok for @a end to be < scanner->table since scanner->tokens
+ * will become <= 0 anyway.
+ * @relates scanner */
 static inline struct scanner_token *
 end_token_scanning(struct scanner *scanner, struct scanner_token *end)
 {
diff --git a/src/util/secsave.c b/src/util/secsave.c
index ec2b1bcc..7c845143 100644
--- a/src/util/secsave.c
+++ b/src/util/secsave.c
@@ -1,4 +1,5 @@
-/* Secure file saving handling */
+/** Secure file saving handling
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -67,8 +68,8 @@
 enum secsave_errno secsave_errno = SS_ERR_NONE;
 
 
-/* Open a file for writing in a secure way. It returns a pointer to a structure
- * secure_save_info on success, or NULL on failure. */
+/** Open a file for writing in a secure way. @returns a pointer to a
+ * structure secure_save_info on success, or NULL on failure. */
 static struct secure_save_info *
 secure_open_umask(unsigned char *file_name)
 {
@@ -200,6 +201,7 @@ end:
 	return NULL;
 }
 
+/* @relates secure_save_info */
 struct secure_save_info *
 secure_open(unsigned char *file_name)
 {
@@ -219,8 +221,9 @@ secure_open(unsigned char *file_name)
 	return ssi;
 }
 
-/* Close a file opened with secure_open, and return 0 on success, errno
- * or -1 on failure. */
+/** Close a file opened with secure_open(). @returns 0 on success,
+ * errno or -1 on failure.
+ * @relates secure_save_info */
 int
 secure_close(struct secure_save_info *ssi)
 {
@@ -298,8 +301,9 @@ free:
 }
 
 
-/* fputs() wrapper, set ssi->err to errno on error. If ssi->err is set when
- * called, it immediatly returns EOF. */
+/** fputs() wrapper, set ssi->err to errno on error. If ssi->err is set when
+ * called, it immediatly returns EOF.
+ * @relates secure_save_info */
 int
 secure_fputs(struct secure_save_info *ssi, const char *s)
 {
@@ -317,8 +321,9 @@ secure_fputs(struct secure_save_info *ssi, const char *s)
 }
 
 
-/* fputc() wrapper, set ssi->err to errno on error. If ssi->err is set when
- * called, it immediatly returns EOF. */
+/** fputc() wrapper, set ssi->err to errno on error. If ssi->err is set when
+ * called, it immediatly returns EOF.
+ * @relates secure_save_info */
 int
 secure_fputc(struct secure_save_info *ssi, int c)
 {
@@ -335,8 +340,9 @@ secure_fputc(struct secure_save_info *ssi, int c)
 	return ret;
 }
 
-/* fprintf() wrapper, set ssi->err to errno on error and return a negative
- * value. If ssi->err is set when called, it immediatly returns -1. */
+/** fprintf() wrapper, set ssi->err to errno on error and return a negative
+ * value. If ssi->err is set when called, it immediatly returns -1.
+ * @relates secure_save_info */
 int
 secure_fprintf(struct secure_save_info *ssi, const char *format, ...)
 {
diff --git a/src/util/secsave.h b/src/util/secsave.h
index 65506dc0..e1e38305 100644
--- a/src/util/secsave.h
+++ b/src/util/secsave.h
@@ -1,4 +1,5 @@
-/* Secure file saving handling */
+/** Secure file saving handling
+ * @file */
 
 #ifndef EL__UTIL_SECSAVE_H
 #define EL__UTIL_SECSAVE_H
@@ -10,8 +11,8 @@ struct terminal;
 
 enum secsave_errno {
 	SS_ERR_NONE = 0,
-	SS_ERR_DISABLED, /* secsave is disabled. */
-	SS_ERR_OUT_OF_MEM, /* memory allocation failure */
+	SS_ERR_DISABLED, /**< secsave is disabled. */
+	SS_ERR_OUT_OF_MEM, /**< memory allocation failure */
 
 	/* see err field in struct secure_save_info */
 	SS_ERR_OPEN_READ,
@@ -23,14 +24,14 @@ enum secsave_errno {
 	SS_ERR_OTHER,
 };
 
-extern enum secsave_errno secsave_errno; /* internal secsave error number */
+extern enum secsave_errno secsave_errno; /**< internal secsave error number */
 
 struct secure_save_info {
-	FILE *fp; /* file stream pointer */
-	unsigned char *file_name; /* final file name */
-	unsigned char *tmp_file_name; /* temporary file name */
-	int err; /* set to non-zero value in case of error */
-	int secure_save; /* use secure save for this file */
+	FILE *fp; /**< file stream pointer */
+	unsigned char *file_name; /**< final file name */
+	unsigned char *tmp_file_name; /**< temporary file name */
+	int err; /**< set to non-zero value in case of error */
+	int secure_save; /**< use secure save for this file */
 };
 
 struct secure_save_info *secure_open(unsigned char *);
diff --git a/src/util/string.c b/src/util/string.c
index 44e6cd0a..c3c953fa 100644
--- a/src/util/string.c
+++ b/src/util/string.c
@@ -1,4 +1,5 @@
-/* String handling functions */
+/** String handling functions
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -286,6 +287,7 @@ done_string(struct string *string)
 	memset(string, 0, sizeof(*string));
 }
 
+/** @relates string */
 inline struct string *
 add_to_string(struct string *string, const unsigned char *source)
 {
@@ -299,6 +301,7 @@ add_to_string(struct string *string, const unsigned char *source)
 	return add_bytes_to_string(string, source, strlen(source));
 }
 
+/** @relates string */
 inline struct string *
 add_crlf_to_string(struct string *string)
 {
@@ -317,6 +320,7 @@ add_crlf_to_string(struct string *string)
 	return string;
 }
 
+/** @relates string */
 inline struct string *
 add_string_to_string(struct string *string, const struct string *from)
 {
@@ -331,6 +335,7 @@ add_string_to_string(struct string *string, const struct string *from)
 	return add_bytes_to_string(string, from->source, from->length);
 }
 
+/** @relates string */
 struct string *
 add_file_to_string(struct string *string, const unsigned char *filename)
 {
@@ -392,6 +397,7 @@ string_concat(struct string *string, ...)
 	return string;
 }
 
+/** @relates string */
 inline struct string *
 add_char_to_string(struct string *string, unsigned char character)
 {
@@ -432,7 +438,7 @@ add_xchar_to_string(struct string *string, unsigned char character, int times)
 	return string;
 }
 
-/* Add printf-like format string to @string. */
+/** Add printf()-style format string to @a string. */
 struct string *
 add_format_to_string(struct string *string, const unsigned char *format, ...)
 {
@@ -467,8 +473,8 @@ add_format_to_string(struct string *string, const unsigned char *format, ...)
 }
 
 struct string *
-add_to_string_list(struct list_head *list, const unsigned char *source,
-		   int length)
+add_to_string_list(LIST_OF(struct string_list_item) *list,
+		   const unsigned char *source, int length)
 {
 	struct string_list_item *item;
 	struct string *string;
@@ -493,8 +499,9 @@ add_to_string_list(struct list_head *list, const unsigned char *source,
 	return string;
 }
 
+/** @relates string_list_item */
 void
-free_string_list(struct list_head *list)
+free_string_list(LIST_OF(struct string_list_item) *list)
 {
 	assertm(list != NULL, "[free_string_list]");
 	if_assert_failed return;
diff --git a/src/util/string.h b/src/util/string.h
index 123cac2b..0008863d 100644
--- a/src/util/string.h
+++ b/src/util/string.h
@@ -16,20 +16,22 @@
 
 #ifndef DEBUG_MEMLEAK
 
-/* Autoallocation string constructors: */
-
-/* Note that, contrary to the utilities using the string struct, these
+/** @name Autoallocation string constructors:
+ * Note that, contrary to the utilities using the string struct, these
  * functions are NOT granular, thus you can't simply reuse strings allocated by
- * these in add_to_string()-style functions. */
+ * these in add_to_string()-style functions.
+ * @{ */
 
-/* Allocates NUL terminated string with @len bytes from @src.
- * If @src == NULL or @len < 0 only one byte is allocated and set it to 0. */
-/* Returns the string or NULL on allocation failure. */
+/** Allocates NUL terminated string with @a len bytes from @a src.
+ * If @a src == NULL or @a len < 0 only one byte is allocated and set it to 0.
+ * @returns the string or NULL on allocation failure. */
 unsigned char *memacpy(const unsigned char *src, int len);
 
-/* Allocated NUL terminated string with the content of @src. */
+/** Allocated NUL terminated string with the content of @a src. */
 unsigned char *stracpy(const unsigned char *src);
 
+/** @} */
+
 #else /* DEBUG_MEMLEAK */
 
 unsigned char *debug_memacpy(const unsigned char *, int, const unsigned char *, int);
@@ -41,60 +43,69 @@ unsigned char *debug_stracpy(const unsigned char *, int, const unsigned char *);
 #endif /* DEBUG_MEMLEAK */
 
 
-/* Concatenates @src to @str. */
-/* If reallocation of @str fails @str is not touched. */
+/** Concatenates @a src to @a str.
+ * If reallocation of @a str fails @a str is not touched. */
 void add_to_strn(unsigned char **str, const unsigned char *src);
 
-/* Inserts @seqlen chars from @seq at position @pos in the @dst string. */
-/* If reallocation of @dst fails it is not touched and NULL is returned. */
+/** Inserts @a seqlen chars from @a seq at position @a pos in the @a
+ * dst string.
+ * If reallocation of @a dst fails it is not touched and NULL is returned. */
 unsigned char *insert_in_string(unsigned char **dst, int pos,
 				const unsigned char *seq, int seqlen);
 
-/* Takes a list of strings where the last parameter _must_ be
- * (unsigned char *) NULL and concatenates them. */
-/* Returns the allocated string or NULL on allocation failure. */
-/* Example:
+/** Takes a list of strings where the last parameter _must_ be
+ * (unsigned char *) NULL and concatenates them.
+ *
+ * @returns the allocated string or NULL on allocation failure.
+ *
+ * Example: @code
  *	unsigned char *abc = straconcat("A", "B", "C", (unsigned char *) NULL);
  *	if (abc) return;
  *	printf("%s", abc);	-> print "ABC"
- *	mem_free(abc);		-> free memory used by @abc */
+ *	mem_free(abc);		-> free memory used by @abc
+ * @endcode */
 unsigned char *straconcat(const unsigned char *str, ...);
 
 
-/* Misc. utility string functions. */
+/** @name Misc. utility string functions.
+ * @{ */
 
-/* Compare two strings, handling correctly @s1 or @s2 being NULL. */
+/** Compare two strings, handling correctly @a s1 or @a s2 being NULL. */
 int xstrcmp(const unsigned char *s1, const unsigned char *s2);
 
-/* Copies at most @len chars into @dst. Ensures null termination of @dst. */
+/** Copies at most @a len chars into @a dst. Ensures null termination of @a dst. */
 unsigned char *safe_strncpy(unsigned char *dst, const unsigned char *src, size_t len);
 
 /* strlcmp() is the middle child of history, everyone is using it differently.
  * On some weird *systems* it seems to be defined (equivalent to strcasecmp()),
  * so we'll better use our #define redir. */
 
-/* This routine compares string @s1 of length @n1 with string @s2 of length
- * @n2.
+/** This routine compares string @a s1 of length @a n1 with string @a s2
+ * of length @a n2.
  *
  * This acts identically to strcmp() but for non-zero-terminated strings,
- * rather than being similiar to strncmp(). That means, it fails if @n1 != @n2,
- * thus you may use it for testing whether @s2 matches *full* @s1, not only its
- * start (which can be a security hole, ie. in the cookies domain checking).
+ * rather than being similiar to strncmp(). That means, it fails if @a n1
+ * != @a n2, thus you may use it for testing whether @a s2 matches *full*
+ * @a s1, not only its start (which can be a security hole, e.g. in the
+ * cookies domain checking).
  *
- * @n1 or @n2 may be -1, which is same as strlen(@s[12]) but possibly more
- * effective (in the future ;-). */
-/* Returns zero if the strings match or undefined non-zero value if they
+ * @a n1 or @a n2 may be -1, which is same as strlen(@a s1 or @a s2) but
+ * possibly more effective (in the future ;-).
+ *
+ * @returns zero if the strings match or undefined non-zero value if they
  * differ.  (The non-zero return value is _not_ same as for the standard
  * strcmp() family.) */
 #define strlcmp(a,b,c,d) (errfile = __FILE__, errline = __LINE__, elinks_strlcmp(a,b,c,d))
 int elinks_strlcmp(const unsigned char *s1, size_t n1,
 		   const unsigned char *s2, size_t n2);
 
-/* Acts identically to strlcmp(), except for being case insensitive. */
+/** Acts identically to strlcmp(), except for being case insensitive. */
 #define strlcasecmp(a,b,c,d) (errfile = __FILE__, errline = __LINE__, elinks_strlcasecmp(a,b,c,d))
 int elinks_strlcasecmp(const unsigned char *s1, size_t n1,
 		       const unsigned char *s2, size_t n2);
 
+/** @} */
+
 
 #define skip_space(S) \
 	do { while (isspace(*(S))) (S)++; } while (0)
@@ -109,16 +120,16 @@ int elinks_strlcasecmp(const unsigned char *s1, size_t n1,
 #define isasciialnum(c)	(isasciialpha(c) || isdigit(c))
 #define isident(c)	(isasciialnum(c) || (c) == '_' || (c) == '-')
 
-/* Char is safe to write to the terminal screen.  Cannot test for C1
+/** Char is safe to write to the terminal screen.  Cannot test for C1
  * control characters (0x80 to 0x9F) because this is also used for
  * non-ISO-8859 charsets.  */
 #define isscreensafe(c)	((c) >= ' ' && (c) != ASCII_DEL)
 
-/* Like isscreensafe but takes Unicode values and so can check for C1.  */
+/** Like isscreensafe() but takes Unicode values and so can check for C1.  */
 #define isscreensafe_ucs(c) (((c) >= 0x20 && (c) <= 0x7E) || (c) >= 0xA0)
 
 
-/* String debugging using magic number, it may catch some errors. */
+/** String debugging using magic number, it may catch some errors. */
 #ifdef CONFIG_DEBUG
 #define DEBUG_STRING
 #endif
@@ -132,7 +143,7 @@ struct string {
 };
 
 
-/* The granularity used for the struct string based utilities. */
+/** The granularity used for the struct string based utilities. */
 #define STRING_GRANULARITY 0xFF
 
 #ifdef DEBUG_STRING
@@ -148,7 +159,11 @@ struct string {
 #define INIT_STRING(s, l) { s, l }
 #endif
 
-/* Initializes the passed string struct by preallocating the @source member. */
+/** Initializes the passed string struct by preallocating the
+ * string.source member.
+ * @returns @a string if successful, or NULL if out of memory.
+ * @post done_string(@a string) is safe, even if this returned NULL.
+ * @relates string */
 #ifdef DEBUG_MEMLEAK
 struct string *init_string__(const unsigned char *file, int line, struct string *string);
 #define init_string(string) init_string__(__FILE__, __LINE__, string)
@@ -156,7 +171,8 @@ struct string *init_string__(const unsigned char *file, int line, struct string
 struct string *init_string(struct string *string);
 #endif
 
-/* Resets @string and free()s the @source member. */
+/** Resets @a string and free()s the string.source member.
+ * @relates string */
 void done_string(struct string *string);
 
 
@@ -167,17 +183,21 @@ struct string *add_string_to_string(struct string *to, const struct string *from
 struct string *add_file_to_string(struct string *string, const unsigned char *filename);
 struct string *add_crlf_to_string(struct string *string);
 
-/* Adds each C string to @string until a terminating
- * (unsigned char *) NULL is met. */
+/** Adds each C string to @a string until a terminating
+ * (unsigned char *) NULL is met.
+ * @relates string */
 struct string *string_concat(struct string *string, ...);
 
-/* Extends the string with @times number of @character. */
+/** Extends the string with @a times number of @a character.
+ * @relates string */
 struct string *add_xchar_to_string(struct string *string, unsigned char character, int times);
 
-/* Add printf-style format string to @string. */
+/** Add printf()-style format string to @a string.
+ * @relates string */
 struct string *add_format_to_string(struct string *string, const unsigned char *format, ...);
 
-/* Get a regular newly allocated stream of bytes from @string. */
+/** Get a regular newly allocated stream of bytes from @a string.
+ * @relates string */
 static unsigned char *squeezastring(struct string *string);
 
 
@@ -247,19 +267,20 @@ struct string_list_item {
 	struct string string;
 };
 
-/* Adds @string with @length chars to the list. If length is -1 it will be set
- * to the return value of strlen(). */
+/** Adds @a string with @a length chars to the list. If @a length is -1
+ * it will be set to the return value of strlen().
+ * @relates string_list_item */
 struct string *
-add_to_string_list(struct list_head *list, const unsigned char *string,
-		   int length);
+add_to_string_list(LIST_OF(struct string_list_item) *list,
+		   const unsigned char *string, int length);
 
-void free_string_list(struct list_head *list);
+void free_string_list(LIST_OF(struct string_list_item) *list);
 
 
-/* Returns an empty C string or @str if different from NULL. */
+/** Returns an empty C string or @a str if different from NULL. */
 #define empty_string_or_(str) ((str) ? (unsigned char *) (str) : (unsigned char *) "")
 
-/* Allocated copy if not NULL or returns NULL. */
+/** Allocated copy if not NULL or returns NULL. */
 #define null_or_stracpy(str) ((str) ? stracpy(str) : NULL)
 
 #endif /* EL__UTIL_STRING_H */
diff --git a/src/util/time.c b/src/util/time.c
index d7691a14..5ef4b776 100644
--- a/src/util/time.c
+++ b/src/util/time.c
@@ -1,4 +1,5 @@
-/* Time operations */
+/** Time operations
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -17,9 +18,10 @@
 #include "util/error.h"
 #include "util/time.h"
 
-/* Get the current time.
+/** Get the current time.
  * It attempts to use available functions, granularity
- * may be as worse as 1 second if time() is used. */
+ * may be as worse as 1 second if time() is used.
+ * @relates timeval_T */
 timeval_T *
 timeval_now(timeval_T *t)
 {
@@ -45,8 +47,9 @@ timeval_now(timeval_T *t)
 	return t;
 }
 
-/* Subtract an interval to a timeval, it ensures that
- * result is never negative. */
+/** Subtract an interval to a timeval, it ensures that
+ * result is never negative.
+ * @relates timeval_T */
 timeval_T *
 timeval_sub_interval(timeval_T *t, timeval_T *interval)
 {
@@ -72,6 +75,7 @@ timeval_sub_interval(timeval_T *t, timeval_T *interval)
 	return t;
 }
 
+/** @relates timeval_T */
 timeval_T *
 timeval_sub(timeval_T *res, timeval_T *older, timeval_T *newer)
 {
@@ -86,6 +90,7 @@ timeval_sub(timeval_T *res, timeval_T *older, timeval_T *newer)
 	return res;
 }
 
+/** @relates timeval_T */
 timeval_T *
 timeval_add(timeval_T *res, timeval_T *base, timeval_T *t)
 {
@@ -100,6 +105,7 @@ timeval_add(timeval_T *res, timeval_T *base, timeval_T *t)
 	return res;
 }
 
+/** @relates timeval_T */
 timeval_T *
 timeval_add_interval(timeval_T *t, timeval_T *interval)
 {
@@ -114,6 +120,7 @@ timeval_add_interval(timeval_T *t, timeval_T *interval)
 	return t;
 }
 
+/** @relates timeval_T */
 timeval_T *
 timeval_from_double(timeval_T *t, double x)
 {
@@ -123,6 +130,7 @@ timeval_from_double(timeval_T *t, double x)
 	return t;
 }
 
+/** @relates timeval_T */
 timeval_T *
 timeval_from_milliseconds(timeval_T *t, milliseconds_T milliseconds)
 {
@@ -134,8 +142,9 @@ timeval_from_milliseconds(timeval_T *t, milliseconds_T milliseconds)
 	return t;
 }
 
-/* Bug 923: Assumes time_t values fit in long.  (This function is used
- * for both timestamps and durations.)  */
+/** @bug 923: Assumes time_t values fit in long.  (This function is used
+ * for both timestamps and durations.)
+ * @relates timeval_T */
 timeval_T *
 timeval_from_seconds(timeval_T *t, long seconds)
 {
@@ -177,6 +186,7 @@ mult_ms(milliseconds_T a, long lb)
 	return (milliseconds_T) (la * lb);
 }
 
+/** @relates timeval_T */
 milliseconds_T
 timeval_to_milliseconds(timeval_T *t)
 {
@@ -186,21 +196,24 @@ timeval_to_milliseconds(timeval_T *t)
 	return add_ms_to_ms(a, b);
 }
 
-/* Bug 923: Assumes time_t values fit in long.  (This function is used
- * for both timestamps and durations.)  */
+/** @bug 923: Assumes time_t values fit in long.  (This function is used
+ * for both timestamps and durations.)
+ * @relates timeval_T */
 long
 timeval_to_seconds(timeval_T *t)
 {
 	return t->sec + t->usec / 1000000L;
 }
 
+/** @relates timeval_T */
 int
 timeval_is_positive(timeval_T *t)
 {
 	return (t->sec > 0 || (t->sec == 0 && t->usec > 0));
 }
 
-/* Be sure timeval is not negative. */
+/** Be sure timeval is not negative.
+ * @relates timeval_T */
 void
 timeval_limit_to_zero_or_one(timeval_T *t)
 {
@@ -212,9 +225,11 @@ timeval_limit_to_zero_or_one(timeval_T *t)
 #endif
 }
 
-/* Returns 1 if t1 > t2
- * -1 if t1 < t2
- * 0 if t1 == t2 */
+/** Compare time values.
+ * @returns 1 if t1 > t2;
+ * -1 if t1 < t2;
+ * 0 if t1 == t2.
+ * @relates timeval_T */
 int
 timeval_cmp(timeval_T *t1, timeval_T *t2)
 {
@@ -224,6 +239,7 @@ timeval_cmp(timeval_T *t1, timeval_T *t2)
 	return t1->usec - t2->usec;
 }
 
+/** @relates timeval_T */
 int
 timeval_div_off_t(off_t n, timeval_T *t)
 {
diff --git a/src/util/time.h b/src/util/time.h
index 7d81a775..06e88e26 100644
--- a/src/util/time.h
+++ b/src/util/time.h
@@ -16,19 +16,19 @@ typedef long milliseconds_T;
 #define ms_max(a, b) ((a) < (b) ? (b) : (a))
 #define ms_min(a, b) ((a) < (b) ? (a) : (b))
 
-/* Bug 923: Assumes time_t values fit in long.  */
+/** @bug 923: Assumes time_t values fit in @c long.  */
 #define str_to_time_t(s) ((time_t) atol(s))
-/* When formatting time_t values to be parsed with str_to_time_t,
- * we first cast to time_print_T and then printf the result with
- * TIME_PRINT_FORMAT.
- * Bug 923: Assumes time_t values fit in long.  */
+/** When formatting time_t values to be parsed with str_to_time_t(),
+ * we first cast to @c time_print_T and then printf() the result with
+ * ::TIME_PRINT_FORMAT.
+ * @bug 923: Assumes time_t values fit in @c long.  */
 typedef long time_print_T;
-#define TIME_PRINT_FORMAT "ld"
+#define TIME_PRINT_FORMAT "ld"	/**< @see time_print_T */
 
-/* Redefine a timeval that has all fields signed so calculations
+/** Redefine a timeval that has all fields signed so calculations
  * will be simplified on rare systems that define timeval with
  * unsigned fields.
- * Bug 923: Assumes time_t values fit in long.  (This structure is
+ * @bug 923: Assumes time_t values fit in long.  (This structure is
  * used for both timestamps and durations.)  */
 typedef struct { long sec; long usec; } timeval_T;
 
@@ -53,6 +53,7 @@ timeval_T *timeval_sub_interval(timeval_T *t, timeval_T *interval);
 timeval_T *timeval_add_interval(timeval_T *t, timeval_T *interval);
 int timeval_div_off_t(off_t n, timeval_T *t);
 
+/** @relates timeval_T */
 #define timeval_copy(dst, src) copy_struct(dst, src)
 
 #endif
diff --git a/src/viewer/dump/dump.c b/src/viewer/dump/dump.c
index 63b2bf1f..b89a611c 100644
--- a/src/viewer/dump/dump.c
+++ b/src/viewer/dump/dump.c
@@ -301,10 +301,10 @@ terminate:
 }
 
 void
-dump_next(struct list_head *url_list)
+dump_next(LIST_OF(struct string_list_item) *url_list)
 {
-	static INIT_LIST_HEAD(todo_list);
-	static INIT_LIST_HEAD(done_list);
+	static INIT_LIST_OF(struct string_list_item, todo_list);
+	static INIT_LIST_OF(struct string_list_item, done_list);
 	struct string_list_item *item;
 
 	if (url_list) {
diff --git a/src/viewer/dump/dump.h b/src/viewer/dump/dump.h
index a814f585..cf60acfe 100644
--- a/src/viewer/dump/dump.h
+++ b/src/viewer/dump/dump.h
@@ -12,6 +12,6 @@ struct string *
 add_document_to_string(struct string *string, struct document *document);
 
 int dump_to_file(struct document *, int);
-void dump_next(struct list_head *);
+void dump_next(LIST_OF(struct string_list_item) *);
 
 #endif
diff --git a/src/viewer/text/draw.c b/src/viewer/text/draw.c
index c3dbff40..60933153 100644
--- a/src/viewer/text/draw.c
+++ b/src/viewer/text/draw.c
@@ -1,4 +1,5 @@
-/* Text mode drawing functions */
+/** Text mode drawing functions
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -176,7 +177,7 @@ draw_view_status(struct session *ses, struct document_view *doc_view, int active
 	}
 }
 
-/* Checks if there is a link under the cursor so it can become the current
+/** Checks if there is a link under the cursor so it can become the current
  * highlighted link. */
 static void
 check_link_under_cursor(struct session *ses, struct document_view *doc_view)
@@ -192,8 +193,8 @@ check_link_under_cursor(struct session *ses, struct document_view *doc_view)
 	}
 }
 
-/* Puts the formatted document on the given terminal's screen. */
-/* @active indicates whether the document is focused -- i.e.,
+/** Puts the formatted document on the given terminal's screen.
+ * @a active indicates whether the document is focused -- i.e.,
  * whether it is displayed in the selected frame or document. */
 static void
 draw_doc(struct session *ses, struct document_view *doc_view, int active)
@@ -336,7 +337,7 @@ draw_frames(struct session *ses)
 	};
 }
 
-/* @rerender is ridiciously wound-up. */
+/** @todo @a rerender is ridiciously wound-up. */
 void
 draw_formatted(struct session *ses, int rerender)
 {
diff --git a/src/viewer/text/draw.h b/src/viewer/text/draw.h
index 5327ce81..a8009c38 100644
--- a/src/viewer/text/draw.h
+++ b/src/viewer/text/draw.h
@@ -5,14 +5,14 @@
 struct document_view;
 struct session;
 
-/* Render and draw the current session document */
-/* If @rerender is:
- *	0 only redrawing is done
- *	1 render by first checking the document cache else rerender
- *	2 forces document to be rerendered */
+/** Render and draw the current session document.
+ * If @a rerender is:
+ *	- 0 only redrawing is done
+ *	- 1 render by first checking the document cache else rerender
+ *	- 2 forces document to be rerendered */
 void draw_formatted(struct session *ses, int rerender);
 
-/* Update the document view, including frames and the status messages */
+/** Update the document view, including frames and the status messages */
 void refresh_view(struct session *ses, struct document_view *doc_view, int frames);
 
 #endif
diff --git a/src/viewer/text/form.c b/src/viewer/text/form.c
index 990e5ab1..bc8ef212 100644
--- a/src/viewer/text/form.c
+++ b/src/viewer/text/form.c
@@ -1,4 +1,5 @@
-/* Forms viewing/manipulation handling */
+/** Forms viewing/manipulation handling
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -58,6 +59,7 @@
 /* TODO: Some of these (particulary those encoding routines) would feel better
  * in viewer/common/. --pasky */
 
+/** @relates submitted_value */
 struct submitted_value *
 init_submitted_value(unsigned char *name, unsigned char *value, enum form_type type,
 		     struct form_control *fc, int position)
@@ -80,6 +82,7 @@ init_submitted_value(unsigned char *name, unsigned char *value, enum form_type t
 	return sv;
 }
 
+/** @relates submitted_value */
 void
 done_submitted_value(struct submitted_value *sv)
 {
@@ -610,8 +613,9 @@ draw_forms(struct terminal *term, struct document_view *doc_view)
 }
 
 
+/** @relates submitted_value */
 void
-done_submitted_value_list(struct list_head *list)
+done_submitted_value_list(LIST_OF(struct submitted_value) *list)
 {
 	struct submitted_value *sv, *svtmp;
 
@@ -629,7 +633,7 @@ done_submitted_value_list(struct list_head *list)
 static void
 add_submitted_value_to_list(struct form_control *fc,
 		            struct form_state *fs,
-		            struct list_head *list)
+		            LIST_OF(struct submitted_value) *list)
 {
 	struct submitted_value *sub;
 	unsigned char *name;
@@ -691,7 +695,7 @@ add_submitted_value_to_list(struct form_control *fc,
 }
 
 static void
-sort_submitted_values(struct list_head *list)
+sort_submitted_values(LIST_OF(struct submitted_value) *list)
 {
 	while (1) {
 		struct submitted_value *sub;
@@ -723,7 +727,8 @@ sort_submitted_values(struct list_head *list)
 
 static void
 get_successful_controls(struct document_view *doc_view,
-			struct form_control *fc, struct list_head *list)
+			struct form_control *fc,
+			LIST_OF(struct submitted_value) *list)
 {
 	struct form_control *fc2;
 
@@ -748,7 +753,7 @@ get_successful_controls(struct document_view *doc_view,
 }
 
 static void
-encode_controls(struct list_head *l, struct string *data,
+encode_controls(LIST_OF(struct submitted_value) *l, struct string *data,
 		int cp_from, int cp_to)
 {
 	struct submitted_value *sv;
@@ -813,6 +818,7 @@ struct boundary_info {
 	unsigned char string[BOUNDARY_LENGTH];
 };
 
+/** @relates boundary_info */
 static inline void
 init_boundary(struct boundary_info *boundary)
 {
@@ -820,7 +826,8 @@ init_boundary(struct boundary_info *boundary)
 	memset(boundary->string, '0', BOUNDARY_LENGTH);
 }
 
-/* Add boundary to string and save the offset */
+/** Add boundary to string and save the offset
+ * @relates boundary_info */
 static inline void
 add_boundary(struct string *data, struct boundary_info *boundary)
 {
@@ -832,6 +839,7 @@ add_boundary(struct string *data, struct boundary_info *boundary)
 	add_bytes_to_string(data, boundary->string, BOUNDARY_LENGTH);
 }
 
+/** @relates boundary_info */
 static inline unsigned char *
 increment_boundary_counter(struct boundary_info *boundary)
 {
@@ -850,6 +858,7 @@ increment_boundary_counter(struct boundary_info *boundary)
 	return NULL;
 }
 
+/** @relates boundary_info */
 static inline void
 check_boundary(struct string *data, struct boundary_info *boundary)
 {
@@ -895,9 +904,10 @@ check_boundary(struct string *data, struct boundary_info *boundary)
 		memcpy(data->source + boundary->offsets[i], bound, BOUNDARY_LENGTH);
 }
 
-/* FIXME: shouldn't we encode data at send time (in http.c) ? --Zas */
+/** @todo FIXME: shouldn't we encode data at send time (in http.c) ? --Zas */
 static void
-encode_multipart(struct session *ses, struct list_head *l, struct string *data,
+encode_multipart(struct session *ses, LIST_OF(struct submitted_value) *l,
+		 struct string *data,
 		 struct boundary_info *boundary, int cp_from, int cp_to)
 {
 	struct conv_table *convert_table = NULL;
@@ -912,7 +922,7 @@ encode_multipart(struct session *ses, struct list_head *l, struct string *data,
 		add_boundary(data, boundary);
 		add_crlf_to_string(data);
 
-		/* FIXME: name is not encoded.
+		/** @bug FIXME: name is not encoded.
 		 * from RFC 1867:
 		 * multipart/form-data contains a series of parts.
 		 * Each part is expected to contain a content-disposition
@@ -1060,7 +1070,7 @@ encode_newlines(struct string *string, unsigned char *data)
 }
 
 static void
-encode_text_plain(struct list_head *l, struct string *data,
+encode_text_plain(LIST_OF(struct submitted_value) *l, struct string *data,
 		  int cp_from, int cp_to)
 {
 	struct submitted_value *sv;
@@ -1140,7 +1150,7 @@ get_form_uri(struct session *ses, struct document_view *doc_view,
 	     struct form_control *fc)
 {
 	struct boundary_info boundary;
-	INIT_LIST_HEAD(submit);
+	INIT_LIST_OF(struct submitted_value, submit);
 	struct string data;
 	struct string go;
 	int cp_from, cp_to;
@@ -1785,7 +1795,7 @@ field_op(struct session *ses, struct document_view *doc_view,
 	return status;
 }
 
-unsigned char *
+static unsigned char *
 get_form_label(struct form_control *fc)
 {
 	assert(fc->form);
diff --git a/src/viewer/text/form.h b/src/viewer/text/form.h
index d507d5c5..79542b0e 100644
--- a/src/viewer/text/form.h
+++ b/src/viewer/text/form.h
@@ -13,16 +13,18 @@ struct session;
 struct term_event;
 struct terminal;
 
-/* This struct looks a little embarrassing, yeah. */
+/*! This struct looks a little embarrassing, yeah. */
 struct form_view {
 	LIST_HEAD(struct form_view);
 
-	/* We can't just reference to {struct form} since we can potentially
-	 * live much longer than that. */
+	/** The corresponding form.form_num within the document.
+	 * We can't just reference to struct form since we can potentially
+	 * live much longer than that.
+	 * @see find_form_by_form_view() */
 	int form_num;
 
 #ifdef CONFIG_ECMASCRIPT
-	/* This holds the ECMAScript object attached to this structure. It can
+	/** This holds the ECMAScript object attached to this structure. It can
 	 * be NULL since the object is created on-demand at the first time some
 	 * ECMAScript code accesses it. It is freed automatically by the
 	 * garbage-collecting code when the ECMAScript context is over (usually
@@ -37,38 +39,43 @@ struct form_state {
 	int position;
 	enum form_type type;
 
-	/* For FC_TEXT, FC_PASSWORD, FC_FILE, and FC_TEXTAREA, @value
-	 * is the text string that the user can edit.  The string is
-	 * null-terminated; its length is not stored separately.  The
-	 * size of the buffer is not stored anywhere; extending the
-	 * string always requires calling realloc().  The string is
-	 * not normally allowed to grow past @form_control.maxlength
-	 * bytes (not counting the null), but there may be ways to get
-	 * longer strings.  The string is in the charset of the
-	 * terminal (which can be UTF-8 only if CONFIG_UTF8 is
-	 * defined, and is assumed to be unibyte otherwise).  The
-	 * charset of the document and the UTF-8 I/O option have no
-	 * effect here.  */
+	/* Editable string.
+	 * - For ::FC_TEXT, ::FC_PASSWORD, ::FC_FILE, and
+	 *   ::FC_TEXTAREA, @c value is the text string that the user
+	 *   can edit.  The string is null-terminated; its length is
+	 *   not stored separately.  The size of the buffer is not
+	 *   stored anywhere; extending the string always requires
+	 *   calling realloc().  The string is not normally allowed to
+	 *   grow past form_control.maxlength bytes (not counting the
+	 *   null), but there may be ways to get longer strings.  The
+	 *   string is in the charset of the terminal (which can be
+	 *   UTF-8 only if CONFIG_UTF8 is defined, and is assumed to
+	 *   be unibyte otherwise).  The charset of the document and
+	 *   the UTF-8 I/O option have no effect here.  */
 	unsigned char *value;
-	/* For FC_TEXT, FC_PASSWORD, and FC_FILE, @state is the byte
-	 * position of the insertion point in @value.
-	 * For FC_CHECKBOX and FC_RADIO, @state is 1 or 0.
-	 * For FC_SELECT, @state is the index of the selected item
-	 * in @form_control.labels.  */
+	/** Position in #value, or an editable integer.
+	 * - For ::FC_TEXT, ::FC_PASSWORD, and ::FC_FILE, @c state is
+	 *   the byte position of the insertion point in #value.
+	 * - For ::FC_CHECKBOX and ::FC_RADIO, @c state is 1 or 0.
+	 * - For ::FC_SELECT, @c state is the index of the selected item
+	 *   in form_control.labels.  */
 	int state;
 #ifdef CONFIG_UTF8
-	/* For FC_TEXT, FC_PASSWORD, and FC_FILE, @state_cell is not
-	 * used.  */
+	/** Position in the screen.
+	 * - For ::FC_TEXT, ::FC_PASSWORD, and ::FC_FILE, @c
+	 *   state_cell is not used.  */
 	int state_cell;
 #endif /* CONFIG_UTF8 */
-	/* For FC_TEXT, FC_PASSWORD, and FC_FILE, @vpos is the index
-	 * of the first displayed byte in @value.  It should never be
-	 * in the middle of a character.  */
+	/** Horizontal scrolling.
+	 * - For ::FC_TEXT, ::FC_PASSWORD, and ::FC_FILE, @c vpos is
+	 *   the index of the first displayed byte in #value.  It
+	 *   should never be in the middle of a character.  */
 	int vpos;
+	/** Vertical scrolling.  */
 	int vypos;
 
 #ifdef CONFIG_ECMASCRIPT
-	/* This holds the ECMAScript object attached to this structure. It can
+	/** This holds the ECMAScript object attached to this structure. It can
 	 * be NULL since the object is created on-demand at the first time some
 	 * ECMAScript code accesses it. It is freed automatically by the
 	 * garbage-collecting code when the ECMAScript context is over (usually
@@ -91,7 +98,7 @@ struct submitted_value {
 
 struct submitted_value *init_submitted_value(unsigned char *name, unsigned char *value, enum form_type type, struct form_control *fc, int position);
 void done_submitted_value(struct submitted_value *sv);
-void done_submitted_value_list(struct list_head *list);
+void done_submitted_value_list(LIST_OF(struct submitted_value) *list);
 
 struct uri *get_form_uri(struct session *ses, struct document_view *doc_view, struct form_control *fc);
 
diff --git a/src/viewer/text/link.c b/src/viewer/text/link.c
index c87e13ef..175a0ff1 100644
--- a/src/viewer/text/link.c
+++ b/src/viewer/text/link.c
@@ -164,7 +164,7 @@ get_link_cursor_offset(struct document_view *doc_view, struct link *link)
 	return 0;
 }
 
-/* Initialise a static template character with the colour and attributes
+/** Initialise a static template character with the colour and attributes
  * appropriate for an active link and return that character. */
 static inline struct screen_char *
 init_link_drawing(struct document_view *doc_view, struct link *link, int invert)
@@ -224,7 +224,7 @@ init_link_drawing(struct document_view *doc_view, struct link *link, int invert)
 	return &template;
 }
 
-/* Give the current link the appropriate colour and attributes. */
+/** Give the current link the appropriate colour and attributes. */
 void
 draw_current_link(struct session *ses, struct document_view *doc_view)
 {
@@ -309,7 +309,7 @@ draw_link(struct terminal *term, struct document_view *doc_view,
 	}
 }
 
-/* Restore the colours and attributes that the active link had
+/** Restore the colours and attributes that the active link had
  * before it was selected. */
 void
 clear_link(struct terminal *term, struct document_view *doc_view)
@@ -472,7 +472,7 @@ current_link_is_visible(struct document_view *doc_view)
 	return (link && link_in_view(doc_view, link));
 }
 
-/* Look for the first and the last link currently visible in our
+/** Look for the first and the last link currently visible in our
  * viewport. */
 static void
 get_visible_links_range(struct document_view *doc_view, int *first, int *last)
@@ -543,7 +543,8 @@ next_link_in_view_y(struct document_view *doc_view, int current, int direction)
 	return next_link_in_view_(doc_view, current, direction, link_in_view_y, set_pos_x);
 }
 
-/* Get the bounding columns of @link at line @y (or all lines if @y == -1). */
+/** Get the bounding columns of @a link at line @a y (or all lines if
+ * @a y == -1). */
 static void
 get_link_x_bounds(struct link *link, int y, int *min_x, int *max_x)
 {
@@ -560,8 +561,8 @@ get_link_x_bounds(struct link *link, int y, int *min_x, int *max_x)
 	}
 }
 
-/* Check whether there is any point between @min_x and @max_x at the line @y
- * in link @link. */
+/** Check whether there is any point between @a min_x and @a max_x at
+ * the line @a y in link @a link. */
 static int
 get_link_x_intersect(struct link *link, int y, int min_x, int max_x)
 {
@@ -578,8 +579,8 @@ get_link_x_intersect(struct link *link, int y, int min_x, int max_x)
 	return 0;
 }
 
-/* Check whether there is any point between @min_y and @max_y in the column @x
- * in link @link. */
+/** Check whether there is any point between @a min_y and @a max_y in
+ * the column @a x in link @a link. */
 static int
 get_link_y_intersect(struct link *link, int x, int min_y, int max_y)
 {
@@ -777,8 +778,9 @@ set_pos_y(struct document_view *doc_view, struct link *link)
 		   doc_view->document->height - doc_view->box.height);
 }
 
-/* direction == 1 -> DOWN
- * direction == -1 -> UP */
+/** Focus the next link in the specified direction.
+ * @a direction == 1 -> DOWN;
+ * @a direction == -1 -> UP */
 static void
 find_link(struct document_view *doc_view, int direction, int page_mode)
 {
@@ -1129,7 +1131,7 @@ get_link_at_coordinates(struct document_view *doc_view, int x, int y)
 	return NULL;
 }
 
-/* This is backend of the backend goto_link_number_do() below ;)). */
+/** This is backend of the backend goto_link_number_do() below ;)). */
 void
 jump_to_link_number(struct session *ses, struct document_view *doc_view, int n)
 {
@@ -1156,7 +1158,7 @@ jump_to_link_number(struct session *ses, struct document_view *doc_view, int n)
 	current_link_hover(doc_view);
 }
 
-/* This is common backend for goto_link_number() and try_document_key(). */
+/** This is common backend for goto_link_number() and try_document_key(). */
 static void
 goto_link_number_do(struct session *ses, struct document_view *doc_view, int n)
 {
@@ -1186,7 +1188,7 @@ goto_link_number(struct session *ses, unsigned char *num)
 	goto_link_number_do(ses, doc_view, atoi(num) - 1);
 }
 
-/* See if this document is interested in the key user pressed. */
+/** See if this document is interested in the key user pressed. */
 enum frame_event_status
 try_document_key(struct session *ses, struct document_view *doc_view,
 		 struct term_event *ev)
@@ -1242,8 +1244,8 @@ try_document_key(struct session *ses, struct document_view *doc_view,
 	return FRAME_EVENT_IGNORED;
 }
 
-/* Open a contextual menu on a link, form or image element. */
-/* TODO: This should be completely configurable. */
+/** Open a contextual menu on a link, form or image element.
+ * @todo TODO: This should be completely configurable. */
 void
 link_menu(struct terminal *term, void *xxx, void *ses_)
 {
@@ -1366,8 +1368,8 @@ link_menu(struct terminal *term, void *xxx, void *ses_)
 		/* [gettext_accelerator_context()] */
 	}
 
-	/* TODO: Make it possible to trigger any script event hooks associated
-	 * to the link. --pasky */
+	/** @todo TODO: Make it possible to trigger any script event
+	 * hooks associated to the link. --pasky */
 
 end:
 	if (!mi->text) {
@@ -1378,7 +1380,7 @@ end:
 	do_menu(term, mi, ses, 1);
 }
 
-/* Return current link's title. */
+/** Return current link's title. */
 unsigned char *
 get_current_link_title(struct document_view *doc_view)
 {
@@ -1431,7 +1433,7 @@ get_current_link_info(struct session *ses, struct document_view *doc_view)
 	link = get_current_link(doc_view);
 	if (!link) return NULL;
 
-	/* TODO: Provide info about script event hooks too. --pasky */
+	/** @todo TODO: Provide info about script event hooks too. --pasky */
 
 	if (!link_is_form(link)) {
 		struct terminal *term = ses->tab->term;
diff --git a/src/viewer/text/marks.c b/src/viewer/text/marks.c
index ced1ae51..0d6ca0ec 100644
--- a/src/viewer/text/marks.c
+++ b/src/viewer/text/marks.c
@@ -1,4 +1,5 @@
-/* Marks registry */
+/** Marks registry
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -51,7 +52,9 @@
  * --pasky */
 
 
-/* The @marks array is indexed by ASCII code of the mark. */
+/** Number of possible mark characters: upper-case and lower-case
+ * ASCII letters.  The ::marks array is indexed by ASCII code of the
+ * mark. */
 #define MARKS_SIZE 26 * 2
 static struct view_state *marks[MARKS_SIZE];
 
diff --git a/src/viewer/text/search.c b/src/viewer/text/search.c
index a3ca067e..9d034d23 100644
--- a/src/viewer/text/search.c
+++ b/src/viewer/text/search.c
@@ -1,4 +1,5 @@
-/* Searching in the HTML document */
+/** Searching in the HTML document
+ * @file */
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE /* XXX: we _WANT_ strcasestr() ! */
@@ -212,13 +213,14 @@ get_search_data(struct document *document)
 	sort_srch(document);
 }
 
-/* Assign s1 and s2 the first search node and the last search node needed to
- * form the region starting at line y and ending at the greater of y + height
- * and the end of the document, with allowance at the start to allow for
- * multi-line matches that would otherwise be partially outside of the region.
+/** Assign @a s1 and @a s2 the first search node and the last search
+ * node needed to form the region starting at line @a y and ending at
+ * the greater of @a y + @a height and the end of the document, with
+ * allowance at the start to allow for multi-line matches that would
+ * otherwise be partially outside of the region.
  *
- * Returns -1 on assertion failure, 1 if s1 and s2 are not found,
- * and 0 if they are found. */
+ * @returns -1 on assertion failure, 1 if @a s1 and @a s2 are not
+ * found, and 0 if they are found. */
 static int
 get_range(struct document *document, int y, int height, int l,
 	  struct search **s1, struct search **s2)
@@ -260,9 +262,9 @@ get_range(struct document *document, int y, int height, int l,
 	return 0;
 }
 
-/* Returns a string |doc| that is a copy of the text in the search nodes
- * from |s1| to |s1 + doclen - 1| with the space at the end of each line
- * converted to a new-line character (LF). */
+/** Returns a string @c doc that is a copy of the text in the search
+ * nodes from @a s1 to (@a s1 + @a doclen - 1) with the space at the
+ * end of each line converted to a new-line character (LF). */
 static unsigned char *
 get_search_region_from_search_nodes(struct search *s1, struct search *s2,
 				    int pattern_len, int *doclen)
@@ -489,7 +491,7 @@ strlen_u(unsigned char *text, int utf8)
 
 }
 
-/* Returns an allocated string which is a lowered copy of passed one. */
+/** Returns an allocated string which is a lowered copy of passed one. */
 static UCHAR *
 lowered_string(unsigned char *text, int textlen, int utf8)
 {
@@ -763,7 +765,7 @@ get_searched(struct document_view *doc_view, struct point **pt, int *pl, int utf
 		get_searched_plain(doc_view, pt, pl, l, s1, s2, utf8);
 }
 
-/* Highlighting of searched strings. */
+/** Highlighting of searched strings. */
 void
 draw_searched(struct terminal *term, struct document_view *doc_view)
 {
@@ -1122,7 +1124,8 @@ find_next(struct session *ses, struct document_view *doc_view, int direction)
 }
 
 
-/* Link typeahead */
+/** @name Link typeahead
+ * @{ */
 
 enum typeahead_code {
 	TYPEAHEAD_MATCHED,
@@ -1359,8 +1362,11 @@ search_hit_boundary:
 	return TYPEAHEAD_MATCHED;
 }
 
+/** @} */
 
-/* Typeahead */
+
+/** @name Typeahead
+ * @{ */
 
 static enum input_line_code
 text_typeahead_handler(struct input_line *line, int action_id)
@@ -1560,6 +1566,8 @@ search_typeahead(struct session *ses, struct document_view *doc_view,
 	return FRAME_EVENT_OK;
 }
 
+/** @} */
+
 
 /* The dialog functions are clones of input_field() ones. Gross code
  * duplication. */
diff --git a/src/viewer/text/textarea.c b/src/viewer/text/textarea.c
index dfb44605..b7b0634c 100644
--- a/src/viewer/text/textarea.c
+++ b/src/viewer/text/textarea.c
@@ -1,4 +1,5 @@
-/* Textarea form item handlers */
+/** Textarea form item handlers
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -47,18 +48,20 @@ struct line_info {
 #endif /* CONFIG_UTF8 */
 };
 
-/* We add two extra entries to the table so the ending info can be added
+/** We add two extra entries to the table so the ending info can be added
  * without reallocating. */
 #define realloc_line_info(info, size) \
 	mem_align_alloc(info, size, (size) + 3, 0xFF)
 
 #ifdef CONFIG_UTF8
-/* Allocates a line_info table describing the layout of the textarea buffer.
+/** Allocates a line_info table describing the layout of the textarea buffer.
  *
- * @width	is max width and the offset at which text will be wrapped
- * @wrap	controls how the wrapping of text is performed
- * @format	is non zero the @text will be modified to make it suitable for
- *		encoding it for form posting
+ * @param text		the text to format; must be in UTF-8
+ * @param width		is max width and the offset at which @a text will be
+ *			wrapped
+ * @param wrap		controls how the wrapping of @a text is performed
+ * @param format	is non zero the @a text will be modified to make it
+ *			suitable for encoding it for form posting
  */
 static struct line_info *
 format_textutf8(unsigned char *text, int width, enum form_wrap wrap, int format)
@@ -138,12 +141,14 @@ format_textutf8(unsigned char *text, int width, enum form_wrap wrap, int format)
 }
 #endif /* CONFIG_UTF8 */
 
-/* Allocates a line_info table describing the layout of the textarea buffer.
+/** Allocates a line_info table describing the layout of the textarea buffer.
  *
- * @width	is max width and the offset at which text will be wrapped
- * @wrap	controls how the wrapping of text is performed
- * @format	is non zero the @text will be modified to make it suitable for
- *		encoding it for form posting
+ * @param text		the text to format; must be in a unibyte charset
+ * @param width		is max width and the offset at which @a text will be
+ *			wrapped
+ * @param wrap		controls how the wrapping of @a text is performed
+ * @param format	is non zero the @a text will be modified to make it
+ *			suitable for encoding it for form posting
  */
 static struct line_info *
 format_text(unsigned char *text, int width, enum form_wrap wrap, int format)
@@ -204,9 +209,9 @@ format_text(unsigned char *text, int width, enum form_wrap wrap, int format)
 	return line;
 }
 
-/* Searches for @cursor_position (aka. position in the fs->value string) for
- * the corresponding entry in the @line info. Returns the index or -1 if
- * position is not found. */
+/** Searches for @a cursor_position (aka. position in the
+ * form_state.value string) for the corresponding entry in the @a line
+ * info. Returns the index or -1 if position is not found. */
 static int
 get_textarea_line_number(struct line_info *line, int cursor_position)
 {
@@ -226,8 +231,8 @@ get_textarea_line_number(struct line_info *line, int cursor_position)
 	return -1;
 }
 
-/* Fixes up the vpos and vypos members of the form_state. Returns the
- * logical position in the textarea view. */
+/** Fixes up the form_state.vpos and form_state.vypos members.
+ * @returns the logical position in the textarea view. */
 #ifdef CONFIG_UTF8
 int
 area_cursor(struct form_control *fc, struct form_state *fs, int utf8)
@@ -513,10 +518,10 @@ encode_textarea(struct submitted_value *sv)
 }
 
 
-/* We use some evil hacking in order to make external textarea editor working.
+/** We use some evil hacking in order to make external textarea editor working.
  * We need to have some way how to be notified that the editor finished and we
  * should reload content of the textarea.  So we use global variable
- * textarea_editor as a flag whether we have one running, and if we have, we
+ * @c textarea_editor as a flag whether we have one running, and if we have, we
  * just call textarea_edit(1, ...).  Then we recover our state from static
  * variables, reload content of textarea back from file and clean up.
  *
@@ -525,7 +530,6 @@ encode_textarea(struct submitted_value *sv)
  * the content of it back to master somehow, add special flags for not deleting
  * of 'delete' etc) and I'm not going to do that now. Inter-links communication
  * *NEEDS* rewrite, as it looks just like quick messy hack now. --pasky */
-
 int textarea_editor = 0;
 
 static unsigned char *
@@ -1070,7 +1074,7 @@ textarea_op_bob(struct form_state *fs, struct form_control *fc)
 }
 #endif /* CONFIG_UTF8 */
 
-/* Set the form state so the cursor is on the last line of the buffer. Preserve
+/** Set the form state so the cursor is on the last line of the buffer. Preserve
  * the column if possible. This is done by getting current and last line and
  * then shifting the state by the delta of both lines start position bounding
  * the whole thing to the end of the last line. */
diff --git a/src/viewer/text/view.c b/src/viewer/text/view.c
index dc418487..238ca2eb 100644
--- a/src/viewer/text/view.c
+++ b/src/viewer/text/view.c
@@ -1,4 +1,5 @@
-/* HTML viewer (and much more) */
+/** HTML viewer (and much more)
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -83,8 +84,8 @@ detach_formatted(struct document_view *doc_view)
 	mem_free_set(&doc_view->name, NULL);
 }
 
-/* type == 0 -> PAGE_DOWN
- * type == 1 -> DOWN */
+/*! @a type == 0 -> PAGE_DOWN;
+ * @a type == 1 -> DOWN */
 static void
 move_down(struct session *ses, struct document_view *doc_view, int type)
 {
@@ -123,8 +124,8 @@ move_page_down(struct session *ses, struct document_view *doc_view)
 	return doc_view->vs->y == oldy ? FRAME_EVENT_OK : FRAME_EVENT_REFRESH;
 }
 
-/* type == 0 -> PAGE_UP
- * type == 1 -> UP */
+/*! @a type == 0 -> PAGE_UP;
+ * @a type == 1 -> UP */
 static void
 move_up(struct session *ses, struct document_view *doc_view, int type)
 {
@@ -262,7 +263,7 @@ move_link_dir(struct session *ses, struct document_view *doc_view, int dir_x, in
 	return FRAME_EVENT_REFRESH;
 }
 
-/* @steps > 0 -> down */
+/*! @a steps > 0 -> down */
 static enum frame_event_status
 vertical_scroll(struct session *ses, struct document_view *doc_view, int steps)
 {
@@ -297,7 +298,7 @@ vertical_scroll(struct session *ses, struct document_view *doc_view, int steps)
 	return FRAME_EVENT_REFRESH;
 }
 
-/* @steps > 0 -> right */
+/*! @a steps > 0 -> right */
 static enum frame_event_status
 horizontal_scroll(struct session *ses, struct document_view *doc_view, int steps)
 {
@@ -494,9 +495,10 @@ toggle_wrap_text(struct session *ses, struct document_view *doc_view, int xxxx)
 	draw_formatted(ses, 1);
 }
 
-/* Move the cursor to the document view co-ordinates provided as @x and @y,
- * scroll the document if necessary, put us in cursor-routing navigation mode if
- * that is not the current mode, and select any link under the cursor. */
+/** Move the cursor to the document view co-ordinates provided
+ * as @a x and @a y, scroll the document if necessary, put us in
+ * cursor-routing navigation mode if that is not the current mode,
+ * and select any link under the cursor. */
 enum frame_event_status
 move_cursor(struct session *ses, struct document_view *doc_view, int x, int y)
 {
@@ -1036,8 +1038,8 @@ is_mouse_on_tab_bar(struct session *ses, struct term_event_mouse *mouse)
 
 	return mouse->y == y;
 }
-/* Returns the session if event cleanup should be done or NULL if no cleanup is
- * needed. */
+/** @returns the session if event cleanup should be done or NULL if no
+ * cleanup is needed. */
 static struct session *
 send_mouse_event(struct session *ses, struct document_view *doc_view,
 		 struct term_event *ev)
@@ -1136,8 +1138,8 @@ try_typeahead(struct session *ses, struct document_view *doc_view,
 	term_send_event(ses->tab->term, ev);
 }
 
-/* Returns the session if event cleanup should be done or NULL if no cleanup is
- * needed. */
+/** @returns the session if event cleanup should be done or NULL if no
+ * cleanup is needed. */
 static struct session *
 send_kbd_event(struct session *ses, struct document_view *doc_view,
 	       struct term_event *ev)
diff --git a/src/viewer/text/view.h b/src/viewer/text/view.h
index 09af3f3f..e87fae64 100644
--- a/src/viewer/text/view.h
+++ b/src/viewer/text/view.h
@@ -10,7 +10,8 @@ struct session;
 struct term_event;
 struct terminal;
 
-/* Releases the document view's resources. But doesn't free() the @view. */
+/** Releases the document view's resources.
+ * But doesn't free() the @a doc_view. */
 void detach_formatted(struct document_view *doc_view);
 
 enum frame_event_status move_page_down(struct session *ses, struct document_view *doc_view);
@@ -40,7 +41,7 @@ enum frame_event_status move_document_end(struct session *ses, struct document_v
 enum frame_event_status set_frame(struct session *ses, struct document_view *doc_view, int xxxx);
 struct document_view *current_frame(struct session *);
 
-/* Used for changing between formatted and source (plain) view. */
+/** Used for changing between formatted and source (plain) view. */
 void toggle_plain_html(struct session *ses, struct document_view *doc_view, int xxxx);
 
 enum frame_event_status move_cursor_left(struct session *ses,
@@ -56,23 +57,27 @@ enum frame_event_status move_cursor(struct session *ses,
 				    struct document_view *doc_view,
 				    int x, int y);
 
-/* Used for changing wrapping of text */
+/** Used for changing wrapping of text */
 void toggle_wrap_text(struct session *ses, struct document_view *doc_view, int xxxx);
 
 enum frame_event_status copy_current_link_to_clipboard(struct session *ses,
 						struct document_view *doc_view,
 						int xxx);
 
-/* If the user has provided a numeric prefix, jump to the link
+/** If the user has provided a numeric prefix, jump to the link
  * with that number as its index. */
 int try_jump_to_link_number(struct session *ses,
 			    struct document_view *doc_view);
 
-/* File menu handlers. */
+/** @name File menu handlers.
+ * @{ */
 
 enum frame_event_status save_as(struct session *ses, struct document_view *doc_view, int magic);
 
-/* Various event emitters and link menu handlers. */
+/** @} */
+
+/** @name Various event emitters and link menu handlers.
+ * @{ */
 
 void send_event(struct session *, struct term_event *);
 
@@ -80,4 +85,6 @@ enum frame_event_status save_formatted_dlg(struct session *ses, struct document_
 enum frame_event_status view_image(struct session *ses, struct document_view *doc_view, int xxxx);
 enum frame_event_status download_link(struct session *ses, struct document_view *doc_view, action_id_T action_id);
 
+/** @}  */
+
 #endif
diff --git a/src/viewer/text/vs.c b/src/viewer/text/vs.c
index 99cf249e..d0bbdf52 100644
--- a/src/viewer/text/vs.c
+++ b/src/viewer/text/vs.c
@@ -1,4 +1,5 @@
-/* View state manager */
+/** View state manager
+ * @file */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -23,6 +24,7 @@
 #include "viewer/text/vs.h"
 
 
+/** @relates view_state */
 void
 init_vs(struct view_state *vs, struct uri *uri, int plain)
 {
@@ -39,6 +41,7 @@ init_vs(struct view_state *vs, struct uri *uri, int plain)
 	init_list(vs->forms);
 }
 
+/** @relates view_state */
 void
 destroy_vs(struct view_state *vs, int blast_ecmascript)
 {
@@ -60,6 +63,7 @@ destroy_vs(struct view_state *vs, int blast_ecmascript)
 	}
 }
 
+/** @relates view_state */
 void
 copy_vs(struct view_state *dst, struct view_state *src)
 {
diff --git a/src/viewer/text/vs.h b/src/viewer/text/vs.h
index 84336bd1..fbf8b90e 100644
--- a/src/viewer/text/vs.h
+++ b/src/viewer/text/vs.h
@@ -14,7 +14,7 @@ struct view_state {
 	struct document_view *doc_view;
 	struct uri *uri;
 
-	struct list_head forms; /* -> struct form_view */
+	LIST_OF(struct form_view) forms;
 	struct form_state *form_info;
 	int form_info_len;
 
@@ -27,8 +27,8 @@ struct view_state {
 	unsigned int did_fragment:1;
 
 #ifdef CONFIG_ECMASCRIPT
-	/* If set, we reset the interpreter state the next time we are going to
-	 * render document attached to this view state. This means a real
+	/** If set, we reset the interpreter state the next time we are going
+	 * to render document attached to this view state. This means a real
 	 * document (not just struct document_view, which randomly appears and
 	 * disappears during gradual rendering) is getting replaced. So set this
 	 * always when you replace the view_state URI, but also when reloading