diff --git a/src/AH/Hardware/ExtendedInputOutput/ExtendedIOElement.hpp b/src/AH/Hardware/ExtendedInputOutput/ExtendedIOElement.hpp
index 4671338d37..6fd3164117 100644
--- a/src/AH/Hardware/ExtendedInputOutput/ExtendedIOElement.hpp
+++ b/src/AH/Hardware/ExtendedInputOutput/ExtendedIOElement.hpp
@@ -16,7 +16,7 @@ BEGIN_AH_NAMESPACE
  * ExtendedIOElement serves as a base class for all these expanders.
  *
  * The pins of each extended IO element are mapped to a pin number greater than
- * the greatest Arduino pin number, represented by the @ref pin_t type.  
+ * the greatest Arduino pin number, represented by the @ref ExtIO::pin_t type.  
  * You can supply this pin number to the IO functions in the @ref ExtIO
  * namespace.  
  * If the pin number corresponds to an actual Arduino pin, the default Arduino
@@ -52,8 +52,8 @@ BEGIN_AH_NAMESPACE
  * microcontrollers.  
  * Another reason to do it this way, is that this approach is still fast enough
  * to make sure it is not noticeable to human users.  
- * If you need faster extended GPIO access, you can use the @ref CachedExtIOPin
- * class.
+ * If you need faster extended GPIO access, you can use the
+ * @ref ExtIO::CachedExtIOPin class.
  */
 class ExtendedIOElement : public UpdatableCRTP<ExtendedIOElement> {
   protected:
diff --git a/src/AH/Hardware/FilteredAnalog.hpp b/src/AH/Hardware/FilteredAnalog.hpp
index 7df906bb79..789bd11872 100755
--- a/src/AH/Hardware/FilteredAnalog.hpp
+++ b/src/AH/Hardware/FilteredAnalog.hpp
@@ -51,7 +51,7 @@ class GenericFilteredAnalog {
           filter(increaseBitDepth<ADC_BITS + IncRes, Precision, AnalogType,
                                   AnalogType>(initial)) {}
 
-    /// @copydoc GenericFilteredAnalog(pin_t,MappingFunction,AnalogType)
+    /// @copydoc GenericFilteredAnalog::GenericFilteredAnalog(pin_t,MappingFunction,AnalogType)
     GenericFilteredAnalog(ArduinoPin_t analogPin, MappingFunction mapFn,
                           AnalogType initial = 0)
         : GenericFilteredAnalog(pin_t(analogPin),
diff --git a/src/AH/Hardware/Hardware-Types.hpp b/src/AH/Hardware/Hardware-Types.hpp
index 0f6d2b320d..db3af809e5 100644
--- a/src/AH/Hardware/Hardware-Types.hpp
+++ b/src/AH/Hardware/Hardware-Types.hpp
@@ -15,7 +15,7 @@ using analog_t = uint16_t;
 /// Integer type used internally to store the index of (extended) GPIO pins.
 /// This type is also used to represent _offsets_ of pin
 /// numbers (e.g. the index of a pin within an extended IO element).
-/// In contrast, @ref pin_t represents an _absolute_ pin number.
+/// In contrast, @ref ExtIO::pin_t represents an _absolute_ pin number.
 using pin_int_t = uint_fast16_t;
 constexpr pin_int_t NO_PIN_INT =
     (std::numeric_limits<pin_int_t>::max() >> 1) + 1;