diff --git a/src/openrct2/actions/SetParkEntranceFeeAction.hpp b/src/openrct2/actions/SetParkEntranceFeeAction.hpp
index f349d6c247..aa84b26020 100644
--- a/src/openrct2/actions/SetParkEntranceFeeAction.hpp
+++ b/src/openrct2/actions/SetParkEntranceFeeAction.hpp
@@ -20,12 +20,9 @@
 #include "../localisation/string_ids.h"
 #include "GameAction.h"
 
-extern "C"
-{
-    #include "../cheats.h"
-    #include "../interface/window.h"
-    #include "../world/park.h"
-}
+#include "../cheats.h"
+#include "../interface/window.h"
+#include "../world/park.h"
 
 struct SetParkEntranceFeeAction : public GameActionBase<GAME_COMMAND_SET_PARK_ENTRANCE_FEE, GameActionResult>
 {
diff --git a/src/openrct2/core/DataSerialiser.h b/src/openrct2/core/DataSerialiser.h
index b90b4454e8..c520ed306b 100644
--- a/src/openrct2/core/DataSerialiser.h
+++ b/src/openrct2/core/DataSerialiser.h
@@ -19,7 +19,7 @@
 #include <type_traits>
 #include "DataSerialiserTraits.h"
 
-class DataSerialiser 
+class DataSerialiser
 {
 private:
     MemoryStream _stream;
@@ -37,17 +37,17 @@ public:
         _activeStream = &stream;
     }
 
-    bool IsSaving() const 
+    bool IsSaving() const
     {
         return _isSaving;
     }
 
-    bool IsLoading() const 
+    bool IsLoading() const
     {
         return !_isSaving;
     }
 
-    MemoryStream& GetStream() 
+    MemoryStream& GetStream()
     {
         return _stream;
     }
@@ -61,4 +61,4 @@ public:
             DataSerializerTraits<T>::decode(_activeStream, data);
         return *this;
     }
-};
\ No newline at end of file
+};
diff --git a/src/openrct2/core/DataSerialiserTraits.h b/src/openrct2/core/DataSerialiserTraits.h
index 307fc3ce2e..b45adbec22 100644
--- a/src/openrct2/core/DataSerialiserTraits.h
+++ b/src/openrct2/core/DataSerialiserTraits.h
@@ -80,4 +80,4 @@ struct DataSerializerTraits<std::string>
 
         Memory::FreeArray(str, len);
     }
-};
\ No newline at end of file
+};
diff --git a/src/openrct2/core/Endianness.h b/src/openrct2/core/Endianness.h
index bcefd87e00..2f5699abb2 100644
--- a/src/openrct2/core/Endianness.h
+++ b/src/openrct2/core/Endianness.h
@@ -59,4 +59,4 @@ static T ByteSwapBE(const T& value)
     return ByteSwapT<sizeof(T)>::SwapBE(value);
 }
 
-#endif
\ No newline at end of file
+#endif