diff --git a/modules/juce_core/containers/juce_Enumerate.h b/modules/juce_core/containers/juce_Enumerate.h
index 1108e881f0..3709867859 100644
--- a/modules/juce_core/containers/juce_Enumerate.h
+++ b/modules/juce_core/containers/juce_Enumerate.h
@@ -319,6 +319,7 @@ private:
     pair somewhere that requires an iterable range, such as in a ranged-for loop.
 
     @see makeRange()
+    @tags{Core}
 */
 template <typename Begin, typename End>
 class IteratorPair
diff --git a/modules/juce_midi_ci/ci/juce_CIEncoding.h b/modules/juce_midi_ci/ci/juce_CIEncoding.h
index 6341d41557..3cf43386c1 100644
--- a/modules/juce_midi_ci/ci/juce_CIEncoding.h
+++ b/modules/juce_midi_ci/ci/juce_CIEncoding.h
@@ -79,6 +79,8 @@ struct EncodingUtils
 
 } // namespace juce::midi_ci
 
+#ifndef DOXYGEN
+
 namespace juce
 {
     template <>
@@ -102,3 +104,5 @@ namespace juce
     };
 
 } // namespace juce
+
+#endif  // ifndef DOXYGEN
diff --git a/modules/juce_midi_ci/ci/juce_CIPropertyDelegate.h b/modules/juce_midi_ci/ci/juce_CIPropertyDelegate.h
index 53f044b6f8..e90343c45c 100644
--- a/modules/juce_midi_ci/ci/juce_CIPropertyDelegate.h
+++ b/modules/juce_midi_ci/ci/juce_CIPropertyDelegate.h
@@ -43,6 +43,11 @@ enum class PropertySubscriptionCommand
    #undef X
 };
 
+/**
+    Functions to use with PropertySubscriptionCommand.
+
+    @tags{Audio}
+*/
 struct PropertySubscriptionCommandUtils
 {
     PropertySubscriptionCommandUtils() = delete;
@@ -244,6 +249,8 @@ struct PropertyDelegate
 
 } // namespace juce::midi_ci
 
+#ifndef DOXYGEN
+
 namespace juce
 {
 
@@ -268,3 +275,5 @@ struct SerialisationTraits<midi_ci::PropertySubscriptionCommand>
 };
 
 } // namespace juce
+
+#endif  // ifndef DOXYGEN
diff --git a/modules/juce_midi_ci/ci/juce_CIPropertyExchangeCache.h b/modules/juce_midi_ci/ci/juce_CIPropertyExchangeCache.h
index a2c883f3f4..2c077d2fba 100644
--- a/modules/juce_midi_ci/ci/juce_CIPropertyExchangeCache.h
+++ b/modules/juce_midi_ci/ci/juce_CIPropertyExchangeCache.h
@@ -44,7 +44,9 @@ public:
     JUCE_DECLARE_NON_COPYABLE (InitiatorPropertyExchangeCache)
 
     /** Holds a token that can be used to stop waiting for a reply, along with
-        an identifier byte which uniquely identifies an ongoing transaction.
+        an identifier byte that uniquely identifies an ongoing transaction.
+
+        @tags{Audio}
     */
     struct TokenAndId
     {
diff --git a/modules/juce_midi_ci/detail/juce_CIMessageMeta.h b/modules/juce_midi_ci/detail/juce_CIMessageMeta.h
index 5ede3a4066..a55acc967a 100644
--- a/modules/juce_midi_ci/detail/juce_CIMessageMeta.h
+++ b/modules/juce_midi_ci/detail/juce_CIMessageMeta.h
@@ -33,13 +33,11 @@ namespace juce::midi_ci::detail::MessageMeta
 {
 
 //==============================================================================
-/*  The maximum CI version that can be parsed and generated by this implementation. */
+/* The maximum CI version that can be parsed and generated by this implementation. */
 static constexpr std::byte implementationVersion { 0x02 };
 
-/*  @internal
-
-    Wraps a pointer to a Span. Used to indicate to CI readers/writers that a particular field is
-    of variable length, starting with a 16-bit or 32-bit byte count.
+/* Wraps a pointer to a Span. Used to indicate to CI readers/writers that a particular field is
+   of variable length, starting with a 16-bit or 32-bit byte count.
 */
 template <uint8_t NumBytes, typename T, bool isJson = false>
 struct SpanWithSizeBytes
@@ -47,10 +45,7 @@ struct SpanWithSizeBytes
     T& span;
 };
 
-/*  @internal
-
-    Creates a SpanWithSizeBytes with an appropriate template argument.
-*/
+/* Creates a SpanWithSizeBytes with an appropriate template argument. */
 template <uint8_t NumBytes, typename T>
 static constexpr auto makeSpanWithSizeBytes (      Span<T>& span) { return SpanWithSizeBytes<NumBytes,       Span<T>> { span }; }
 
@@ -177,6 +172,8 @@ struct Meta<Message::ProcessEndMidiMessageReport> : Metadata<0x44> {};
 
 } // namespace juce::midi_ci::detail::MessageMeta
 
+#ifndef DOXYGEN
+
 namespace juce
 {
 
@@ -622,3 +619,5 @@ struct SerialisationTraits<ci::Message::ProcessEndMidiMessageReport> : VersionBa
 };
 
 } // namespace juce
+
+#endif  // ifndef DOXYGEN