diff --git a/modules/juce_audio_plugin_client/detail/juce_LinuxMessageThread.h b/modules/juce_audio_plugin_client/detail/juce_LinuxMessageThread.h
index ed3ff7f3c0..a2aa5d8331 100644
--- a/modules/juce_audio_plugin_client/detail/juce_LinuxMessageThread.h
+++ b/modules/juce_audio_plugin_client/detail/juce_LinuxMessageThread.h
@@ -31,7 +31,6 @@ namespace juce::detail
 // Implemented in juce_Messaging_linux.cpp
 bool dispatchNextMessageOnSystemQueue (bool returnIfNoPendingMessages);
 
-/** @internal */
 class MessageThread : public Thread
 {
 public:
@@ -84,7 +83,6 @@ private:
 };
 
 //==============================================================================
-/** @internal */
 class HostDrivenEventLoop
 {
 public:
diff --git a/modules/juce_core/files/juce_common_MimeTypes.cpp b/modules/juce_core/files/juce_common_MimeTypes.cpp
index fe08f71a8d..1d27117ca8 100644
--- a/modules/juce_core/files/juce_common_MimeTypes.cpp
+++ b/modules/juce_core/files/juce_common_MimeTypes.cpp
@@ -746,6 +746,9 @@ private:
 
 } // namespace
 
+namespace detail
+{
+
 void MimeTypeTable::registerCustomMimeTypeForFileExtension (const String& mimeType, const String& fileExtension)
 {
     Table::get().addEntry ({ fileExtension.toRawUTF8(), mimeType.toRawUTF8() });
@@ -761,4 +764,6 @@ StringArray MimeTypeTable::getFileExtensionsForMimeType (const String& mimeType)
     return Table::get().getExtensionsForType (mimeType);
 }
 
+} // namespace detail
+
 } // namespace juce
diff --git a/modules/juce_core/files/juce_common_MimeTypes.h b/modules/juce_core/files/juce_common_MimeTypes.h
index 4b6437a29b..4c5ea7495a 100644
--- a/modules/juce_core/files/juce_common_MimeTypes.h
+++ b/modules/juce_core/files/juce_common_MimeTypes.h
@@ -25,20 +25,16 @@
 
 #pragma once
 
-namespace juce
+namespace juce::detail
 {
 
-/** @internal */
 struct MimeTypeTable
 {
-/** @internal */
-static void registerCustomMimeTypeForFileExtension (const String& mimeType, const String& fileExtension);
+    static void registerCustomMimeTypeForFileExtension (const String& mimeType, const String& fileExtension);
 
-/** @internal */
-static StringArray getMimeTypesForFileExtension (const String& fileExtension);
+    static StringArray getMimeTypesForFileExtension (const String& fileExtension);
 
-/** @internal */
-static StringArray getFileExtensionsForMimeType (const String& mimeType);
+    static StringArray getFileExtensionsForMimeType (const String& mimeType);
 };
 
-} // namespace juce
+} // namespace juce::detail
diff --git a/modules/juce_core/javascript/juce_JSONSerialisation.h b/modules/juce_core/javascript/juce_JSONSerialisation.h
index 4f6421f021..122bdda6bb 100644
--- a/modules/juce_core/javascript/juce_JSONSerialisation.h
+++ b/modules/juce_core/javascript/juce_JSONSerialisation.h
@@ -508,6 +508,8 @@ struct VariantConverter<String>
     template <>
     struct juce::VariantConverter<MyType> : public juce::StrictVariantConverter<MyType> {};
     @endcode
+
+    @tags{Core}
 */
 template <typename Type>
 struct StrictVariantConverter
diff --git a/modules/juce_core/maths/juce_MathsFunctions.h b/modules/juce_core/maths/juce_MathsFunctions.h
index be3c90c68c..8448066fca 100644
--- a/modules/juce_core/maths/juce_MathsFunctions.h
+++ b/modules/juce_core/maths/juce_MathsFunctions.h
@@ -208,6 +208,8 @@ constexpr bool exactlyEqual (Type a, Type b)
 /** A class encapsulating both relative and absolute tolerances for use in floating-point comparisons.
 
     @see approximatelyEqual, absoluteTolerance, relativeTolerance
+
+    @tags{Core}
 */
 template <typename Type>
 class Tolerance
diff --git a/modules/juce_core/misc/juce_ScopeGuard.h b/modules/juce_core/misc/juce_ScopeGuard.h
index 8fbe3c48e9..9cc9cc56fc 100644
--- a/modules/juce_core/misc/juce_ScopeGuard.h
+++ b/modules/juce_core/misc/juce_ScopeGuard.h
@@ -70,6 +70,8 @@ template <typename Fn> ScopeGuard (Fn) -> ScopeGuard<Fn>;
     - Moving a unique_ptr transfers the responsibility of destroying the managed object
       to another unique_ptr instance; moving an ErasedScopeGuard transfers the
       responsibility of calling the callback to another Guard instance.
+
+    @tags{Core}
 */
 class [[nodiscard]] ErasedScopeGuard
 {
diff --git a/modules/juce_core/native/juce_AndroidDocument_android.cpp b/modules/juce_core/native/juce_AndroidDocument_android.cpp
index 876b3b6fbc..083725d6ac 100644
--- a/modules/juce_core/native/juce_AndroidDocument_android.cpp
+++ b/modules/juce_core/native/juce_AndroidDocument_android.cpp
@@ -621,12 +621,12 @@ struct AndroidDocument::Utils
     public:
         static String getMimeTypeFromExtension (const String& str)
         {
-            return MimeTypeTable::getMimeTypesForFileExtension (str)[0];
+            return detail::MimeTypeTable::getMimeTypesForFileExtension (str)[0];
         }
 
         static String getExtensionFromMimeType (const String& str)
         {
-            return MimeTypeTable::getFileExtensionsForMimeType (str)[0];
+            return detail::MimeTypeTable::getFileExtensionsForMimeType (str)[0];
         }
     };
    #endif
diff --git a/modules/juce_gui_basics/detail/juce_TopLevelWindowManager.h b/modules/juce_gui_basics/detail/juce_TopLevelWindowManager.h
index 797c696e78..faa6bdf781 100644
--- a/modules/juce_gui_basics/detail/juce_TopLevelWindowManager.h
+++ b/modules/juce_gui_basics/detail/juce_TopLevelWindowManager.h
@@ -26,7 +26,7 @@
 namespace juce::detail
 {
 
-/** Keeps track of the active top level window. */
+/* Keeps track of the active top level window. */
 class TopLevelWindowManager  : private Timer,
                                private DeletedAtShutdown
 {
diff --git a/modules/juce_gui_basics/native/juce_ContentSharer_android.cpp b/modules/juce_gui_basics/native/juce_ContentSharer_android.cpp
index 848e2f7c44..03d4cfd147 100644
--- a/modules/juce_gui_basics/native/juce_ContentSharer_android.cpp
+++ b/modules/juce_gui_basics/native/juce_ContentSharer_android.cpp
@@ -482,7 +482,7 @@ private:
         if (extension.isEmpty())
             return nullptr;
 
-        return juceStringArrayToJava (filterMimeTypes (MimeTypeTable::getMimeTypesForFileExtension (extension), juceString (mimeTypeFilter.get())));
+        return juceStringArrayToJava (filterMimeTypes (detail::MimeTypeTable::getMimeTypesForFileExtension (extension), juceString (mimeTypeFilter.get())));
     }
 
     std::unique_ptr<ActivityLauncher> doIntent (const LocalRef<jobject>& intent,
@@ -776,7 +776,7 @@ private:
 
         if (std::none_of (extensions.begin(), extensions.end(), [] (const String& s) { return s.isEmpty(); }))
             for (const auto& extension : extensions)
-                for (const auto& mime : MimeTypeTable::getMimeTypesForFileExtension (extension))
+                for (const auto& mime : detail::MimeTypeTable::getMimeTypesForFileExtension (extension))
                     mimes.insert (mime);
 
         for (const auto& mime : mimes)
diff --git a/modules/juce_gui_basics/native/juce_FileChooser_android.cpp b/modules/juce_gui_basics/native/juce_FileChooser_android.cpp
index 41c9bda40a..4fe3229c49 100644
--- a/modules/juce_gui_basics/native/juce_FileChooser_android.cpp
+++ b/modules/juce_gui_basics/native/juce_FileChooser_android.cpp
@@ -240,7 +240,7 @@ public:
             {
                 auto extension = wildcard.fromLastOccurrenceOf (".", false, false);
 
-                result.addArray (MimeTypeTable::getMimeTypesForFileExtension (extension));
+                result.addArray (detail::MimeTypeTable::getMimeTypesForFileExtension (extension));
             }
         }
 
@@ -280,7 +280,7 @@ bool FileChooser::isPlatformDialogAvailable()
 void FileChooser::registerCustomMimeTypeForFileExtension (const String& mimeType,
                                                           const String& fileExtension)
 {
-    MimeTypeTable::registerCustomMimeTypeForFileExtension (mimeType, fileExtension);
+    detail::MimeTypeTable::registerCustomMimeTypeForFileExtension (mimeType, fileExtension);
 }
 
 } // namespace juce