diff --git a/modules/juce_audio_basics/midi/ump/juce_UMPReceiver.h b/modules/juce_audio_basics/midi/ump/juce_UMPReceiver.h
index 469efd3a3c..f41406fdd5 100644
--- a/modules/juce_audio_basics/midi/ump/juce_UMPReceiver.h
+++ b/modules/juce_audio_basics/midi/ump/juce_UMPReceiver.h
@@ -27,6 +27,8 @@ namespace universal_midi_packets
 
 /**
     A base class for classes which receive Universal MIDI Packets from an input.
+
+    @tags{Audio}
 */
 struct Receiver
 {
diff --git a/modules/juce_audio_basics/midi/ump/juce_UMPacket.h b/modules/juce_audio_basics/midi/ump/juce_UMPacket.h
index b58304d5e9..695c796251 100644
--- a/modules/juce_audio_basics/midi/ump/juce_UMPacket.h
+++ b/modules/juce_audio_basics/midi/ump/juce_UMPacket.h
@@ -27,6 +27,8 @@ namespace universal_midi_packets
 
 /**
     Holds a single Universal MIDI Packet.
+
+    @tags{Audio}
 */
 template <size_t numWords>
 class Packet
diff --git a/modules/juce_audio_devices/midi_io/ump/juce_UMPBytestreamInputHandler.h b/modules/juce_audio_devices/midi_io/ump/juce_UMPBytestreamInputHandler.h
index 49ce664272..5c420dcc31 100644
--- a/modules/juce_audio_devices/midi_io/ump/juce_UMPBytestreamInputHandler.h
+++ b/modules/juce_audio_devices/midi_io/ump/juce_UMPBytestreamInputHandler.h
@@ -27,6 +27,8 @@ namespace universal_midi_packets
 
 /**
     A base class for classes which convert bytestream midi to other formats.
+
+    @tags{Audio}
 */
 struct BytestreamInputHandler
 {
@@ -39,6 +41,8 @@ struct BytestreamInputHandler
 /**
     Parses a continuous bytestream and emits complete MidiMessages whenever a full
     message is received.
+
+    @tags{Audio}
 */
 struct BytestreamToBytestreamHandler : public BytestreamInputHandler
 {
@@ -86,6 +90,8 @@ struct BytestreamToBytestreamHandler : public BytestreamInputHandler
 /**
     Parses a continuous MIDI 1.0 bytestream, and emits full messages in the requested
     UMP format.
+
+    @tags{Audio}
 */
 struct BytestreamToUMPHandler : public BytestreamInputHandler
 {
diff --git a/modules/juce_audio_devices/midi_io/ump/juce_UMPU32InputHandler.h b/modules/juce_audio_devices/midi_io/ump/juce_UMPU32InputHandler.h
index b5471aa80e..3a4161e347 100644
--- a/modules/juce_audio_devices/midi_io/ump/juce_UMPU32InputHandler.h
+++ b/modules/juce_audio_devices/midi_io/ump/juce_UMPU32InputHandler.h
@@ -28,6 +28,8 @@ namespace universal_midi_packets
 /**
     A base class for classes which convert Universal MIDI Packets to other
     formats.
+
+    @tags{Audio}
 */
 struct U32InputHandler
 {
@@ -40,6 +42,8 @@ struct U32InputHandler
 /**
     Parses a continuous stream of U32 words and emits complete MidiMessages whenever a full
     message is received.
+
+    @tags{Audio}
 */
 struct U32ToBytestreamHandler : public U32InputHandler
 {
@@ -90,6 +94,8 @@ struct U32ToBytestreamHandler : public U32InputHandler
 /**
     Parses a continuous stream of U32 words and emits full messages in the requested
     UMP format.
+
+    @tags{Audio}
 */
 struct U32ToUMPHandler : public U32InputHandler
 {
diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessorEditorHostContext.h b/modules/juce_audio_processors/processors/juce_AudioProcessorEditorHostContext.h
index 66d597a3f0..1c4afdf7d7 100644
--- a/modules/juce_audio_processors/processors/juce_AudioProcessorEditorHostContext.h
+++ b/modules/juce_audio_processors/processors/juce_AudioProcessorEditorHostContext.h
@@ -31,6 +31,8 @@ namespace juce
     You can choose to create a standard PopupMenu to display the host-provided
     options. Alternatively, you can ask the host to display a native menu at
     a specific location.
+
+    @tags{Audio}
 */
 struct HostProvidedContextMenu
 {
@@ -54,6 +56,8 @@ struct HostProvidedContextMenu
 
     At the moment, this can be used to retrieve context menus for parameters in
     compatible VST3 hosts. Additional extensions may be added here in the future.
+
+    @tags{Audio}
 */
 struct AudioProcessorEditorHostContext
 {
diff --git a/modules/juce_audio_processors/utilities/juce_ExtensionsVisitor.h b/modules/juce_audio_processors/utilities/juce_ExtensionsVisitor.h
index 8b2af7f96d..ac9c47b47c 100644
--- a/modules/juce_audio_processors/utilities/juce_ExtensionsVisitor.h
+++ b/modules/juce_audio_processors/utilities/juce_ExtensionsVisitor.h
@@ -38,6 +38,8 @@ namespace juce
     of the function calls that you care about. For example, you should
     store the result of VST::getAEffectPtr() rather than storing a pointer
     to the VST instance.
+
+    @tags{Audio}
 */
 struct ExtensionsVisitor
 {
diff --git a/modules/juce_gui_basics/windows/juce_MessageBoxOptions.h b/modules/juce_gui_basics/windows/juce_MessageBoxOptions.h
index 227e43bd31..19571e993e 100644
--- a/modules/juce_gui_basics/windows/juce_MessageBoxOptions.h
+++ b/modules/juce_gui_basics/windows/juce_MessageBoxOptions.h
@@ -56,6 +56,8 @@ enum class MessageBoxIconType
                               .withAssociatedComponent (myComp),
                             myCallback);
     @endcode
+
+    @tags{GUI}
 */
 class JUCE_API  MessageBoxOptions
 {