diff --git a/Source/Engine/Core/Collections/Array.h b/Source/Engine/Core/Collections/Array.h
index 4aaeb542e..730b815db 100644
--- a/Source/Engine/Core/Collections/Array.h
+++ b/Source/Engine/Core/Collections/Array.h
@@ -10,6 +10,8 @@
 /// <summary>
 /// Template for dynamic array with variable capacity.
 /// </summary>
+/// <typeparam name="T">The type of elements in the array.</typeparam>
+/// <typeparam name="AllocationType">The type of memory allocator.</typeparam>
 template<typename T, typename AllocationType = HeapAllocation>
 API_CLASS(InBuild) class Array
 {
diff --git a/Source/Engine/Core/Collections/Dictionary.h b/Source/Engine/Core/Collections/Dictionary.h
index a1361dc59..c354aec01 100644
--- a/Source/Engine/Core/Collections/Dictionary.h
+++ b/Source/Engine/Core/Collections/Dictionary.h
@@ -10,6 +10,9 @@
 /// <summary>
 /// Template for unordered dictionary with mapped key with value pairs.
 /// </summary>
+/// <typeparam name="KeyType">The type of the keys in the dictionary.</typeparam>
+/// <typeparam name="ValueType">The type of the values in the dictionary.</typeparam>
+/// <typeparam name="AllocationType">The type of memory allocator.</typeparam>
 template<typename KeyType, typename ValueType, typename AllocationType = HeapAllocation>
 API_CLASS(InBuild) class Dictionary
 {
diff --git a/Source/Engine/Core/Collections/HashSet.h b/Source/Engine/Core/Collections/HashSet.h
index 920bed432..e70f149f6 100644
--- a/Source/Engine/Core/Collections/HashSet.h
+++ b/Source/Engine/Core/Collections/HashSet.h
@@ -11,6 +11,7 @@
 /// <summary>
 /// Template for unordered set of values (without duplicates with O(1) lookup access).
 /// </summary>
+/// <typeparam name="T">The type of elements in the set.</typeparam>
 template<typename T>
 API_CLASS(InBuild) class HashSet
 {
diff --git a/Source/Engine/Core/Collections/SamplesBuffer.h b/Source/Engine/Core/Collections/SamplesBuffer.h
index b6058701e..a7b91535b 100644
--- a/Source/Engine/Core/Collections/SamplesBuffer.h
+++ b/Source/Engine/Core/Collections/SamplesBuffer.h
@@ -5,9 +5,9 @@
 #include "../Types/BaseTypes.h"
 #include "Engine/Platform/Platform.h"
 
-/// <summanry>
+/// <summary>
 /// Small buffer for samples used to calculate min/max/avg values.
-/// </summanry>
+/// </summary>
 template<typename T, int32 Size>
 class SamplesBuffer
 {
diff --git a/Source/Engine/Core/Object.h b/Source/Engine/Core/Object.h
index d48e151b7..ad9a37a51 100644
--- a/Source/Engine/Core/Object.h
+++ b/Source/Engine/Core/Object.h
@@ -51,6 +51,7 @@ public:
 /// <summary>
 /// Interface for removable Engine objects.
 /// </summary>
+/// <seealso cref="Object" />
 class FLAXENGINE_API RemovableObject : public Object
 {
 public:
diff --git a/Source/Engine/Core/Templates.h b/Source/Engine/Core/Templates.h
index 57407d860..69dfc17da 100644
--- a/Source/Engine/Core/Templates.h
+++ b/Source/Engine/Core/Templates.h
@@ -4,6 +4,8 @@
 
 #include "Engine/Core/Types/BaseTypes.h"
 
+#ifndef DOXYGEN
+
 // @formatter:off
 
 ////////////////////////////////////////////////////////////////////////////////////
@@ -435,3 +437,5 @@ template<> struct TIsBitwiseConstructible<uint64, int64> { enum { Value = true }
 template<> struct TIsBitwiseConstructible<int64, uint64> { enum { Value = true }; };
 
 // @formatter:on
+
+#endif
diff --git a/Source/Engine/Graphics/RenderBuffers.h b/Source/Engine/Graphics/RenderBuffers.h
index 6815d8d0c..fd4bce1b1 100644
--- a/Source/Engine/Graphics/RenderBuffers.h
+++ b/Source/Engine/Graphics/RenderBuffers.h
@@ -60,12 +60,10 @@ public:
     GPUTexture* LocalShadowedLightScattering = nullptr;
     uint64 LastFrameVolumetricFog = 0;
 
-    struct VolumetricFogData
+    struct
     {
         float MaxDistance;
-    };
-
-    VolumetricFogData VolumetricFogData;
+    } VolumetricFogData;
 
     // Helper buffer with half-resolution depth buffer shared by effects (eg. SSR, Motion Blur). Valid only during frame rendering and on request (see RequestHalfResDepth).
     // Should be released if not used for a few frames.
diff --git a/Source/Engine/Platform/Android/AndroidFile.h b/Source/Engine/Platform/Android/AndroidFile.h
index 9956f7c9d..d561368b6 100644
--- a/Source/Engine/Platform/Android/AndroidFile.h
+++ b/Source/Engine/Platform/Android/AndroidFile.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#if PLATFORM_UNIX
+#if PLATFORM_ANDROID
 
 #include "Engine/Platform/Unix/UnixFile.h"
 
diff --git a/Source/Engine/Platform/Linux/IncludeX11.h b/Source/Engine/Platform/Linux/IncludeX11.h
index df1dcdc86..ab09a6160 100644
--- a/Source/Engine/Platform/Linux/IncludeX11.h
+++ b/Source/Engine/Platform/Linux/IncludeX11.h
@@ -2,6 +2,8 @@
 
 #pragma once
 
+#if PLATFORM_LINUX
+
 // Hide warning from old headers
 #define register
 
@@ -38,3 +40,5 @@ namespace X11
 #undef Status
 #undef True
 #undef False
+
+#endif
diff --git a/Source/Engine/Platform/Windows/ComPtr.h b/Source/Engine/Platform/Windows/ComPtr.h
index 23d745a27..6c8683577 100644
--- a/Source/Engine/Platform/Windows/ComPtr.h
+++ b/Source/Engine/Platform/Windows/ComPtr.h
@@ -2,6 +2,8 @@
 
 #pragma once
 
+#if PLATFORM_WINDOWS
+
 #include "Engine/Core/Templates.h"
 #include "../Win32/IncludeWindowsHeaders.h"
 
@@ -332,3 +334,5 @@ bool operator<(const ComPtr<T>& a, const ComPtr<U>& b)
     static_assert(__is_base_of(T, U) || __is_base_of(U, T), "'T' and 'U' pointers must be comparable");
     return a.Get() < b.Get();
 }
+
+#endif