Code quality: Fix header guards consistency

Adds `header_guards.sh` bash script, used in CI to validate future changes. Can be run locally to fix invalid header guards.
2022-07-23 23:41:51 +02:00
parent 3084a48ace
commit 90019676b0
491 changed files with 1009 additions and 863 deletions
@@ -85,4 +85,4 @@ public:
 	~AudioDriverDummy() {}
 };

-#endif
+#endif // AUDIO_DRIVER_DUMMY_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef AUDIOEFFECT_H
-#define AUDIOEFFECT_H
+#ifndef AUDIO_EFFECT_H
+#define AUDIO_EFFECT_H

 #include "core/io/resource.h"
 #include "core/math/audio_frame.h"
@@ -62,4 +62,4 @@ public:
 	AudioEffect();
 };

-#endif // AUDIOEFFECT_H
+#endif // AUDIO_EFFECT_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef AUDIOEFFECTAMPLIFY_H
-#define AUDIOEFFECTAMPLIFY_H
+#ifndef AUDIO_EFFECT_AMPLIFY_H
+#define AUDIO_EFFECT_AMPLIFY_H

 #include "servers/audio/audio_effect.h"

@@ -63,4 +63,4 @@ public:
 	AudioEffectAmplify();
 };

-#endif // AUDIOEFFECTAMPLIFY_H
+#endif // AUDIO_EFFECT_AMPLIFY_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef AUDIOEFFECTCHORUS_H
-#define AUDIOEFFECTCHORUS_H
+#ifndef AUDIO_EFFECT_CHORUS_H
+#define AUDIO_EFFECT_CHORUS_H

 #include "servers/audio/audio_effect.h"

@@ -133,4 +133,4 @@ public:
 	AudioEffectChorus();
 };

-#endif // AUDIOEFFECTCHORUS_H
+#endif // AUDIO_EFFECT_CHORUS_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef AUDIOEFFECTCOMPRESSOR_H
-#define AUDIOEFFECTCOMPRESSOR_H
+#ifndef AUDIO_EFFECT_COMPRESSOR_H
+#define AUDIO_EFFECT_COMPRESSOR_H

 #include "servers/audio/audio_effect.h"

@@ -91,4 +91,4 @@ public:
 	AudioEffectCompressor();
 };

-#endif // AUDIOEFFECTCOMPRESSOR_H
+#endif // AUDIO_EFFECT_COMPRESSOR_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef AUDIOEFFECTDELAY_H
-#define AUDIOEFFECTDELAY_H
+#ifndef AUDIO_EFFECT_DELAY_H
+#define AUDIO_EFFECT_DELAY_H

 #include "servers/audio/audio_effect.h"

@@ -131,4 +131,4 @@ public:
 	AudioEffectDelay();
 };

-#endif // AUDIOEFFECTDELAY_H
+#endif // AUDIO_EFFECT_DELAY_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef AUDIOEFFECTDISTORTION_H
-#define AUDIOEFFECTDISTORTION_H
+#ifndef AUDIO_EFFECT_DISTORTION_H
+#define AUDIO_EFFECT_DISTORTION_H

 #include "servers/audio/audio_effect.h"

@@ -90,4 +90,4 @@ public:

 VARIANT_ENUM_CAST(AudioEffectDistortion::Mode)

-#endif // AUDIOEFFECTDISTORTION_H
+#endif // AUDIO_EFFECT_DISTORTION_H
@@ -29,6 +29,7 @@
 /*************************************************************************/

 #include "audio_effect_eq.h"
+
 #include "servers/audio_server.h"

 void AudioEffectEQInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
@@ -28,11 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef AUDIOEFFECTEQ_H
-#define AUDIOEFFECTEQ_H
+#ifndef AUDIO_EFFECT_EQ_H
+#define AUDIO_EFFECT_EQ_H

 #include "servers/audio/audio_effect.h"
-#include "servers/audio/effects/eq.h"
+#include "servers/audio/effects/eq_filter.h"

 class AudioEffectEQ;

@@ -98,4 +98,4 @@ public:
 			AudioEffectEQ(EQ::PRESET_21_BANDS) {}
 };

-#endif // AUDIOEFFECTEQ_H
+#endif // AUDIO_EFFECT_EQ_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef AUDIOEFFECTFILTER_H
-#define AUDIOEFFECTFILTER_H
+#ifndef AUDIO_EFFECT_FILTER_H
+#define AUDIO_EFFECT_FILTER_H

 #include "servers/audio/audio_effect.h"
 #include "servers/audio/audio_filter_sw.h"
@@ -167,4 +167,4 @@ public:
 			AudioEffectFilter(AudioFilterSW::HIGHSHELF) {}
 };

-#endif // AUDIOEFFECTFILTER_H
+#endif // AUDIO_EFFECT_FILTER_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef AUDIOEFFECTPANNER_H
-#define AUDIOEFFECTPANNER_H
+#ifndef AUDIO_EFFECT_PANNER_H
+#define AUDIO_EFFECT_PANNER_H

 #include "servers/audio/audio_effect.h"

@@ -61,4 +61,4 @@ public:
 	AudioEffectPanner();
 };

-#endif // AUDIOEFFECTPANNER_H
+#endif // AUDIO_EFFECT_PANNER_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef AUDIOEFFECTRECORD_H
-#define AUDIOEFFECTRECORD_H
+#ifndef AUDIO_EFFECT_RECORD_H
+#define AUDIO_EFFECT_RECORD_H

 #include "core/io/file_access.h"
 #include "core/io/marshalls.h"
@@ -103,4 +103,4 @@ public:
 	AudioEffectRecord();
 };

-#endif // AUDIOEFFECTRECORD_H
+#endif // AUDIO_EFFECT_RECORD_H
@@ -28,11 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef AUDIOEFFECTREVERB_H
-#define AUDIOEFFECTREVERB_H
+#ifndef AUDIO_EFFECT_REVERB_H
+#define AUDIO_EFFECT_REVERB_H

 #include "servers/audio/audio_effect.h"
-#include "servers/audio/effects/reverb.h"
+#include "servers/audio/effects/reverb_filter.h"

 class AudioEffectReverb;

@@ -94,4 +94,4 @@ public:
 	AudioEffectReverb();
 };

-#endif // AUDIOEFFECTREVERB_H
+#endif // AUDIO_EFFECT_REVERB_H
@@ -95,4 +95,5 @@ public:

 	AudioStreamGeneratorPlayback();
 };
+
 #endif // AUDIO_STREAM_GENERATOR_H
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  eq.cpp                                                               */
+/*  eq_filter.cpp                                                        */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,11 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-// Author: reduzio@gmail.com (C) 2006
+#include "eq_filter.h"

-#include "eq.h"
 #include "core/error/error_macros.h"
 #include "core/math/math_funcs.h"
+
 #include <math.h>

 #define POW2(v) ((v) * (v))
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  eq.h                                                                 */
+/*  eq_filter.h                                                          */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  reverb.cpp                                                           */
+/*  reverb_filter.cpp                                                    */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#include "reverb.h"
+#include "reverb_filter.h"

 #include "core/math/math_funcs.h"

@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  reverb.h                                                             */
+/*  reverb_filter.h                                                      */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef REVERB_H
-#define REVERB_H
+#ifndef REVERB_FILTER_H
+#define REVERB_FILTER_H

 #include "core/math/audio_frame.h"
 #include "core/os/memory.h"
@@ -119,4 +119,4 @@ public:
 	~Reverb();
 };

-#endif // REVERB_H
+#endif // REVERB_FILTER_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef SERVER_DEBUGGER_H
-#define SERVER_DEBUGGER_H
+#ifndef SERVERS_DEBUGGER_H
+#define SERVERS_DEBUGGER_H

 #include "core/debugger/debugger_marshalls.h"

@@ -545,4 +545,4 @@ public:
 	~PhysicsServer3DExtension();
 };

-#endif // PHYSICSSERVER3DEXTENSION_H
+#endif // PHYSICS_SERVER_3D_EXTENSION_H
@@ -37,4 +37,4 @@
 bool gjk_epa_calculate_penetration(const GodotShape3D *p_shape_A, const Transform3D &p_transform_A, const GodotShape3D *p_shape_B, const Transform3D &p_transform_B, GodotCollisionSolver3D::CallbackResult p_result_callback, void *p_userdata, bool p_swap = false, real_t p_margin_A = 0.0, real_t p_margin_B = 0.0);
 bool gjk_epa_calculate_distance(const GodotShape3D *p_shape_A, const Transform3D &p_transform_A, const GodotShape3D *p_shape_B, const Transform3D &p_transform_B, Vector3 &r_result_A, Vector3 &r_result_B);

-#endif
+#endif // GJK_EPA_H
@@ -28,11 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef GODOT_COLLISION_SOLVER_SAT_H
-#define GODOT_COLLISION_SOLVER_SAT_H
+#ifndef GODOT_COLLISION_SOLVER_3D_SAT_H
+#define GODOT_COLLISION_SOLVER_3D_SAT_H

 #include "godot_collision_solver_3d.h"

 bool sat_calculate_penetration(const GodotShape3D *p_shape_A, const Transform3D &p_transform_A, const GodotShape3D *p_shape_B, const Transform3D &p_transform_B, GodotCollisionSolver3D::CallbackResult p_result_callback, void *p_userdata, bool p_swap = false, Vector3 *r_prev_axis = nullptr, real_t p_margin_a = 0, real_t p_margin_b = 0);

-#endif // GODOT_COLLISION_SOLVER_SAT_H
+#endif // GODOT_COLLISION_SOLVER_3D_SAT_H
@@ -52,4 +52,4 @@ public:

 } // namespace RendererDummy

-#endif // !FOG_DUMMY_H
+#endif // FOG_DUMMY_H
@@ -79,4 +79,4 @@ public:

 } // namespace RendererDummy

-#endif // !GI_DUMMY_H
+#endif // GI_DUMMY_H
@@ -60,4 +60,4 @@ public:
 	~RasterizerCanvasDummy() {}
 };

-#endif // !RASTERIZER_CANVAS_DUMMY_H
+#endif // RASTERIZER_CANVAS_DUMMY_H
@@ -214,4 +214,4 @@ public:
 	~RasterizerSceneDummy() {}
 };

-#endif // !RASTERIZER_SCENE_DUMMY_H
+#endif // RASTERIZER_SCENE_DUMMY_H
@@ -132,4 +132,4 @@ public:

 } // namespace RendererDummy

-#endif // !LIGHT_STORAGE_DUMMY_H
+#endif // LIGHT_STORAGE_DUMMY_H
@@ -95,4 +95,4 @@ public:

 } // namespace RendererDummy

-#endif // !MATERIAL_STORAGE_DUMMY_H
+#endif // MATERIAL_STORAGE_DUMMY_H
@@ -131,4 +131,4 @@ public:

 } // namespace RendererDummy

-#endif // !MESH_STORAGE_DUMMY_H
+#endif // MESH_STORAGE_DUMMY_H
@@ -123,4 +123,4 @@ public:

 } // namespace RendererDummy

-#endif // !PARTICLES_STORAGE_DUMMY_H
+#endif // PARTICLES_STORAGE_DUMMY_H
@@ -176,4 +176,4 @@ public:

 } // namespace RendererDummy

-#endif // !TEXTURE_STORAGE_DUMMY_H
+#endif // TEXTURE_STORAGE_DUMMY_H
@@ -95,4 +95,4 @@ public:

 } // namespace RendererDummy

-#endif // !UTILITIES_DUMMY_H
+#endif // UTILITIES_DUMMY_H
@@ -50,4 +50,4 @@ public:
 	virtual RS::FogVolumeShape fog_volume_get_shape(RID p_fog_volume) const = 0;
 };

-#endif // !RENDERER_FOG_H
+#endif // RENDERER_FOG_H
@@ -78,4 +78,4 @@ public:
 	virtual uint32_t voxel_gi_get_version(RID p_probe) const = 0;
 };

-#endif // !RENDERER_GI_H
+#endif // RENDERER_GI_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef RENDERING_SERVER_CANVAS_CULL_H
-#define RENDERING_SERVER_CANVAS_CULL_H
+#ifndef RENDERER_CANVAS_CULL_H
+#define RENDERER_CANVAS_CULL_H

 #include "core/templates/paged_allocator.h"
 #include "renderer_compositor.h"
@@ -317,4 +317,4 @@ public:
 	~RendererCanvasCull();
 };

-#endif // RENDERING_SERVER_CANVAS_CULL_H
+#endif // RENDERER_CANVAS_CULL_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef RENDERINGSERVERCANVASRENDER_H
-#define RENDERINGSERVERCANVASRENDER_H
+#ifndef RENDERER_CANVAS_RENDER_H
+#define RENDERER_CANVAS_RENDER_H

 #include "servers/rendering_server.h"

@@ -520,4 +520,4 @@ public:
 	virtual ~RendererCanvasRender() {}
 };

-#endif // RENDERINGSERVERCANVASRENDER_H
+#endif // RENDERER_CANVAS_RENDER_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef RENDERING_SERVER_COMPOSITOR_H
-#define RENDERING_SERVER_COMPOSITOR_H
+#ifndef RENDERER_COMPOSITOR_H
+#define RENDERER_COMPOSITOR_H

 #include "servers/rendering/environment/renderer_fog.h"
 #include "servers/rendering/environment/renderer_gi.h"
@@ -109,4 +109,4 @@ public:
 	virtual ~RendererCompositor() {}
 };

-#endif // RASTERIZER_H
+#endif // RENDERER_COMPOSITOR_H
@@ -375,4 +375,4 @@ public:
 	~ClusterBuilderRD();
 };

-#endif // CLUSTER_BUILDER_H
+#endif // CLUSTER_BUILDER_RD_H
@@ -117,4 +117,4 @@ public:

 } // namespace RendererRD

-#endif // !BOKEH_DOF_RD_H
+#endif // BOKEH_DOF_RD_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef COPY_RD_H
-#define COPY_RD_H
+#ifndef COPY_EFFECTS_RD_H
+#define COPY_EFFECTS_RD_H

 #include "servers/rendering/renderer_rd/pipeline_cache_rd.h"
 #include "servers/rendering/renderer_rd/shaders/effects/blur_raster.glsl.gen.h"
@@ -343,4 +343,4 @@ public:

 } // namespace RendererRD

-#endif // !COPY_RD_H
+#endif // COPY_EFFECTS_RD_H
@@ -71,4 +71,4 @@ public:

 } // namespace RendererRD

-#endif // !RESOLVE_RD_H
+#endif // RESOLVE_RD_H
@@ -505,4 +505,4 @@ private:

 } // namespace RendererRD

-#endif // !SS_EFFECTS_RD_H
+#endif // SS_EFFECTS_RD_H
@@ -149,4 +149,4 @@ public:

 } // namespace RendererRD

-#endif // !TONE_MAPPER_RD_H
+#endif // TONE_MAPPER_RD_H
@@ -72,4 +72,4 @@ public:

 } // namespace RendererRD

-#endif // !VRS_RD_H
+#endif // VRS_RD_H
@@ -246,4 +246,4 @@ public:
 	~EffectsRD();
 };

-#endif // !RASTERIZER_EFFECTS_RD_H
+#endif // EFFECTS_RD_H
@@ -80,4 +80,4 @@ public:

 } // namespace RendererRD

-#endif // !FOG_RD_H
+#endif // FOG_RD_H
@@ -786,4 +786,4 @@ public:

 } // namespace RendererRD

-#endif /* !GI_RD_H */
+#endif // GI_RD_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef RENDERING_SERVER_SCENE_RENDER_FORWARD_CLUSTERED_H
-#define RENDERING_SERVER_SCENE_RENDER_FORWARD_CLUSTERED_H
+#ifndef RENDER_FORWARD_CLUSTERED_H
+#define RENDER_FORWARD_CLUSTERED_H

 #include "core/templates/paged_allocator.h"
 #include "servers/rendering/renderer_rd/effects/resolve.h"
@@ -693,4 +693,5 @@ public:
 	~RenderForwardClustered();
 };
 } // namespace RendererSceneRenderImplementation
-#endif // !RENDERING_SERVER_SCENE_RENDER_FORWARD_CLUSTERED_H
+
+#endif // RENDER_FORWARD_CLUSTERED_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef RSSR_SCENE_SHADER_FC_H
-#define RSSR_SCENE_SHADER_FC_H
+#ifndef SCENE_SHADER_FORWARD_CLUSTERED_H
+#define SCENE_SHADER_FORWARD_CLUSTERED_H

 #include "servers/rendering/renderer_rd/renderer_scene_render_rd.h"
 #include "servers/rendering/renderer_rd/shaders/scene_forward_clustered.glsl.gen.h"
@@ -252,4 +252,5 @@ public:
 };

 } // namespace RendererSceneRenderImplementation
-#endif // !RSSR_SCENE_SHADER_FM_H
+
+#endif // SCENE_SHADER_FORWARD_CLUSTERED_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef RENDERING_SERVER_SCENE_RENDER_FORWARD_MOBILE_H
-#define RENDERING_SERVER_SCENE_RENDER_FORWARD_MOBILE_H
+#ifndef RENDER_FORWARD_MOBILE_H
+#define RENDER_FORWARD_MOBILE_H

 #include "core/templates/paged_allocator.h"
 #include "servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.h"
@@ -674,4 +674,5 @@ public:
 	~RenderForwardMobile();
 };
 } // namespace RendererSceneRenderImplementation
-#endif // !RENDERING_SERVER_SCENE_RENDER_FORWARD_MOBILE_H
+
+#endif // RENDER_FORWARD_MOBILE_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef RSSR_SCENE_SHADER_FM_H
-#define RSSR_SCENE_SHADER_FM_H
+#ifndef SCENE_SHADER_FORWARD_MOBILE_H
+#define SCENE_SHADER_FORWARD_MOBILE_H

 #include "servers/rendering/renderer_rd/renderer_scene_render_rd.h"
 #include "servers/rendering/renderer_rd/shaders/scene_forward_mobile.glsl.gen.h"
@@ -212,4 +212,5 @@ public:
 };

 } // namespace RendererSceneRenderImplementation
-#endif // !RSSR_SCENE_SHADER_FM_H
+
+#endif // SCENE_SHADER_FORWARD_MOBILE_H
@@ -97,4 +97,4 @@ public:
 	~PipelineCacheRD();
 };

-#endif // RENDER_PIPELINE_CACHE_RD_H
+#endif // PIPELINE_CACHE_RD_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef RENDERING_SERVER_CANVAS_RENDER_RD_H
-#define RENDERING_SERVER_CANVAS_RENDER_RD_H
+#ifndef RENDERER_CANVAS_RENDER_RD_H
+#define RENDERER_CANVAS_RENDER_RD_H

 #include "servers/rendering/renderer_canvas_render.h"
 #include "servers/rendering/renderer_compositor.h"
@@ -465,4 +465,4 @@ public:
 	~RendererCanvasRenderRD();
 };

-#endif // RASTERIZER_CANVAS_RD_H
+#endif // RENDERER_CANVAS_RENDER_RD_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef RENDERING_SERVER_COMPOSITOR_RD_H
-#define RENDERING_SERVER_COMPOSITOR_RD_H
+#ifndef RENDERER_COMPOSITOR_RD_H
+#define RENDERER_COMPOSITOR_RD_H

 #include "core/os/os.h"
 #include "core/templates/thread_work_pool.h"
@@ -148,4 +148,5 @@ public:
 	RendererCompositorRD();
 	~RendererCompositorRD();
 };
-#endif // RASTERIZER_RD_H
+
+#endif // RENDERER_COMPOSITOR_RD_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef RENDERING_SERVER_SCENE_ENVIRONMENT_RD_H
-#define RENDERING_SERVER_SCENE_ENVIRONMENT_RD_H
+#ifndef RENDERER_SCENE_ENVIRONMENT_RD_H
+#define RENDERER_SCENE_ENVIRONMENT_RD_H

 #include "servers/rendering/renderer_scene_render.h"
 #include "servers/rendering/rendering_device.h"
@@ -164,4 +164,4 @@ public:
 	void set_ssao(bool p_enable, float p_radius, float p_intensity, float p_power, float p_detail, float p_horizon, float p_sharpness, float p_light_affect, float p_ao_channel_affect);
 };

-#endif /* !RENDERING_SERVER_SCENE_ENVIRONMENT_RD_H */
+#endif // RENDERER_SCENE_ENVIRONMENT_RD_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef RENDERING_SERVER_SCENE_RENDER_RD_H
-#define RENDERING_SERVER_SCENE_RENDER_RD_H
+#ifndef RENDERER_SCENE_RENDER_RD_H
+#define RENDERER_SCENE_RENDER_RD_H

 #include "core/templates/local_vector.h"
 #include "core/templates/rid_owner.h"
@@ -1489,4 +1489,4 @@ public:
 	~RendererSceneRenderRD();
 };

-#endif // RASTERIZER_SCENE_RD_H
+#endif // RENDERER_SCENE_RENDER_RD_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef RENDERING_SERVER_SCENE_SKY_RD_H
-#define RENDERING_SERVER_SCENE_SKY_RD_H
+#ifndef RENDERER_SCENE_SKY_RD_H
+#define RENDERER_SCENE_SKY_RD_H

 #include "core/templates/rid_owner.h"
 #include "servers/rendering/renderer_compositor.h"
@@ -318,4 +318,4 @@ public:
 	RID sky_get_radiance_texture_rd(RID p_sky) const;
 };

-#endif /* RENDERING_SERVER_SCENE_SKY_RD_H */
+#endif // RENDERER_SCENE_SKY_RD_H
@@ -368,4 +368,4 @@ public:

 } // namespace RendererRD

-#endif // !LIGHT_STORAGE_RD_H
+#endif // LIGHT_STORAGE_RD_H
@@ -424,4 +424,4 @@ public:

 } // namespace RendererRD

-#endif // !MATERIAL_STORAGE_RD_H
+#endif // MATERIAL_STORAGE_RD_H
@@ -703,4 +703,4 @@ public:

 } // namespace RendererRD

-#endif // !MESH_STORAGE_RD_H
+#endif // MESH_STORAGE_RD_H
@@ -562,4 +562,4 @@ public:

 } // namespace RendererRD

-#endif // !PARTICLES_STORAGE_RD_H
+#endif // PARTICLES_STORAGE_RD_H
@@ -576,4 +576,4 @@ public:

 } // namespace RendererRD

-#endif // !_TEXTURE_STORAGE_RD_H
+#endif // TEXTURE_STORAGE_RD_H
@@ -119,4 +119,4 @@ public:

 } // namespace RendererRD

-#endif // !UTILITIES_RD_H
+#endif // UTILITIES_RD_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef UNIFORM_SET_CACHE_H
-#define UNIFORM_SET_CACHE_H
+#ifndef UNIFORM_SET_CACHE_RD_H
+#define UNIFORM_SET_CACHE_RD_H

 #include "core/templates/local_vector.h"
 #include "core/templates/paged_allocator.h"
@@ -220,4 +220,4 @@ public:
 	~UniformSetCacheRD();
 };

-#endif // UNIFORMSETCACHE_H
+#endif // UNIFORM_SET_CACHE_RD_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef RENDERINGSERVERSCENE_H
-#define RENDERINGSERVERSCENE_H
+#ifndef RENDERER_SCENE_H
+#define RENDERER_SCENE_H

 #include "servers/rendering_server.h"
 #include "servers/xr/xr_interface.h"
@@ -226,4 +226,4 @@ public:
 	virtual ~RendererScene();
 };

-#endif // RENDERINGSERVERSCENE_H
+#endif // RENDERER_SCENE_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef RENDERING_SERVER_SCENE_CULL_H
-#define RENDERING_SERVER_SCENE_CULL_H
+#ifndef RENDERER_SCENE_CULL_H
+#define RENDERER_SCENE_CULL_H

 #include "core/math/dynamic_bvh.h"
 #include "core/templates/bin_sorted_array.h"
@@ -1183,4 +1183,4 @@ public:
 	virtual ~RendererSceneCull();
 };

-#endif // RENDERING_SERVER_SCENE_CULL_H
+#endif // RENDERER_SCENE_CULL_H
@@ -200,4 +200,4 @@ public:
 	};
 };

-#endif //RENDERER_SCENE_OCCLUSION_CULL_H
+#endif // RENDERER_SCENE_OCCLUSION_CULL_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef RENDERINGSERVERSCENERENDER_H
-#define RENDERINGSERVERSCENERENDER_H
+#ifndef RENDERER_SCENE_RENDER_H
+#define RENDERER_SCENE_RENDER_H

 #include "core/math/projection.h"
 #include "core/templates/paged_array.h"
@@ -281,4 +281,4 @@ public:
 	virtual ~RendererSceneRender() {}
 };

-#endif // RENDERINGSERVERSCENERENDER_H
+#endif // RENDERER_SCENE_RENDER_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef RENDERERTHREADPOOL_H
-#define RENDERERTHREADPOOL_H
+#ifndef RENDERER_THREAD_POOL_H
+#define RENDERER_THREAD_POOL_H

 #include "core/templates/thread_work_pool.h"

@@ -42,4 +42,4 @@ public:
 	~RendererThreadPool();
 };

-#endif // RENDERERTHREADPOOL_H
+#endif // RENDERER_THREAD_POOL_H
@@ -981,4 +981,4 @@ public:
 	~RenderingServerDefault();
 };

-#endif
+#endif // RENDERING_SERVER_DEFAULT_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef SHADERTYPES_H
-#define SHADERTYPES_H
+#ifndef SHADER_TYPES_H
+#define SHADER_TYPES_H

 #include "core/templates/rb_map.h"
 #include "servers/rendering_server.h"
@@ -59,4 +59,4 @@ public:
 	ShaderTypes();
 };

-#endif // SHADERTYPES_H
+#endif // SHADER_TYPES_H
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

-#ifndef SHADER_WARNINGS
-#define SHADER_WARNINGS
+#ifndef SHADER_WARNINGS_H
+#define SHADER_WARNINGS_H

 #ifdef DEBUG_ENABLED

@@ -90,4 +90,4 @@ public:

 #endif // DEBUG_ENABLED

-#endif // SHADER_WARNINGS
+#endif // SHADER_WARNINGS_H
@@ -135,4 +135,4 @@ public:
 	virtual float lightmap_get_probe_capture_update_speed() const = 0;
 };

-#endif // !LIGHT_STORAGE_H
+#endif // LIGHT_STORAGE_H
@@ -99,4 +99,4 @@ public:
 	virtual void material_update_dependency(RID p_material, DependencyTracker *p_instance) = 0;
 };

-#endif // !MATERIAL_STORAGE_H
+#endif // MATERIAL_STORAGE_H
@@ -133,4 +133,4 @@ public:
 	virtual void skeleton_update_dependency(RID p_base, DependencyTracker *p_instance) = 0;
 };

-#endif // !MESH_STORAGE_H
+#endif // MESH_STORAGE_H
@@ -125,4 +125,4 @@ public:
 	virtual void particles_collision_instance_set_active(RID p_collision_instance, bool p_active) = 0;
 };

-#endif // !PARTICLES_STORAGE_H
+#endif // PARTICLES_STORAGE_H
@@ -148,4 +148,4 @@ public:
 	virtual void render_target_set_vrs_texture(RID p_render_target, RID p_texture) = 0;
 };

-#endif // !TEXTURE_STORAGE_H
+#endif // TEXTURE_STORAGE_H
@@ -183,4 +183,4 @@ public:
 	virtual String get_video_adapter_api_version() const = 0;
 };

-#endif // !RENDERER_UTILITIES_H
+#endif // RENDERER_UTILITIES_H
@@ -28,6 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/

+#ifndef SERVER_WRAP_MT_COMMON_H
+#define SERVER_WRAP_MT_COMMON_H
+
 #define FUNC0R(m_r, m_type)                                                     \
 	virtual m_r m_type() override {                                             \
 		if (Thread::get_caller_id() != server_thread) {                         \
@@ -762,3 +765,5 @@
 			server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15);                                                                                                                  \
 		}                                                                                                                                                                                                           \
 	}
+
+#endif // SERVER_WRAP_MT_COMMON_H
@@ -132,4 +132,4 @@ public:
 	// RID get_render_target_depth(RID p_render_target);
 };

-#endif // !XR_INTERFACE_EXTENSION_H
+#endif // XR_INTERFACE_EXTENSION_H
@@ -78,4 +78,4 @@ public:

 VARIANT_ENUM_CAST(XRPose::TrackingConfidence);

-#endif
+#endif // XR_POSE_H