docs/doxygen.conf |    2 +-
 include/apr.h.in  |   24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/doxygen.conf b/docs/doxygen.conf
index 29c2cbf..afd88e3 100644
--- a/docs/doxygen.conf
+++ b/docs/doxygen.conf
@@ -1,6 +1,6 @@
 PROJECT_NAME="Apache Portable Runtime"
 
-INPUT=.
+INPUT=../include include
 QUIET=YES
 RECURSIVE=YES
 FILE_PATTERNS=*.h
diff --git a/include/apr.h.in b/include/apr.h.in
index 22b22f5..bef91eb 100644
--- a/include/apr.h.in
+++ b/include/apr.h.in
@@ -445,11 +445,11 @@ typedef  apr_uint32_t            apr_uintptr_t;
 /** 
  * Thread callbacks from APR functions must be declared with APR_THREAD_FUNC, 
  * so that they follow the platform's calling convention.
- * <PRE>
- *
+ */
+/**
+ * @code
  * void* APR_THREAD_FUNC my_thread_entry_fn(apr_thread_t *thd, void *data);
- *
- * </PRE>
+ * @endcode
  */
 #define APR_THREAD_FUNC       @apr_thread_func@
 
@@ -481,11 +481,11 @@ typedef  apr_uint32_t            apr_uintptr_t;
  * APR_DECLARE_NONSTD(), as they must follow the C language calling convention.
  * @see APR_DECLARE @see APR_DECLARE_DATA
  * @remark Both the declaration and implementations must use the same macro.
- * <PRE>
- *
+ */
+/**
+ * @code
  * APR_DECLARE_NONSTD(rettype) apr_func(args, ...);
- *
- * </PRE>
+ * @endcode
  */
 #define APR_DECLARE_NONSTD(type)     type
 
@@ -496,12 +496,12 @@ typedef  apr_uint32_t            apr_uintptr_t;
  * @remark Note that the declaration and implementations use different forms,
  * but both must include the macro.
  * 
- * <PRE>
- *
+ */
+/**
+ * @code
  * extern APR_DECLARE_DATA type apr_variable;\n
  * APR_DECLARE_DATA type apr_variable = value;
- *
- * </PRE>
+ * @endcode
  */
 #define APR_DECLARE_DATA