diff --git a/docs/Doxyfile.cmake.in b/docs/Doxyfile.cmake.in
index 3177d4e83..6ba6f3fb2 100644
--- a/docs/Doxyfile.cmake.in
+++ b/docs/Doxyfile.cmake.in
@@ -187,7 +187,7 @@ JAVADOC_AUTOBRIEF      = NO
 # requiring an explicit \brief command for a brief description.)
 # The default value is: NO.
 
-QT_AUTOBRIEF           = NO
+QT_AUTOBRIEF           = YES
 
 # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
 # multi-line C++ special comment block (i.e. a block of //! or /// comments) as
@@ -778,6 +778,7 @@ FILE_PATTERNS          = *.ii \
                          *.ipp \
                          *.i++ \
                          *.inl \
+                         *.inc \
                          *.h \
                          *.hh \
                          *.hxx \
diff --git a/docs/Doxyfile.qmake b/docs/Doxyfile.qmake
index d81e11f48..0d7e62506 100644
--- a/docs/Doxyfile.qmake
+++ b/docs/Doxyfile.qmake
@@ -187,7 +187,7 @@ JAVADOC_AUTOBRIEF      = NO
 # requiring an explicit \brief command for a brief description.)
 # The default value is: NO.
 
-QT_AUTOBRIEF           = NO
+QT_AUTOBRIEF           = YES
 
 # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
 # multi-line C++ special comment block (i.e. a block of //! or /// comments) as
@@ -778,6 +778,7 @@ FILE_PATTERNS          = *.ii \
                          *.ipp \
                          *.i++ \
                          *.inl \
+                         *.inc \
                          *.h \
                          *.hh \
                          *.hxx \
diff --git a/src/xbus/plugin.h b/src/xbus/plugin.h
index 065c9defa..6565fb8e5 100644
--- a/src/xbus/plugin.h
+++ b/src/xbus/plugin.h
@@ -8,7 +8,10 @@
 
 //! \file
 
-//! \namespace XBus
+/*!
+ * \namespace XBus
+ * Plugin loaded by X-Plane which publishes a DBus service
+ */
 
 #define NOMINMAX
 #include "menus.h"
@@ -31,8 +34,10 @@ namespace XBus
         Q_OBJECT
 
     public:
+        //! Constructor
         CPlugin();
 
+        //! Called by XPluginReceiveMessage when the model is changed
         void onAircraftModelChanged();
 
     private:
diff --git a/src/xbus/service.h b/src/xbus/service.h
index edd66dceb..400954d50 100644
--- a/src/xbus/service.h
+++ b/src/xbus/service.h
@@ -11,7 +11,9 @@
 #include "datarefs.h"
 #include <QObject>
 
+//! \private
 #define XBUS_SERVICE_INTERFACENAME "net.vatsim.PilotClient.XBus"
+//! \private
 #define XBUS_SERVICE_OBJECTPATH "/XBus"
 
 namespace XBus