Refactor lock guards to use single line macro

[GwnDaan]

Describe your changes

Removed #if and #endif directives in favor of single line macro for the lock guards Also added some missing directives around includes

How has this been tested?

Made sure that code can still be compiled and ran the unit tests. Also self-reviewed the changes to make sure there are no copy-paste mistakes.

[sonarcloud[bot]]

Quality Gate passed

Issues
0 New issues

Measures
0 Security Hotspots
94.5% Coverage on New Code
5.5% Duplication on New Code

See analysis details on SonarCloud