diff --git a/doc/doxygen.conf b/doc/doxygen.conf
index 81bab09ba..12a9a5702 100644
--- a/doc/doxygen.conf
+++ b/doc/doxygen.conf
@@ -434,7 +434,7 @@ LOOKUP_CACHE_SIZE      = 1
 # normally produced when WARNINGS is set to YES.
 # The default value is: NO.
 
-EXTRACT_ALL            = no
+EXTRACT_ALL            = YES
 
 # If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
 # be included in the documentation.
@@ -732,7 +732,7 @@ QUIET                  = NO
 # Tip: Turn warnings on while writing the documentation.
 # The default value is: YES.
 
-WARNINGS               = no
+WARNINGS               = YES
 
 # If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
 # warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
@@ -861,42 +861,10 @@ EXCLUDE_SYMBOLS        = main
 # that contain example code fragments that are included (see the \include
 # command).
 
-EXAMPLE_PATH           = src/aodv/examples \
-                         src/bridge/examples \
-                         src/brite/examples \
-                         src/buildings/examples \
-                         src/click/examples \
-                         src/config-store/examples \
-                         src/core/examples \
-			 src/core/doc \
-                         src/csma/examples \
-                         src/csma-layout/examples \
-                         src/dsdv/examples \
-                         src/dsr/examples \
-                         src/energy/examples \
-                         src/fd-net-device/examples \
-                         src/flow-monitor/examples \
-                         src/internet/examples \
-                         src/lte/examples \
-                         src/mesh/examples \
-                         src/mobility/examples \
-                         src/mpi/examples \
-                         src/netanim/examples \
-                         src/network/examples \
-                         src/nix-vector-routing/examples \
-                         src/olsr/examples \
-                         src/openflow/examples \
-                         src/point-to-point/examples \
-                         src/propagation/examples \
-                         src/spectrum/examples \
-                         src/stats/examples \
-                         src/tap-bridge/examples \
-                         src/topology-read/examples \
-                         src/uan/examples \
-                         src/virtual-net-device/examples \
-                         src/visualizer/examples \
-                         src/wifi/examples \
-                         src/wimax/examples
+EXAMPLE_PATH           = examples \
+                         utils \
+			 src \
+			 contrib
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
@@ -2076,14 +2044,19 @@ INCLUDE_FILE_PATTERNS  =
 
 PREDEFINED             = NS3_ASSERT_ENABLE \
                          NS3_LOG_ENABLE \
+                         NS_ABORT_MSG_UNLESS()=1 \
                          NS_LOG_COMPONENT_DEFINE()=1 \
                          NS_LOG_COMPONENT_DEFINE_MASK()=1 \
                          NS_OBJECT_ENSURE_REGISTERED()=1 \
                          NS_OBJECT_TEMPLATE_CLASS_DEFINE()=1 \
                          NS3_BUILD_PROFILE_DEBUG \
                          NS3_BUILD_PROFILE_RELEASE \
-                         NS3_BUILD_PROFILE_OPTIMIZED
-
+                         NS3_BUILD_PROFILE_OPTIMIZED \
+                         INT64X64_USE_CAIRO \
+                         INT64X64_USE_DOUBLE \
+                         INT64X64_USE_CAIRO \
+                         
+			 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The
 # macro definition that is found in the sources will be used. Use the PREDEFINED