diff --git a/docs/doxygen.rc b/docs/doxygen.rc
index 1397cf394..a31dbfc67 100644
--- a/docs/doxygen.rc
+++ b/docs/doxygen.rc
@@ -789,6 +789,7 @@ WARN_LOGFILE           =
 INPUT = foreigns.yap \
       docs/yap.md \
                          pl \
+			 swi \
                          C \
                          H \
                          include \
diff --git a/docs/yap.md b/docs/yap.md
index 06e50f194..3dce960dc 100644
--- a/docs/yap.md
+++ b/docs/yap.md
@@ -835,69 +835,64 @@ being designed to work with the swig (@url(www.swig.org}) interface compiler.
 
 @page  LIbrary The YAP Library
 
-+  @ref maplist introduces macros to apply an operation over
-          all elements of a list
++  @ref maplist
 
 +  @ref Apply Apply Macros
 		
-+  @ref Association_Lists Association Lists
++  @ref Association_Lists 
 		
-+  @ref AVL_Trees AVL Trees
++  @ref AVL_Trees 
 		
-+  @ref  Exo_Intervals Exo Intervals
++  @ref  Exo_Intervals
 		
-+  @ref Heaps Heaps
++  @ref Heaps 
 		
-+  @ref Lists List Manipulation 
++  @ref Lists
 		
-+  @ref LineUtilities Line Manipulation Utilities
++  @ref LineUtilities
 		
-+  @ref matrix Matrix Library
++  @ref matrix 
 		
-+  @ref NonhYBacktrackable_Data_Structures Non-Backtrackable Data Structures
++  @ref NonhYBacktrackable_Data_Structures 
 		
-+  @ref Ordered_Sets Ordered Sets
++  @ref Ordered_Sets 
 		
-+  @ref Pseudo_Random Pseudo Random Number Integer Generator
++  @ref Pseudo_Random 
 		
 +  @ref Queues Queues
 		
-+  @ref Random Random Number Generator
++  @ref PseudoRandom
 		
-+  @ref RedhYBlack_Trees Red-Black Trees
++  @ref RedhYBlack_Trees
 		
-+  @ref RegExp Regular Expressions
-		
-+  @ref Splay_Trees Splay Trees
-		
-+  @ref System Calling The Operating System from YAP
-		
-+  @ref Terms Utilities On Terms
-		
-+  @ref Tries Trie DataStructure
-		
-+  @ref Cleanup Call Cleanup
-		
-+  @ref Timeout Calls With Timeout
-		
-+  @ref Trees Updatable Binary Trees
-		
-+  @ref UGraphs Unweighted Graphs
-		
-+  @ref DGraphs Directed Graphs
-		
-+  @ref UnDGraphs Undirected Graphs
-		
-+  @ref DBUsage Memory Usage in Prolog Data-Base
-		
-+  @ref Lambda Lambda Expressions
-		
-+  @ref Block_Diagram Block Diagram
-		
-+  @ref Lambda
-
-+  @ref  Invoking_Predicates_on_all_Members_of_a_List Invoking Predicates on all Members of a List
++  @ref RegExp
 
++  @ref Splay_Trees 
+		
++  @ref System 
+		
++  @ref Terms 
+		
++  @ref Tries 
+		
++  @ref Cleanup 
+		
++  @ref Timeout
+		
++  @ref Trees
+		
++  @ref UGraphs
+		
++  @ref DGraphs 
+		
++  @ref UnDGraphs
+		
++  @ref DBUsage
+		
++  @ref lambda 
+		
++  @ref Block_Diagram 
+		
 @defgroup YAPProgramming Programming in YAP
 
 @page  Programming Programming in YAP
@@ -912,7 +907,7 @@ being designed to work with the swig (@url(www.swig.org}) interface compiler.
 
 @page  SWICode The SWI-Prolog Libraries and Packages
 
-+ @ref aggregates
++ @ref aggregate
 
 + @ref date
 		
diff --git a/library/prandom.yap b/library/prandom.yap
index 9a117047b..bba054faa 100644
--- a/library/prandom.yap
+++ b/library/prandom.yap
@@ -15,6 +15,11 @@
 *									 *
 *************************************************************************/
 
+/**
+ @groupdef PseudoRandom Van Gelder Random Number Generator
+ @ingroup YAPBuiltins
+ @{
+*/
 
 % The following code produces the same random numbers as my previous 
 % ranpkg.pl, but is more accurately documented and slightly more 
@@ -137,3 +142,4 @@ ranunif(Range, Unif) :-
 	Unif is (Raw * Range) >> (Wsize-1).
 
 
+/%%! @}
diff --git a/library/random.yap b/library/random.yap
index 44dfaa707..b8f351cd7 100644
--- a/library/random.yap
+++ b/library/random.yap
@@ -22,7 +22,7 @@
 %   version which yields 15-bit random integers using only integer
 %   arithmetic.
  
-/** @defgroup Random Random Number Generator
+/** @defgroup Pseudo_Random Random Number Generator
 @ingroup YAPLibrary
 @{
 
diff --git a/swi/library/dcg/basics.pl b/swi/library/dcg/basics.pl
index fb1ba88ed..21eb6e6b3 100644
--- a/swi/library/dcg/basics.pl
+++ b/swi/library/dcg/basics.pl
@@ -62,6 +62,7 @@
 
 
 /** <module> Various general DCG utilities
+@ingroup SWILibrary
 
 This library provides various commonly  used   DCG  primitives acting on
 list  of  character  *codes*.  Character   classification  is  based  on