diff --git a/Doxyfile b/Doxyfile
index 3fd6d9dd42..4239ac9afc 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -434,7 +434,7 @@ INLINE_SIMPLE_STRUCTS  = NO
 # types are typedef'ed and only the typedef is referenced, never the tag name.
 # The default value is: NO.
 
-TYPEDEF_HIDES_STRUCT   = NO
+TYPEDEF_HIDES_STRUCT   = YES
 
 # The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
 # cache is used to resolve symbols given their name and scope. Since this can be
@@ -1211,7 +1211,7 @@ HTML_STYLESHEET        =
 # list). For an example see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_STYLESHEET  = "./docs/doxygen-extra.css"
+HTML_EXTRA_STYLESHEET  = "./docs/doxygen/doxygen-extra.css"
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note
@@ -2135,7 +2135,7 @@ ENABLE_PREPROCESSING   = YES
 # The default value is: NO.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-MACRO_EXPANSION        = NO
+MACRO_EXPANSION        = YES
 
 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
 # the macro expansion is limited to the macros specified with the PREDEFINED and
@@ -2143,7 +2143,7 @@ MACRO_EXPANSION        = NO
 # The default value is: NO.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-EXPAND_ONLY_PREDEF     = NO
+EXPAND_ONLY_PREDEF     = YES
 
 # If the SEARCH_INCLUDES tag is set to YES, the include files in the
 # INCLUDE_PATH will be searched if a #include is found.
@@ -2175,7 +2175,7 @@ INCLUDE_FILE_PATTERNS  =
 # recursively expanded use the := operator instead of the = operator.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-PREDEFINED             =
+PREDEFINED             = NONMATCH END_NONMATCH ASM_FUNC
 
 # 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
diff --git a/docs/beanstalk-bg.png b/docs/beanstalk-bg.png
deleted file mode 100644
index e2662231bd..0000000000
Binary files a/docs/beanstalk-bg.png and /dev/null differ
diff --git a/docs/doxygen-extra.css b/docs/doxygen-extra.css
deleted file mode 100644
index bca8e29c0c..0000000000
--- a/docs/doxygen-extra.css
+++ /dev/null
@@ -1,5 +0,0 @@
-body {
-    background-image:  url("../../beanstalk-bg.png");
-    background-attachment: fixed;
-    background-size: cover;
-}