diff --git a/doxygen.config b/doxygen.config
index 7a21434c2..384d563c0 100644
--- a/doxygen.config
+++ b/doxygen.config
@@ -630,12 +630,8 @@ WARN_LOGFILE           =
 # with spaces.
 
 INPUT                  = doxygen-mainpage \
-		         include \
+                         include \
                          src \
-                         test_c \
-                         test_regress \
-                         test_sc \
-                         test_v
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
diff --git a/include/verilated.h b/include/verilated.h
index 6d869ea5e..a5340cc4f 100644
--- a/include/verilated.h
+++ b/include/verilated.h
@@ -327,7 +327,7 @@ public:  // But internals only - called from VerilatedModule's
 class Verilated {
     // MEMBERS
     // Slow path variables
-    static VerilatedMutex m_mutex;  ///< Mutex for all static members, when VL_THREADED
+    static VerilatedMutex m_mutex;  ///< Mutex for s_s/s_ns members, when VL_THREADED
 
     static VerilatedVoidCb  s_flushCb;		///< Flush callback function
 
diff --git a/include/verilatedos.h b/include/verilatedos.h
index f58b74d75..72d209cec 100644
--- a/include/verilatedos.h
+++ b/include/verilatedos.h
@@ -358,21 +358,19 @@ typedef unsigned long long	vluint64_t;	///< 64-bit unsigned type
 //=========================================================================
 // Performance counters
 
-#if VL_THREADED
 /// The vluint64_t argument is loaded with a high-performance counter for profiling
 /// or 0x0 if not implemeted on this platform
-# if defined(__i386__) || defined(__x86_64__)
-#  define VL_RDTSC(val) {  \
+#if defined(__i386__) || defined(__x86_64__)
+# define VL_RDTSC(val) {  \
     vluint32_t hi, lo;  \
     asm volatile("rdtsc" : "=a" (lo), "=d" (hi));  \
     (val) = ((vluint64_t)lo) | (((vluint64_t)hi)<<32);  \
 }
-# elif defined(__aarch64__)
-#  define VL_RDTSC(val) asm volatile("mrs %[rt],PMCCNTR_EL0" : [rt] "=r" (val));
-# else
+#elif defined(__aarch64__)
+# define VL_RDTSC(val) asm volatile("mrs %[rt],PMCCNTR_EL0" : [rt] "=r" (val));
+#else
 // We just silently ignore unknown OSes, as only leads to missing statistics
-#  define VL_RDTSC(val) (val) = 0;
-# endif
+# define VL_RDTSC(val) (val) = 0;
 #endif
 
 //=========================================================================