Codechange: rename headers from .hpp to .h

for i in `find . -iname "*.hpp"|grep -v 3rdparty`; do git mv $i `echo $i | sed 's/pp$//'`; done
sed 's/.hpp/.h/' -i ../CMakelists.txt
for i in `find . -type f | grep -v nlohmann | grep -v catch2`; do sed 's/\.hpp/.h/;s/json.h"/json.hpp"/;s/catch.h"/catch.hpp"/' -i $i; done

CMakeLists.txt

@@ -264,7 +264,7 @@ endif()
 target_precompile_headers(openttd_lib
     PRIVATE
     src/stdafx.h
-    src/core/format.hpp
+    src/core/format.h
 )
 
 add_subdirectory(${CMAKE_SOURCE_DIR}/bin)

src/3rdparty/md5/md5.cpp

@@ -55,7 +55,7 @@
  */
 
 #include "../../stdafx.h"
-#include "../../core/endian_func.hpp"
+#include "../../core/endian_func.h"
 #include "md5.h"
 
 #include "../../safeguards.h"

src/3rdparty/squirrel/squirrel/sqdebug.cpp

@@ -12,7 +12,7 @@
 #include "sqclosure.h"
 #include "sqstring.h"
 
-#include "../../../core/alloc_func.hpp"
+#include "../../../core/alloc_func.h"
 #include "../../../string_func.h"
 
 #include "../../../safeguards.h"

src/3rdparty/squirrel/squirrel/sqmem.cpp

@@ -6,7 +6,7 @@
 
 #include "sqpcheader.h"
 
-#include "../../../core/alloc_func.hpp"
+#include "../../../core/alloc_func.h"
 #include "../../../safeguards.h"
 
 #ifdef SQUIRREL_DEFAULT_ALLOCATOR

src/3rdparty/squirrel/squirrel/squtils.h

@@ -3,7 +3,7 @@
 #define _SQUTILS_H_
 
 #include "../../fmt/format.h"
-#include "../../../script/script_fatalerror.hpp"
+#include "../../../script/script_fatalerror.h"
 
 void *sq_vm_malloc(SQUnsignedInteger size);
 void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);

src/CMakeLists.txt

@@ -191,7 +191,7 @@ add_files(
     graph_gui.cpp
     graph_gui.h
     ground_vehicle.cpp
-    ground_vehicle.hpp
+    ground_vehicle.h
     group.h
     group_cmd.cpp
     group_cmd.h
@@ -447,7 +447,7 @@ add_files(
     textbuf_gui.h
     textbuf_type.h
     texteff.cpp
-    texteff.hpp
+    texteff.h
     textfile_gui.cpp
     textfile_gui.h
     textfile_type.h
@@ -462,7 +462,7 @@ add_files(
     tilearea_type.h
     tilehighlight_func.h
     tilehighlight_type.h
-    tilematrix_type.hpp
+    tilematrix_type.h
     timetable.h
     timetable_cmd.cpp
     timetable_cmd.h

src/ai/CMakeLists.txt

@@ -1,14 +1,14 @@
 add_files(
-    ai.hpp
+    ai.h
     ai_config.cpp
-    ai_config.hpp
+    ai_config.h
     ai_core.cpp
     ai_gui.cpp
-    ai_gui.hpp
+    ai_gui.h
     ai_info.cpp
-    ai_info.hpp
+    ai_info.h
     ai_instance.cpp
-    ai_instance.hpp
+    ai_instance.h
     ai_scanner.cpp
-    ai_scanner.hpp
+    ai_scanner.h
 )

src/ai/ai.h

@@ -5,13 +5,13 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai.hpp Base functions for all AIs. */
+/** @file ai.h Base functions for all AIs. */
 
 #ifndef AI_HPP
 #define AI_HPP
 
-#include "../script/api/script_event_types.hpp"
-#include "ai_scanner.hpp"
+#include "../script/api/script_event_types.h"
+#include "ai_scanner.h"
 
 /**
  * Main AI class. Contains all functions needed to start, stop, save and load AIs.

src/ai/ai_config.cpp

@@ -10,9 +10,9 @@
 #include "../stdafx.h"
 #include "../settings_type.h"
 #include "../string_func.h"
-#include "ai.hpp"
-#include "ai_config.hpp"
-#include "ai_info.hpp"
+#include "ai.h"
+#include "ai_config.h"
+#include "ai_info.h"
 
 #include "../safeguards.h"
 

src/ai/ai_config.h

@@ -5,12 +5,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_config.hpp AIConfig stores the configuration settings of every AI. */
+/** @file ai_config.h AIConfig stores the configuration settings of every AI. */
 
 #ifndef AI_CONFIG_HPP
 #define AI_CONFIG_HPP
 
-#include "../script/script_config.hpp"
+#include "../script/script_config.h"
 #include "../company_type.h"
 
 class AIConfig : public ScriptConfig {

src/ai/ai_core.cpp

@@ -8,18 +8,18 @@
 /** @file ai_core.cpp Implementation of AI. */
 
 #include "../stdafx.h"
-#include "../core/backup_type.hpp"
-#include "../core/bitmath_func.hpp"
+#include "../core/backup_type.h"
+#include "../core/bitmath_func.h"
 #include "../company_base.h"
 #include "../company_func.h"
 #include "../network/network.h"
 #include "../window_func.h"
 #include "../framerate_type.h"
-#include "ai_scanner.hpp"
-#include "ai_instance.hpp"
-#include "ai_config.hpp"
-#include "ai_info.hpp"
-#include "ai.hpp"
+#include "ai_scanner.h"
+#include "ai_instance.h"
+#include "ai_config.h"
+#include "ai_info.h"
+#include "ai.h"
 
 #include "../safeguards.h"
 

src/ai/ai_gui.cpp

@@ -14,12 +14,12 @@
 #include "../network/network.h"
 #include "../settings_func.h"
 #include "../network/network_content.h"
-#include "../core/geometry_func.hpp"
+#include "../core/geometry_func.h"
 
-#include "ai.hpp"
-#include "ai_gui.hpp"
-#include "ai_config.hpp"
-#include "ai_info.hpp"
+#include "ai.h"
+#include "ai_gui.h"
+#include "ai_config.h"
+#include "ai_info.h"
 #include "../script/script_gui.h"
 #include "table/strings.h"
 

src/ai/ai_gui.h

@@ -5,7 +5,7 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_gui.hpp %Window for configuring the AIs  */
+/** @file ai_gui.h %Window for configuring the AIs  */
 
 #ifndef AI_GUI_HPP
 #define AI_GUI_HPP

src/ai/ai_info.cpp

@@ -9,9 +9,9 @@
 
 #include "../stdafx.h"
 
-#include "../script/squirrel_class.hpp"
-#include "ai_info.hpp"
-#include "ai_scanner.hpp"
+#include "../script/squirrel_class.h"
+#include "ai_info.h"
+#include "ai_scanner.h"
 #include "../debug.h"
 #include "../string_func.h"
 #include "../rev.h"

src/ai/ai_info.h

@@ -5,12 +5,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_info.hpp AIInfo keeps track of all information of an AI, like Author, Description, ... */
+/** @file ai_info.h AIInfo keeps track of all information of an AI, like Author, Description, ... */
 
 #ifndef AI_INFO_HPP
 #define AI_INFO_HPP
 
-#include "../script/script_info.hpp"
+#include "../script/script_info.h"
 
 /** All static information from an AI like name, version, etc. */
 class AIInfo : public ScriptInfo {

src/ai/ai_instance.cpp

@@ -11,19 +11,19 @@
 #include "../debug.h"
 #include "../error.h"
 
-#include "../script/squirrel_class.hpp"
+#include "../script/squirrel_class.h"
 
-#include "ai_config.hpp"
-#include "ai.hpp"
+#include "ai_config.h"
+#include "ai.h"
 
-#include "../script/script_storage.hpp"
+#include "../script/script_storage.h"
 #include "../script/script_cmd.h"
 #include "../script/script_gui.h"
-#include "ai_info.hpp"
-#include "ai_instance.hpp"
+#include "ai_info.h"
+#include "ai_instance.h"
 
 /* Manually include the Text glue. */
-#include "../script/api/template/template_text.hpp.sq"
+#include "../script/api/template/template_text.h.sq"
 
 /* Convert all AI related classes to Squirrel data. */
 #include "../script/api/ai/ai_includes.h"

src/ai/ai_instance.h

@@ -5,12 +5,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_instance.hpp The AIInstance tracks an AI. */
+/** @file ai_instance.h The AIInstance tracks an AI. */
 
 #ifndef AI_INSTANCE_HPP
 #define AI_INSTANCE_HPP
 
-#include "../script/script_instance.hpp"
+#include "../script/script_instance.h"
 
 /** Runtime information about an AI like a pointer to the squirrel vm and the current state. */
 class AIInstance : public ScriptInstance {

src/ai/ai_scanner.cpp

@@ -11,12 +11,12 @@
 #include "../debug.h"
 #include "../network/network.h"
 #include "../openttd.h"
-#include "../core/random_func.hpp"
+#include "../core/random_func.h"
 
-#include "../script/squirrel_class.hpp"
-#include "../script/api/script_object.hpp"
-#include "ai_info.hpp"
-#include "ai_scanner.hpp"
+#include "../script/squirrel_class.h"
+#include "../script/api/script_object.h"
+#include "ai_info.h"
+#include "ai_scanner.h"
 
 #include "../safeguards.h"
 

src/ai/ai_scanner.h

@@ -5,12 +5,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_scanner.hpp declarations of the class for AI scanner */
+/** @file ai_scanner.h declarations of the class for AI scanner */
 
 #ifndef AI_SCANNER_HPP
 #define AI_SCANNER_HPP
 
-#include "../script/script_scanner.hpp"
+#include "../script/script_scanner.h"
 
 class AIScannerInfo : public ScriptScanner {
 public:

src/aircraft_cmd.cpp

@@ -26,14 +26,14 @@
 #include "sound_func.h"
 #include "cheat_type.h"
 #include "company_base.h"
-#include "ai/ai.hpp"
-#include "game/game.hpp"
+#include "ai/ai.h"
+#include "game/game.h"
 #include "company_func.h"
 #include "effectvehicle_func.h"
 #include "station_base.h"
 #include "engine_base.h"
-#include "core/random_func.hpp"
-#include "core/backup_type.hpp"
+#include "core/random_func.h"
+#include "core/backup_type.h"
 #include "zoom_func.h"
 #include "disaster_vehicle.h"
 #include "newgrf_airporttiles.h"

src/airport_gui.cpp

@@ -23,7 +23,7 @@
 #include "newgrf_airport.h"
 #include "newgrf_callbacks.h"
 #include "widgets/dropdown_type.h"
-#include "core/geometry_func.hpp"
+#include "core/geometry_func.h"
 #include "hotkeys.h"
 #include "vehicle_func.h"
 #include "gui.h"

src/animated_tile.cpp

@@ -8,7 +8,7 @@
 /** @file animated_tile.cpp Everything related to animated tiles. */
 
 #include "stdafx.h"
-#include "core/container_func.hpp"
+#include "core/container_func.h"
 #include "tile_cmd.h"
 #include "viewport_func.h"
 #include "framerate_type.h"

src/articulated_vehicles.cpp

@@ -8,8 +8,8 @@
 /** @file articulated_vehicles.cpp Implementation of articulated vehicles. */
 
 #include "stdafx.h"
-#include "core/bitmath_func.hpp"
-#include "core/random_func.hpp"
+#include "core/bitmath_func.h"
+#include "core/random_func.h"
 #include "train.h"
 #include "roadveh.h"
 #include "vehicle_func.h"

src/autoreplace.cpp

@@ -11,8 +11,8 @@
 #include "command_func.h"
 #include "group.h"
 #include "autoreplace_base.h"
-#include "core/bitmath_func.hpp"
-#include "core/pool_func.hpp"
+#include "core/bitmath_func.h"
+#include "core/pool_func.h"
 
 #include "safeguards.h"
 

src/autoreplace_base.h

@@ -10,7 +10,7 @@
 #ifndef AUTOREPLACE_BASE_H
 #define AUTOREPLACE_BASE_H
 
-#include "core/pool_type.hpp"
+#include "core/pool_type.h"
 #include "autoreplace_type.h"
 #include "engine_type.h"
 #include "group_type.h"

src/autoreplace_cmd.cpp

@@ -16,11 +16,11 @@
 #include "autoreplace_func.h"
 #include "autoreplace_gui.h"
 #include "articulated_vehicles.h"
-#include "core/bitmath_func.hpp"
-#include "core/random_func.hpp"
+#include "core/bitmath_func.h"
+#include "core/random_func.h"
 #include "vehiclelist.h"
 #include "road.h"
-#include "ai/ai.hpp"
+#include "ai/ai.h"
 #include "news_func.h"
 #include "strings_func.h"
 #include "autoreplace_cmd.h"

src/autoreplace_gui.cpp

@@ -21,7 +21,7 @@
 #include "window_gui.h"
 #include "engine_gui.h"
 #include "settings_func.h"
-#include "core/geometry_func.hpp"
+#include "core/geometry_func.h"
 #include "rail_gui.h"
 #include "road_gui.h"
 #include "widgets/dropdown_func.h"

src/base_station_base.h

@@ -10,7 +10,7 @@
 #ifndef BASE_STATION_BASE_H
 #define BASE_STATION_BASE_H
 
-#include "core/pool_type.hpp"
+#include "core/pool_type.h"
 #include "command_type.h"
 #include "viewport_type.h"
 #include "station_map.h"

src/bitmap_type.h

@@ -5,7 +5,7 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file bitmap_type.hpp Bitmap functions. */
+/** @file bitmap_type.h Bitmap functions. */
 
 #ifndef BITMAP_TYPE_HPP
 #define BITMAP_TYPE_HPP

src/blitter/32bpp_anim.cpp

@@ -8,10 +8,10 @@
 /** @file 32bpp_anim.cpp Implementation of the optimized 32 bpp blitter with animation support. */
 
 #include "../stdafx.h"
-#include "../video/video_driver.hpp"
+#include "../video/video_driver.h"
 #include "../palette_func.h"
-#include "32bpp_anim.hpp"
-#include "common.hpp"
+#include "32bpp_anim.h"
+#include "common.h"
 
 #include "../table/sprites.h"
 

src/blitter/32bpp_anim.h

@@ -5,12 +5,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file 32bpp_anim.hpp A 32 bpp blitter with animation support. */
+/** @file 32bpp_anim.h A 32 bpp blitter with animation support. */
 
 #ifndef BLITTER_32BPP_ANIM_HPP
 #define BLITTER_32BPP_ANIM_HPP
 
-#include "32bpp_optimized.hpp"
+#include "32bpp_optimized.h"
 
 /** The optimised 32 bpp blitter with palette animation. */
 class Blitter_32bppAnim : public Blitter_32bppOptimized {

src/blitter/32bpp_anim_sse2.cpp

@@ -10,9 +10,9 @@
 #ifdef WITH_SSE
 
 #include "../stdafx.h"
-#include "../video/video_driver.hpp"
-#include "32bpp_anim_sse2.hpp"
-#include "32bpp_sse_func.hpp"
+#include "../video/video_driver.h"
+#include "32bpp_anim_sse2.h"
+#include "32bpp_sse_func.h"
 
 #include "../safeguards.h"
 

src/blitter/32bpp_anim_sse2.h

@@ -5,7 +5,7 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file 32bpp_anim.hpp A partially SSE2 32 bpp blitter with animation support. */
+/** @file 32bpp_anim.h A partially SSE2 32 bpp blitter with animation support. */
 
 #ifndef BLITTER_32BPP_SSE2_ANIM_HPP
 #define BLITTER_32BPP_SSE2_ANIM_HPP
@@ -24,8 +24,8 @@
 #define FULL_ANIMATION 1
 #endif
 
-#include "32bpp_anim.hpp"
-#include "32bpp_sse2.hpp"
+#include "32bpp_anim.h"
+#include "32bpp_sse2.h"
 
 /** A partially 32 bpp blitter with palette animation. */
 class Blitter_32bppSSE2_Anim : public Blitter_32bppAnim {

src/blitter/32bpp_anim_sse4.cpp

@@ -11,10 +11,10 @@
 
 #include "../stdafx.h"
 #include "../palette_func.h"
-#include "../video/video_driver.hpp"
+#include "../video/video_driver.h"
 #include "../table/sprites.h"
-#include "32bpp_anim_sse4.hpp"
-#include "32bpp_sse_func.hpp"
+#include "32bpp_anim_sse4.h"
+#include "32bpp_sse_func.h"
 
 #include "../safeguards.h"
 

src/blitter/32bpp_anim_sse4.h

@@ -5,7 +5,7 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file 32bpp_anim_sse4.hpp A SSE4 32 bpp blitter with animation support. */
+/** @file 32bpp_anim_sse4.h A SSE4 32 bpp blitter with animation support. */
 
 #ifndef BLITTER_32BPP_SSE4_ANIM_HPP
 #define BLITTER_32BPP_SSE4_ANIM_HPP
@@ -24,9 +24,9 @@
 #define FULL_ANIMATION 1
 #endif
 
-#include "32bpp_anim.hpp"
-#include "32bpp_anim_sse2.hpp"
-#include "32bpp_sse4.hpp"
+#include "32bpp_anim.h"
+#include "32bpp_anim_sse2.h"
+#include "32bpp_sse4.h"
 
 #undef MARGIN_NORMAL_THRESHOLD
 #define MARGIN_NORMAL_THRESHOLD 4

src/blitter/32bpp_base.cpp

@@ -8,8 +8,8 @@
 /** @file 32bpp_base.cpp Implementation of base for 32 bpp blitters. */
 
 #include "../stdafx.h"
-#include "32bpp_base.hpp"
-#include "common.hpp"
+#include "32bpp_base.h"
+#include "common.h"
 
 #include "../safeguards.h"
 

src/blitter/32bpp_base.h

@@ -5,14 +5,14 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file 32bpp_base.hpp Base for all 32 bits blitters. */
+/** @file 32bpp_base.h Base for all 32 bits blitters. */
 
 #ifndef BLITTER_32BPP_BASE_HPP
 #define BLITTER_32BPP_BASE_HPP
 
-#include "base.hpp"
-#include "../core/bitmath_func.hpp"
-#include "../core/math_func.hpp"
+#include "base.h"
+#include "../core/bitmath_func.h"
+#include "../core/math_func.h"
 #include "../gfx_func.h"
 
 /** Base for all 32bpp blitters. */

src/blitter/32bpp_optimized.cpp

@@ -11,7 +11,7 @@
 #include "../zoom_func.h"
 #include "../settings_type.h"
 #include "../palette_func.h"
-#include "32bpp_optimized.hpp"
+#include "32bpp_optimized.h"
 
 #include "../safeguards.h"
 

src/blitter/32bpp_optimized.h

@@ -5,12 +5,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file 32bpp_optimized.hpp Optimized 32 bpp blitter. */
+/** @file 32bpp_optimized.h Optimized 32 bpp blitter. */
 
 #ifndef BLITTER_32BPP_OPTIMIZED_HPP
 #define BLITTER_32BPP_OPTIMIZED_HPP
 
-#include "32bpp_simple.hpp"
+#include "32bpp_simple.h"
 
 /** The optimised 32 bpp blitter (without palette animation). */
 class Blitter_32bppOptimized : public Blitter_32bppSimple {

src/blitter/32bpp_simple.cpp

@@ -10,7 +10,7 @@
 #include "../stdafx.h"
 #include "../zoom_func.h"
 #include "../palette_func.h"
-#include "32bpp_simple.hpp"
+#include "32bpp_simple.h"
 
 #include "../table/sprites.h"
 

src/blitter/32bpp_simple.h

@@ -5,13 +5,13 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file 32bpp_simple.hpp Simple 32 bpp blitter. */
+/** @file 32bpp_simple.h Simple 32 bpp blitter. */
 
 #ifndef BLITTER_32BPP_SIMPLE_HPP
 #define BLITTER_32BPP_SIMPLE_HPP
 
-#include "32bpp_base.hpp"
-#include "factory.hpp"
+#include "32bpp_base.h"
+#include "factory.h"
 
 /** The most trivial 32 bpp blitter (without palette animation). */
 class Blitter_32bppSimple : public Blitter_32bppBase {

src/blitter/32bpp_sse2.cpp

@@ -12,8 +12,8 @@
 #include "../stdafx.h"
 #include "../zoom_func.h"
 #include "../settings_type.h"
-#include "32bpp_sse2.hpp"
-#include "32bpp_sse_func.hpp"
+#include "32bpp_sse2.h"
+#include "32bpp_sse_func.h"
 
 #include "../safeguards.h"
 

src/blitter/32bpp_sse2.h

@@ -5,7 +5,7 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file 32bpp_sse2.hpp SSE2 32 bpp blitter. */
+/** @file 32bpp_sse2.h SSE2 32 bpp blitter. */
 
 #ifndef BLITTER_32BPP_SSE2_HPP
 #define BLITTER_32BPP_SSE2_HPP

src/blitter/32bpp_sse4.cpp

@@ -12,8 +12,8 @@
 #include "../stdafx.h"
 #include "../zoom_func.h"
 #include "../settings_type.h"
-#include "32bpp_sse4.hpp"
-#include "32bpp_sse_func.hpp"
+#include "32bpp_sse4.h"
+#include "32bpp_sse_func.h"
 
 #include "../safeguards.h"
 

src/blitter/32bpp_sse4.h

@@ -5,7 +5,7 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file 32bpp_sse4.hpp SSE4 32 bpp blitter. */
+/** @file 32bpp_sse4.h SSE4 32 bpp blitter. */
 
 #ifndef BLITTER_32BPP_SSE4_HPP
 #define BLITTER_32BPP_SSE4_HPP
@@ -24,7 +24,7 @@
 #define FULL_ANIMATION 0
 #endif
 
-#include "32bpp_ssse3.hpp"
+#include "32bpp_ssse3.h"
 
 /** The SSE4 32 bpp blitter (without palette animation). */
 class Blitter_32bppSSE4 : public Blitter_32bppSSSE3 {

src/blitter/32bpp_sse_func.h

@@ -5,7 +5,7 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file 32bpp_sse_func.hpp Functions related to SSE 32 bpp blitter. */
+/** @file 32bpp_sse_func.h Functions related to SSE 32 bpp blitter. */
 
 #ifndef BLITTER_32BPP_SSE_FUNC_HPP
 #define BLITTER_32BPP_SSE_FUNC_HPP

src/blitter/32bpp_sse_type.h

@@ -12,7 +12,7 @@
 
 #ifdef WITH_SSE
 
-#include "32bpp_simple.hpp"
+#include "32bpp_simple.h"
 #if (SSE_VERSION == 2)
 #include <emmintrin.h>
 #elif (SSE_VERSION == 3)

src/blitter/32bpp_ssse3.cpp

@@ -12,8 +12,8 @@
 #include "../stdafx.h"
 #include "../zoom_func.h"
 #include "../settings_type.h"
-#include "32bpp_ssse3.hpp"
-#include "32bpp_sse_func.hpp"
+#include "32bpp_ssse3.h"
+#include "32bpp_sse_func.h"
 
 #include "../safeguards.h"
 

src/blitter/32bpp_ssse3.h

@@ -5,7 +5,7 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file 32bpp_ssse3.hpp SSSE3 32 bpp blitter. */
+/** @file 32bpp_ssse3.h SSSE3 32 bpp blitter. */
 
 #ifndef BLITTER_32BPP_SSSE3_HPP
 #define BLITTER_32BPP_SSSE3_HPP
@@ -24,7 +24,7 @@
 #define FULL_ANIMATION 0
 #endif
 
-#include "32bpp_sse2.hpp"
+#include "32bpp_sse2.h"
 
 /** The SSSE3 32 bpp blitter (without palette animation). */
 class Blitter_32bppSSSE3 : public Blitter_32bppSSE2 {

src/blitter/40bpp_anim.cpp

@@ -10,10 +10,10 @@
 #include "../stdafx.h"
 #include "../zoom_func.h"
 #include "../settings_type.h"
-#include "../video/video_driver.hpp"
+#include "../video/video_driver.h"
 #include "../palette_func.h"
-#include "40bpp_anim.hpp"
-#include "common.hpp"
+#include "40bpp_anim.h"
+#include "common.h"
 
 #include "../table/sprites.h"
 

src/blitter/40bpp_anim.h

@@ -5,14 +5,14 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file 40bpp_optimized.hpp Optimized 40 bpp blitter. */
+/** @file 40bpp_optimized.h Optimized 40 bpp blitter. */
 
 #ifndef BLITTER_40BPP_OPTIMIZED_HPP
 #define BLITTER_40BPP_OPTIMIZED_HPP
 
 
-#include "32bpp_optimized.hpp"
-#include "../video/video_driver.hpp"
+#include "32bpp_optimized.h"
+#include "../video/video_driver.h"
 
 /** The optimized 40 bpp blitter (for OpenGL video driver). */
 class Blitter_40bppAnim : public Blitter_32bppOptimized {

src/blitter/8bpp_base.cpp

@@ -9,8 +9,8 @@
 
 #include "../stdafx.h"
 #include "../gfx_func.h"
-#include "8bpp_base.hpp"
-#include "common.hpp"
+#include "8bpp_base.h"
+#include "common.h"
 
 #include "../safeguards.h"
 

src/blitter/8bpp_base.h

@@ -5,12 +5,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file 8bpp_base.hpp Base for all 8 bpp blitters. */
+/** @file 8bpp_base.h Base for all 8 bpp blitters. */
 
 #ifndef BLITTER_8BPP_BASE_HPP
 #define BLITTER_8BPP_BASE_HPP
 
-#include "base.hpp"
+#include "base.h"
 
 /** Base for all 8bpp blitters. */
 class Blitter_8bppBase : public Blitter {

src/blitter/8bpp_optimized.cpp

@@ -10,9 +10,9 @@
 #include "../stdafx.h"
 #include "../zoom_func.h"
 #include "../settings_type.h"
-#include "../core/math_func.hpp"
-#include "../core/mem_func.hpp"
-#include "8bpp_optimized.hpp"
+#include "../core/math_func.h"
+#include "../core/mem_func.h"
+#include "8bpp_optimized.h"
 
 #include "../safeguards.h"
 

src/blitter/8bpp_optimized.h

@@ -5,13 +5,13 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file 8bpp_optimized.hpp An optimized 8 bpp blitter. */
+/** @file 8bpp_optimized.h An optimized 8 bpp blitter. */
 
 #ifndef BLITTER_8BPP_OPTIMIZED_HPP
 #define BLITTER_8BPP_OPTIMIZED_HPP
 
-#include "8bpp_base.hpp"
-#include "factory.hpp"
+#include "8bpp_base.h"
+#include "factory.h"
 
 /** 8bpp blitter optimised for speed. */
 class Blitter_8bppOptimized FINAL : public Blitter_8bppBase {

src/blitter/8bpp_simple.cpp

@@ -9,7 +9,7 @@
 
 #include "../stdafx.h"
 #include "../zoom_func.h"
-#include "8bpp_simple.hpp"
+#include "8bpp_simple.h"
 
 #include "../safeguards.h"
 

src/blitter/8bpp_simple.h

@@ -5,13 +5,13 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file 8bpp_simple.hpp Simple (and slow) 8 bpp blitter. */
+/** @file 8bpp_simple.h Simple (and slow) 8 bpp blitter. */
 
 #ifndef BLITTER_8BPP_SIMPLE_HPP
 #define BLITTER_8BPP_SIMPLE_HPP
 
-#include "8bpp_base.hpp"
-#include "factory.hpp"
+#include "8bpp_base.h"
+#include "factory.h"
 
 /** Most trivial 8bpp blitter. */
 class Blitter_8bppSimple FINAL : public Blitter_8bppBase {

src/blitter/CMakeLists.txt

@@ -1,47 +1,47 @@
 add_files(
     32bpp_anim.cpp
-    32bpp_anim.hpp
+    32bpp_anim.h
     32bpp_base.cpp
-    32bpp_base.hpp
+    32bpp_base.h
     32bpp_optimized.cpp
-    32bpp_optimized.hpp
+    32bpp_optimized.h
     32bpp_simple.cpp
-    32bpp_simple.hpp
+    32bpp_simple.h
     8bpp_base.cpp
-    8bpp_base.hpp
+    8bpp_base.h
     8bpp_optimized.cpp
-    8bpp_optimized.hpp
+    8bpp_optimized.h
     8bpp_simple.cpp
-    8bpp_simple.hpp
+    8bpp_simple.h
     CONDITION NOT OPTION_DEDICATED
 )
 
 add_files(
     32bpp_anim_sse2.cpp
-    32bpp_anim_sse2.hpp
+    32bpp_anim_sse2.h
     32bpp_anim_sse4.cpp
-    32bpp_anim_sse4.hpp
+    32bpp_anim_sse4.h
     32bpp_sse2.cpp
-    32bpp_sse2.hpp
+    32bpp_sse2.h
     32bpp_sse4.cpp
-    32bpp_sse4.hpp
-    32bpp_sse_func.hpp
+    32bpp_sse4.h
+    32bpp_sse_func.h
     32bpp_sse_type.h
     32bpp_ssse3.cpp
-    32bpp_ssse3.hpp
+    32bpp_ssse3.h
     CONDITION NOT OPTION_DEDICATED AND SSE_FOUND
 )
 
 add_files(
     40bpp_anim.cpp
-    40bpp_anim.hpp
+    40bpp_anim.h
     CONDITION NOT OPTION_DEDICATED AND OPENGL_FOUND
 )
 
 add_files(
-    base.hpp
-    common.hpp
-    factory.hpp
+    base.h
+    common.h
+    factory.h
     null.cpp
-    null.hpp
+    null.h
 )

src/blitter/base.h

@@ -5,13 +5,13 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file base.hpp Base for all blitters. */
+/** @file base.h Base for all blitters. */
 
 #ifndef BLITTER_BASE_HPP
 #define BLITTER_BASE_HPP
 
 #include "../spritecache.h"
-#include "../spriteloader/spriteloader.hpp"
+#include "../spriteloader/spriteloader.h"
 
 /** The modes of blitting we can do. */
 enum BlitterMode {

src/blitter/common.h

@@ -5,13 +5,13 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file common.hpp Common functionality for all blitter implementations. */
+/** @file common.h Common functionality for all blitter implementations. */
 
 #ifndef BLITTER_COMMON_HPP
 #define BLITTER_COMMON_HPP
 
-#include "base.hpp"
-#include "../core/math_func.hpp"
+#include "base.h"
+#include "../core/math_func.h"
 
 #include <utility>
 

src/blitter/factory.h

@@ -5,12 +5,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file factory.hpp Factory to 'query' all available blitters. */
+/** @file factory.h Factory to 'query' all available blitters. */
 
 #ifndef BLITTER_FACTORY_HPP
 #define BLITTER_FACTORY_HPP
 
-#include "base.hpp"
+#include "base.h"
 #include "../debug.h"
 #include "../string_func.h"
 

src/blitter/null.cpp

@@ -8,7 +8,7 @@
 /** @file null.cpp A blitter that doesn't blit. */
 
 #include "../stdafx.h"
-#include "null.hpp"
+#include "null.h"
 
 #include "../safeguards.h"
 

src/blitter/null.h

@@ -5,12 +5,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file null.hpp The blitter that doesn't blit. */
+/** @file null.h The blitter that doesn't blit. */
 
 #ifndef BLITTER_NULL_HPP
 #define BLITTER_NULL_HPP
 
-#include "factory.hpp"
+#include "factory.h"
 
 /** Blitter that does nothing. */
 class Blitter_Null : public Blitter {

src/bmp.cpp

@@ -9,9 +9,9 @@
 
 #include "stdafx.h"
 #include "bmp.h"
-#include "core/bitmath_func.hpp"
-#include "core/alloc_func.hpp"
-#include "core/mem_func.hpp"
+#include "core/bitmath_func.h"
+#include "core/alloc_func.h"
+#include "core/mem_func.h"
 
 #include "safeguards.h"
 

src/bootstrap_gui.cpp

@@ -9,12 +9,12 @@
 
 #include "stdafx.h"
 #include "base_media_base.h"
-#include "blitter/factory.hpp"
+#include "blitter/factory.h"
 #include "error_func.h"
 
 #if defined(WITH_FREETYPE) || defined(WITH_UNISCRIBE) || defined(WITH_COCOA)
 
-#include "core/geometry_func.hpp"
+#include "core/geometry_func.h"
 #include "error.h"
 #include "fontcache.h"
 #include "gfx_func.h"
@@ -22,7 +22,7 @@
 #include "network/network_content_gui.h"
 #include "openttd.h"
 #include "strings_func.h"
-#include "video/video_driver.hpp"
+#include "video/video_driver.h"
 #include "window_func.h"
 
 #include "widgets/bootstrap_widget.h"
@@ -288,7 +288,7 @@ public:
 #	include "network/network.h"
 #	include "network/network_content.h"
 #	include "openttd.h"
-#	include "video/video_driver.hpp"
+#	include "video/video_driver.h"
 
 class BootstrapEmscripten : public ContentCallback {
 	bool downloading{false};

src/bridge_gui.cpp

@@ -19,7 +19,7 @@
 #include "tunnelbridge.h"
 #include "sortlist_type.h"
 #include "widgets/dropdown_func.h"
-#include "core/geometry_func.hpp"
+#include "core/geometry_func.h"
 #include "tunnelbridge_map.h"
 #include "road_gui.h"
 #include "tunnelbridge_cmd.h"

src/build_vehicle_gui.cpp

@@ -28,7 +28,7 @@
 #include "widgets/dropdown_func.h"
 #include "engine_gui.h"
 #include "cargotype.h"
-#include "core/geometry_func.hpp"
+#include "core/geometry_func.h"
 #include "autoreplace_func.h"
 #include "engine_cmd.h"
 #include "train_cmd.h"

src/cargo_type.h

@@ -10,7 +10,7 @@
 #ifndef CARGO_TYPE_H
 #define CARGO_TYPE_H
 
-#include "core/enum_type.hpp"
+#include "core/enum_type.h"
 
 /**
  * Cargo slots to indicate a cargo type within a game.

src/cargomonitor.h

@@ -14,7 +14,7 @@
 #include "company_func.h"
 #include "industry.h"
 #include "town.h"
-#include "core/overflowsafe_type.hpp"
+#include "core/overflowsafe_type.h"
 
 struct Station;
 

src/cargopacket.cpp

@@ -9,8 +9,8 @@
 
 #include "stdafx.h"
 #include "station_base.h"
-#include "core/pool_func.hpp"
-#include "core/random_func.hpp"
+#include "core/pool_func.h"
+#include "core/random_func.h"
 #include "economy_base.h"
 #include "cargoaction.h"
 #include "order_type.h"

src/cargopacket.h

@@ -10,13 +10,13 @@
 #ifndef CARGOPACKET_H
 #define CARGOPACKET_H
 
-#include "core/pool_type.hpp"
+#include "core/pool_type.h"
 #include "economy_type.h"
 #include "station_type.h"
 #include "order_type.h"
 #include "cargo_type.h"
 #include "vehicle_type.h"
-#include "core/multimap.hpp"
+#include "core/multimap.h"
 #include "saveload/saveload.h"
 
 /** Unique identifier for a single cargo packet. */

src/cargotype.cpp

@@ -9,7 +9,7 @@
 
 #include "stdafx.h"
 #include "cargotype.h"
-#include "core/geometry_func.hpp"
+#include "core/geometry_func.h"
 #include "newgrf_cargo.h"
 #include "string_func.h"
 #include "strings_func.h"

src/cargotype.h

@@ -15,7 +15,7 @@
 #include "gfx_type.h"
 #include "strings_type.h"
 #include "landscape_type.h"
-#include "core/bitmath_func.hpp"
+#include "core/bitmath_func.h"
 
 /** Globally unique label of a cargo type. */
 typedef uint32_t CargoLabel;

src/cheat_gui.cpp

@@ -28,7 +28,7 @@
 #include "newgrf.h"
 #include "error.h"
 #include "misc_cmd.h"
-#include "core/geometry_func.hpp"
+#include "core/geometry_func.h"
 #include "timer/timer.h"
 #include "timer/timer_game_calendar.h"
 

src/clear_cmd.cpp

@@ -13,7 +13,7 @@
 #include "landscape.h"
 #include "genworld.h"
 #include "viewport_func.h"
-#include "core/random_func.hpp"
+#include "core/random_func.h"
 #include "newgrf_generic.h"
 #include "landscape_cmd.h"
 

src/command.cpp

@@ -16,13 +16,13 @@
 #include "network/network.h"
 #include "genworld.h"
 #include "strings_func.h"
-#include "texteff.hpp"
+#include "texteff.h"
 #include "town.h"
 #include "timer/timer_game_calendar.h"
 #include "company_func.h"
 #include "company_base.h"
 #include "signal_func.h"
-#include "core/backup_type.hpp"
+#include "core/backup_type.h"
 #include "object_base.h"
 #include "autoreplace_cmd.h"
 #include "company_cmd.h"
@@ -56,7 +56,7 @@
 #include "viewport_cmd.h"
 #include "water_cmd.h"
 #include "waypoint_cmd.h"
-#include "misc/endian_buffer.hpp"
+#include "misc/endian_buffer.h"
 #include "string_func.h"
 
 #include "table/strings.h"

src/command_func.h

@@ -14,8 +14,8 @@
 #include "network/network_type.h"
 #include "company_type.h"
 #include "company_func.h"
-#include "core/backup_type.hpp"
-#include "misc/endian_buffer.hpp"
+#include "core/backup_type.h"
+#include "misc/endian_buffer.h"
 #include "tile_map.h"
 
 /**

src/company_cmd.cpp

@@ -11,7 +11,7 @@
 #include "company_base.h"
 #include "company_func.h"
 #include "company_gui.h"
-#include "core/backup_type.hpp"
+#include "core/backup_type.h"
 #include "town.h"
 #include "news_func.h"
 #include "command_func.h"
@@ -19,18 +19,18 @@
 #include "network/network_func.h"
 #include "network/network_base.h"
 #include "network/network_admin.h"
-#include "ai/ai.hpp"
+#include "ai/ai.h"
 #include "company_manager_face.h"
 #include "window_func.h"
 #include "strings_func.h"
 #include "sound_func.h"
 #include "rail.h"
-#include "core/pool_func.hpp"
+#include "core/pool_func.h"
 #include "settings_func.h"
 #include "vehicle_base.h"
 #include "vehicle_func.h"
 #include "smallmap_gui.h"
-#include "game/game.hpp"
+#include "game/game.h"
 #include "goal_base.h"
 #include "story_base.h"
 #include "widgets/statusbar_widget.h"

src/company_gui.cpp

@@ -26,7 +26,7 @@
 #include "widgets/dropdown_type.h"
 #include "tilehighlight_func.h"
 #include "company_base.h"
-#include "core/geometry_func.hpp"
+#include "core/geometry_func.h"
 #include "object_type.h"
 #include "rail.h"
 #include "road.h"

src/company_manager_face.h

@@ -10,8 +10,8 @@
 #ifndef COMPANY_MANAGER_FACE_H
 #define COMPANY_MANAGER_FACE_H
 
-#include "core/random_func.hpp"
-#include "core/bitmath_func.hpp"
+#include "core/random_func.h"
+#include "core/bitmath_func.h"
 #include "table/sprites.h"
 #include "company_type.h"
 

src/company_type.h

@@ -10,7 +10,7 @@
 #ifndef COMPANY_TYPE_H
 #define COMPANY_TYPE_H
 
-#include "core/enum_type.hpp"
+#include "core/enum_type.h"
 
 /**
  * Enum for all companies/owners.

src/console_cmds.cpp

@@ -32,15 +32,15 @@
 #include "timer/timer_game_calendar.h"
 #include "company_func.h"
 #include "gamelog.h"
-#include "ai/ai.hpp"
-#include "ai/ai_config.hpp"
+#include "ai/ai.h"
+#include "ai/ai_config.h"
 #include "newgrf.h"
 #include "newgrf_profiling.h"
 #include "console_func.h"
 #include "engine_base.h"
 #include "road.h"
 #include "rail.h"
-#include "game/game.hpp"
+#include "game/game.h"
 #include "table/strings.h"
 #include "3rdparty/fmt/chrono.h"
 #include "company_cmd.h"

src/console_func.h

@@ -11,7 +11,7 @@
 #define CONSOLE_FUNC_H
 
 #include "console_type.h"
-#include "core/format.hpp"
+#include "core/format.h"
 
 /* console modes */
 extern IConsoleModes _iconsole_mode;

src/console_gui.cpp

@@ -19,7 +19,7 @@
 #include "settings_type.h"
 #include "console_func.h"
 #include "rev.h"
-#include "video/video_driver.hpp"
+#include "video/video_driver.h"
 #include "timer/timer.h"
 #include "timer/timer_window.h"
 

src/core/CMakeLists.txt

@@ -1,28 +1,28 @@
 add_files(
     alloc_func.cpp
-    alloc_func.hpp
-    alloc_type.hpp
-    backup_type.hpp
-    bitmath_func.hpp
-    endian_func.hpp
-    endian_type.hpp
-    enum_type.hpp
-    format.hpp
+    alloc_func.h
+    alloc_type.h
+    backup_type.h
+    bitmath_func.h
+    endian_func.h
+    endian_type.h
+    enum_type.h
+    format.h
     geometry_func.cpp
-    geometry_func.hpp
-    geometry_type.hpp
-    kdtree.hpp
+    geometry_func.h
+    geometry_type.h
+    kdtree.h
     math_func.cpp
-    math_func.hpp
-    mem_func.hpp
-    multimap.hpp
-    overflowsafe_type.hpp
+    math_func.h
+    mem_func.h
+    multimap.h
+    overflowsafe_type.h
     pool_func.cpp
-    pool_func.hpp
-    pool_type.hpp
+    pool_func.h
+    pool_type.h
     random_func.cpp
-    random_func.hpp
-    smallstack_type.hpp
-    container_func.hpp
-    strong_typedef_type.hpp
+    random_func.h
+    smallstack_type.h
+    container_func.h
+    strong_typedef_type.h
 )

src/core/alloc_func.h

@@ -5,7 +5,7 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file alloc_func.hpp Functions related to the allocation of memory */
+/** @file alloc_func.h Functions related to the allocation of memory */
 
 #ifndef ALLOC_FUNC_HPP
 #define ALLOC_FUNC_HPP

src/core/alloc_type.h

@@ -5,12 +5,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file alloc_type.hpp Helper types related to the allocation of memory */
+/** @file alloc_type.h Helper types related to the allocation of memory */
 
 #ifndef ALLOC_TYPE_HPP
 #define ALLOC_TYPE_HPP
 
-#include "alloc_func.hpp"
+#include "alloc_func.h"
 
 /**
  * A reusable buffer that can be used for places that temporary allocate

src/core/backup_type.h

@@ -5,7 +5,7 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file backup_type.hpp Class for backupping variables and making sure they are restored later. */
+/** @file backup_type.h Class for backupping variables and making sure they are restored later. */
 
 #ifndef BACKUP_TYPE_HPP
 #define BACKUP_TYPE_HPP

src/core/bitmath_func.h

@@ -5,7 +5,7 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file bitmath_func.hpp Functions related to bit mathematics. */
+/** @file bitmath_func.h Functions related to bit mathematics. */
 
 #ifndef BITMATH_FUNC_HPP
 #define BITMATH_FUNC_HPP

src/core/container_func.h

@@ -5,7 +5,7 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file container_func.hpp Some simple functions to help with accessing containers. */
+/** @file container_func.h Some simple functions to help with accessing containers. */
 
 #ifndef CONTAINER_FUNC_HPP
 #define CONTAINER_FUNC_HPP

src/core/endian_func.h

@@ -5,13 +5,13 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file endian_func.hpp Function to handling different endian machines. */
+/** @file endian_func.h Function to handling different endian machines. */
 
 #ifndef ENDIAN_FUNC_HPP
 #define ENDIAN_FUNC_HPP
 
-#include "endian_type.hpp"
-#include "bitmath_func.hpp"
+#include "endian_type.h"
+#include "bitmath_func.h"
 
 /* Setup alignment and conversion macros */
 #if TTD_ENDIAN == TTD_BIG_ENDIAN

src/core/endian_type.h

@@ -5,7 +5,7 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file endian_type.hpp Definition of various endian-dependant macros. */
+/** @file endian_type.h Definition of various endian-dependant macros. */
 
 #ifndef ENDIAN_TYPE_HPP
 #define ENDIAN_TYPE_HPP

src/core/enum_type.h

@@ -5,7 +5,7 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file enum_type.hpp Type (helpers) for enums */
+/** @file enum_type.h Type (helpers) for enums */
 
 #ifndef ENUM_TYPE_HPP
 #define ENUM_TYPE_HPP

src/core/format.h

@@ -5,13 +5,13 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file format.hpp String formatting functions and helpers. */
+/** @file format.h String formatting functions and helpers. */
 
 #ifndef FORMAT_HPP
 #define FORMAT_HPP
 
 #include "../3rdparty/fmt/format.h"
-#include "strong_typedef_type.hpp"
+#include "strong_typedef_type.h"
 
 template <typename E, typename Char>
 struct fmt::formatter<E, Char, std::enable_if_t<std::is_enum<E>::value>> : fmt::formatter<typename std::underlying_type<E>::type> {

src/core/geometry_func.cpp

@@ -8,8 +8,8 @@
 /** @file geometry_func.cpp Geometry functions. */
 
 #include "../stdafx.h"
-#include "geometry_func.hpp"
-#include "math_func.hpp"
+#include "geometry_func.h"
+#include "math_func.h"
 
 #include "../safeguards.h"
 

src/core/geometry_func.h

@@ -5,12 +5,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file geometry_func.hpp Geometry functions. */
+/** @file geometry_func.h Geometry functions. */
 
 #ifndef GEOMETRY_FUNC_HPP
 #define GEOMETRY_FUNC_HPP
 
-#include "geometry_type.hpp"
+#include "geometry_type.h"
 
 Dimension maxdim(const Dimension &d1, const Dimension &d2);
 

src/core/geometry_type.h

@@ -5,7 +5,7 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file geometry_type.hpp All geometry types in OpenTTD. */
+/** @file geometry_type.h All geometry types in OpenTTD. */
 
 #ifndef GEOMETRY_TYPE_HPP
 #define GEOMETRY_TYPE_HPP

src/core/kdtree.h

@@ -5,7 +5,7 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file kdtree.hpp K-d tree template specialised for 2-dimensional Manhattan geometry */
+/** @file kdtree.h K-d tree template specialised for 2-dimensional Manhattan geometry */
 
 #ifndef KDTREE_HPP
 #define KDTREE_HPP

src/core/math_func.cpp

@@ -8,7 +8,7 @@
 /** @file math_func.cpp Math functions. */
 
 #include "../stdafx.h"
-#include "math_func.hpp"
+#include "math_func.h"
 
 #include "../safeguards.h"
 

src/core/math_func.h

@@ -5,12 +5,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file math_func.hpp Integer math functions */
+/** @file math_func.h Integer math functions */
 
 #ifndef MATH_FUNC_HPP
 #define MATH_FUNC_HPP
 
-#include "strong_typedef_type.hpp"
+#include "strong_typedef_type.h"
 
 /**
  * Returns the absolute value of (scalar) variable.