diff --git a/ext/build/toolchain.py b/ext/build/toolchain.py
index 0d685bf0..5f78361a 100644
--- a/ext/build/toolchain.py
+++ b/ext/build/toolchain.py
@@ -635,6 +635,8 @@ class InternalCommands:
 			raise Exception('Not implemented for platform: ' + sys.platform)
 		
 	def doxygen(self):
+		self.enableMakeGui = False
+		
 		# The conf generates doc/doxygen.cfg from cmake/doxygen.cfg.in
 		self.configure(self.defaultTarget, '-DCONF_DOXYGEN:BOOL=TRUE')
 
@@ -1346,7 +1348,7 @@ class CommandHandler:
 		print 'Not yet implemented: install'
 	
 	def doxygen(self):
-		self.ic.doxygen ()
+		self.ic.doxygen()
 	
 	def dist(self):
 		
diff --git a/res/doxygen.cfg.in b/res/doxygen.cfg.in
index 0c4d7213..ed7fae71 100644
--- a/res/doxygen.cfg.in
+++ b/res/doxygen.cfg.in
@@ -287,7 +287,7 @@ TYPEDEF_HIDES_STRUCT   = NO
 # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
 # corresponding to a cache size of 2^16 = 65536 symbols
 
-SYMBOL_CACHE_SIZE      = 0
+#SYMBOL_CACHE_SIZE      = 0
 
 #---------------------------------------------------------------------------
 # Build related configuration options
@@ -487,7 +487,7 @@ SHOW_USED_FILES        = YES
 # then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
 # in the documentation. The default is NO.
 
-SHOW_DIRECTORIES       = NO
+#SHOW_DIRECTORIES       = NO
 
 # Set the SHOW_FILES tag to NO to disable the generation of the Files page.
 # This will remove the Files entry from the Quick Index and from the
@@ -627,12 +627,9 @@ EXCLUDE_SYMLINKS       = NO
 
 EXCLUDE_PATTERNS       = */.svn/* \
                          */.git/* \
-                         */tools/* \
-                         */src/vnc/* \
+                         */ext/* \
                          */src/gui/* \
-                         */src/test/guitests/debug/moc_* \
-                         */src/test/guitests/release/moc_* \
-                         */src/qsynergy-build-desktop/*
+                         */src/test/*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
@@ -852,7 +849,7 @@ HTML_TIMESTAMP         = YES
 # files or namespaces will be aligned in HTML using tables. If set to
 # NO a bullet list will be used.
 
-HTML_ALIGN_MEMBERS     = YES
+#HTML_ALIGN_MEMBERS     = YES
 
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 # documentation will contain sections that can be hidden and shown after the
@@ -1037,7 +1034,7 @@ GENERATE_TREEVIEW      = NO
 # By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
 # and Class Hierarchy pages using a tree view instead of an ordered list.
 
-USE_INLINE_TREES       = NO
+#USE_INLINE_TREES       = NO
 
 # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
 # used to set the initial width (in pixels) of the frame in which the tree
@@ -1487,7 +1484,7 @@ DOT_NUM_THREADS        = 0
 # DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
 # containing the font.
 
-DOT_FONTNAME           = FreeSans.ttf
+#DOT_FONTNAME           = FreeSans.ttf
 
 # The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
 # The default size is 10pt.