--- a/doc/doxygen/Doxyfile.in	Tue May 31 21:03:01 2016 +0200
+++ b/doc/doxygen/Doxyfile.in	Tue May 31 22:13:35 2016 +0200
@@ -7,7 +7,7 @@
 #
 # VERSION		- The project version
 # DOXYGEN_INPUT		- The source directory
-# DOXYGEN_OUTPUT	- The output directory (doc/generated/doxygen)
+# DOXYGEN_OUTPUT	- The output directory
 # DOXYGEN_HAVE_DOT	- True if have dot
 # DOXYGEN_DOT_PATH	- The path to dot
 #
@@ -57,7 +57,7 @@
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = @CMAKE_BINARY_DIR@/docs/doxygen
+OUTPUT_DIRECTORY       = @DOXYGEN_OUTPUT@
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and
@@ -131,7 +131,7 @@
 # shortest path that makes the file name unique will be used
 # The default value is: YES.
 
-FULL_PATH_NAMES        = YES
+FULL_PATH_NAMES        = NO
 
 # The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
 # Stripping is only done if one of the specified strings matches the left-hand
@@ -742,7 +742,7 @@
 # spaces.
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = @DOXYGEN_INPUT@/lib
+INPUT                  = @DOXYGEN_INPUT@
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -762,7 +762,7 @@
 # *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
 # *.qsf, *.as and *.js.
 
-FILE_PATTERNS          = *.h
+FILE_PATTERNS          = *.hpp
 
 # The RECURSIVE tag can be used to specify whether or not subdirectories should
 # be searched for input files as well.
@@ -777,7 +777,7 @@
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                = lib/irccd/server-private.h
+EXCLUDE                = lib/irccd/server-private.hpp
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded