diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0f0b33e65..3cb0284c8b 100644
--- a/CMakeLists.txt
+++ b/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)
diff --git a/src/3rdparty/md5/md5.cpp b/src/3rdparty/md5/md5.cpp
index 0e58d989b6..ff3825d779 100644
--- a/src/3rdparty/md5/md5.cpp
+++ b/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"
diff --git a/src/3rdparty/squirrel/squirrel/sqdebug.cpp b/src/3rdparty/squirrel/squirrel/sqdebug.cpp
index 6ea958bbdf..c8d60579fd 100644
--- a/src/3rdparty/squirrel/squirrel/sqdebug.cpp
+++ b/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"
diff --git a/src/3rdparty/squirrel/squirrel/sqmem.cpp b/src/3rdparty/squirrel/squirrel/sqmem.cpp
index f4fa6309ed..ed5c227b3b 100644
--- a/src/3rdparty/squirrel/squirrel/sqmem.cpp
+++ b/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
diff --git a/src/3rdparty/squirrel/squirrel/squtils.h b/src/3rdparty/squirrel/squirrel/squtils.h
index 2c7a343638..69cdd39318 100644
--- a/src/3rdparty/squirrel/squirrel/squtils.h
+++ b/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);
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2a6275cd35..c704d81d05 100644
--- a/src/CMakeLists.txt
+++ b/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
diff --git a/src/ai/CMakeLists.txt b/src/ai/CMakeLists.txt
index cab886b265..cac2447143 100644
--- a/src/ai/CMakeLists.txt
+++ b/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
)
diff --git a/src/ai/ai.hpp b/src/ai/ai.h
similarity index 97%
rename from src/ai/ai.hpp
rename to src/ai/ai.h
index b005f9c990..32d9a24f05 100644
--- a/src/ai/ai.hpp
+++ b/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 .
*/
-/** @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.
diff --git a/src/ai/ai_config.cpp b/src/ai/ai_config.cpp
index 55e9bc0ba1..7aa96c25ed 100644
--- a/src/ai/ai_config.cpp
+++ b/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"
diff --git a/src/ai/ai_config.hpp b/src/ai/ai_config.h
similarity index 92%
rename from src/ai/ai_config.hpp
rename to src/ai/ai_config.h
index b64020b4f0..f7d77143b1 100644
--- a/src/ai/ai_config.hpp
+++ b/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 .
*/
-/** @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 {
diff --git a/src/ai/ai_core.cpp b/src/ai/ai_core.cpp
index c910f22a83..f83f85e045 100644
--- a/src/ai/ai_core.cpp
+++ b/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"
diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp
index 4469974c63..581c969af2 100644
--- a/src/ai/ai_gui.cpp
+++ b/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"
diff --git a/src/ai/ai_gui.hpp b/src/ai/ai_gui.h
similarity index 92%
rename from src/ai/ai_gui.hpp
rename to src/ai/ai_gui.h
index 6eb28c3841..82feec2165 100644
--- a/src/ai/ai_gui.hpp
+++ b/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 .
*/
-/** @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
diff --git a/src/ai/ai_info.cpp b/src/ai/ai_info.cpp
index 2b3036c8ef..f7360bca4b 100644
--- a/src/ai/ai_info.cpp
+++ b/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"
diff --git a/src/ai/ai_info.hpp b/src/ai/ai_info.h
similarity index 94%
rename from src/ai/ai_info.hpp
rename to src/ai/ai_info.h
index df8e6b65d7..6f6f57a681 100644
--- a/src/ai/ai_info.hpp
+++ b/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 .
*/
-/** @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 {
diff --git a/src/ai/ai_instance.cpp b/src/ai/ai_instance.cpp
index 6591df5f5a..d1f58194cf 100644
--- a/src/ai/ai_instance.cpp
+++ b/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"
diff --git a/src/ai/ai_instance.hpp b/src/ai/ai_instance.h
similarity index 92%
rename from src/ai/ai_instance.hpp
rename to src/ai/ai_instance.h
index 015f966ed5..51fd6f945c 100644
--- a/src/ai/ai_instance.hpp
+++ b/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 .
*/
-/** @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 {
diff --git a/src/ai/ai_scanner.cpp b/src/ai/ai_scanner.cpp
index 1b3fdf193b..21b9fe0c0c 100644
--- a/src/ai/ai_scanner.cpp
+++ b/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"
diff --git a/src/ai/ai_scanner.hpp b/src/ai/ai_scanner.h
similarity index 95%
rename from src/ai/ai_scanner.hpp
rename to src/ai/ai_scanner.h
index a2c8a7280e..c1e4a78156 100644
--- a/src/ai/ai_scanner.hpp
+++ b/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 .
*/
-/** @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:
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp
index 1f5f986282..b67a9066e8 100644
--- a/src/aircraft_cmd.cpp
+++ b/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"
diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp
index b4f0180679..6592237bd4 100644
--- a/src/airport_gui.cpp
+++ b/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"
diff --git a/src/animated_tile.cpp b/src/animated_tile.cpp
index 0b5401564c..7260b80cdb 100644
--- a/src/animated_tile.cpp
+++ b/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"
diff --git a/src/articulated_vehicles.cpp b/src/articulated_vehicles.cpp
index 1f3a8a54b2..8b51d96920 100644
--- a/src/articulated_vehicles.cpp
+++ b/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"
diff --git a/src/autoreplace.cpp b/src/autoreplace.cpp
index 977b5e674a..848fb6e46f 100644
--- a/src/autoreplace.cpp
+++ b/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"
diff --git a/src/autoreplace_base.h b/src/autoreplace_base.h
index 3c9c32d893..7fb9e56d0e 100644
--- a/src/autoreplace_base.h
+++ b/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"
diff --git a/src/autoreplace_cmd.cpp b/src/autoreplace_cmd.cpp
index 5d6b6eeaaf..f35a9e35a5 100644
--- a/src/autoreplace_cmd.cpp
+++ b/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"
diff --git a/src/autoreplace_gui.cpp b/src/autoreplace_gui.cpp
index 64707259d3..fc83e42834 100644
--- a/src/autoreplace_gui.cpp
+++ b/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"
diff --git a/src/base_station_base.h b/src/base_station_base.h
index 82b6c967b2..e55bcb8509 100644
--- a/src/base_station_base.h
+++ b/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"
diff --git a/src/bitmap_type.h b/src/bitmap_type.h
index 4dd356e48a..33a34c259a 100644
--- a/src/bitmap_type.h
+++ b/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 .
*/
-/** @file bitmap_type.hpp Bitmap functions. */
+/** @file bitmap_type.h Bitmap functions. */
#ifndef BITMAP_TYPE_HPP
#define BITMAP_TYPE_HPP
diff --git a/src/blitter/32bpp_anim.cpp b/src/blitter/32bpp_anim.cpp
index 0c2612fcde..6dff67db3a 100644
--- a/src/blitter/32bpp_anim.cpp
+++ b/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"
diff --git a/src/blitter/32bpp_anim.hpp b/src/blitter/32bpp_anim.h
similarity index 97%
rename from src/blitter/32bpp_anim.hpp
rename to src/blitter/32bpp_anim.h
index b5b19d784e..4b8cb8839d 100644
--- a/src/blitter/32bpp_anim.hpp
+++ b/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 .
*/
-/** @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 {
diff --git a/src/blitter/32bpp_anim_sse2.cpp b/src/blitter/32bpp_anim_sse2.cpp
index b166037ddd..a7d1213920 100644
--- a/src/blitter/32bpp_anim_sse2.cpp
+++ b/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"
diff --git a/src/blitter/32bpp_anim_sse2.hpp b/src/blitter/32bpp_anim_sse2.h
similarity index 91%
rename from src/blitter/32bpp_anim_sse2.hpp
rename to src/blitter/32bpp_anim_sse2.h
index 669cef80a7..0b0f53ef7a 100644
--- a/src/blitter/32bpp_anim_sse2.hpp
+++ b/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 .
*/
-/** @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 {
diff --git a/src/blitter/32bpp_anim_sse4.cpp b/src/blitter/32bpp_anim_sse4.cpp
index 031f0cc985..12c9529d03 100644
--- a/src/blitter/32bpp_anim_sse4.cpp
+++ b/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"
diff --git a/src/blitter/32bpp_anim_sse4.hpp b/src/blitter/32bpp_anim_sse4.h
similarity index 92%
rename from src/blitter/32bpp_anim_sse4.hpp
rename to src/blitter/32bpp_anim_sse4.h
index 379e7e9647..77e623ea50 100644
--- a/src/blitter/32bpp_anim_sse4.hpp
+++ b/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 .
*/
-/** @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
diff --git a/src/blitter/32bpp_base.cpp b/src/blitter/32bpp_base.cpp
index eef00b404d..159b24a481 100644
--- a/src/blitter/32bpp_base.cpp
+++ b/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"
diff --git a/src/blitter/32bpp_base.hpp b/src/blitter/32bpp_base.h
similarity index 97%
rename from src/blitter/32bpp_base.hpp
rename to src/blitter/32bpp_base.h
index f5d8a30c4e..b58c8a43a3 100644
--- a/src/blitter/32bpp_base.hpp
+++ b/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 .
*/
-/** @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. */
diff --git a/src/blitter/32bpp_optimized.cpp b/src/blitter/32bpp_optimized.cpp
index 15b607a9a7..c7728d1923 100644
--- a/src/blitter/32bpp_optimized.cpp
+++ b/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"
diff --git a/src/blitter/32bpp_optimized.hpp b/src/blitter/32bpp_optimized.h
similarity index 95%
rename from src/blitter/32bpp_optimized.hpp
rename to src/blitter/32bpp_optimized.h
index e40a0ec667..4a69ae99a4 100644
--- a/src/blitter/32bpp_optimized.hpp
+++ b/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 .
*/
-/** @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 {
diff --git a/src/blitter/32bpp_simple.cpp b/src/blitter/32bpp_simple.cpp
index 00c0497109..54f9006311 100644
--- a/src/blitter/32bpp_simple.cpp
+++ b/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"
diff --git a/src/blitter/32bpp_simple.hpp b/src/blitter/32bpp_simple.h
similarity index 94%
rename from src/blitter/32bpp_simple.hpp
rename to src/blitter/32bpp_simple.h
index df154ce57d..7e4ab44d5f 100644
--- a/src/blitter/32bpp_simple.hpp
+++ b/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 .
*/
-/** @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 {
diff --git a/src/blitter/32bpp_sse2.cpp b/src/blitter/32bpp_sse2.cpp
index 1638127b56..6b2d65118e 100644
--- a/src/blitter/32bpp_sse2.cpp
+++ b/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"
diff --git a/src/blitter/32bpp_sse2.hpp b/src/blitter/32bpp_sse2.h
similarity index 98%
rename from src/blitter/32bpp_sse2.hpp
rename to src/blitter/32bpp_sse2.h
index fa643dd3cd..07caf917a4 100644
--- a/src/blitter/32bpp_sse2.hpp
+++ b/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 .
*/
-/** @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
diff --git a/src/blitter/32bpp_sse4.cpp b/src/blitter/32bpp_sse4.cpp
index aab9edb65d..8ab5c81cdb 100644
--- a/src/blitter/32bpp_sse4.cpp
+++ b/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"
diff --git a/src/blitter/32bpp_sse4.hpp b/src/blitter/32bpp_sse4.h
similarity index 95%
rename from src/blitter/32bpp_sse4.hpp
rename to src/blitter/32bpp_sse4.h
index deb4fbed92..26b88fb3d8 100644
--- a/src/blitter/32bpp_sse4.hpp
+++ b/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 .
*/
-/** @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 {
diff --git a/src/blitter/32bpp_sse_func.hpp b/src/blitter/32bpp_sse_func.h
similarity index 99%
rename from src/blitter/32bpp_sse_func.hpp
rename to src/blitter/32bpp_sse_func.h
index 93ec415dda..4892d6c54a 100644
--- a/src/blitter/32bpp_sse_func.hpp
+++ b/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 .
*/
-/** @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
diff --git a/src/blitter/32bpp_sse_type.h b/src/blitter/32bpp_sse_type.h
index d3a73df1c3..6d29946243 100644
--- a/src/blitter/32bpp_sse_type.h
+++ b/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
#elif (SSE_VERSION == 3)
diff --git a/src/blitter/32bpp_ssse3.cpp b/src/blitter/32bpp_ssse3.cpp
index 7d38272c00..d50a8ae784 100644
--- a/src/blitter/32bpp_ssse3.cpp
+++ b/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"
diff --git a/src/blitter/32bpp_ssse3.hpp b/src/blitter/32bpp_ssse3.h
similarity index 95%
rename from src/blitter/32bpp_ssse3.hpp
rename to src/blitter/32bpp_ssse3.h
index c95095d4df..574342ae16 100644
--- a/src/blitter/32bpp_ssse3.hpp
+++ b/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 .
*/
-/** @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 {
diff --git a/src/blitter/40bpp_anim.cpp b/src/blitter/40bpp_anim.cpp
index e65a1d7151..933760ef0f 100644
--- a/src/blitter/40bpp_anim.cpp
+++ b/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"
diff --git a/src/blitter/40bpp_anim.hpp b/src/blitter/40bpp_anim.h
similarity index 95%
rename from src/blitter/40bpp_anim.hpp
rename to src/blitter/40bpp_anim.h
index 4371100914..c85d5491ee 100644
--- a/src/blitter/40bpp_anim.hpp
+++ b/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 .
*/
-/** @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 {
diff --git a/src/blitter/8bpp_base.cpp b/src/blitter/8bpp_base.cpp
index a972a27d3d..91e23ccdb2 100644
--- a/src/blitter/8bpp_base.cpp
+++ b/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"
diff --git a/src/blitter/8bpp_base.hpp b/src/blitter/8bpp_base.h
similarity index 95%
rename from src/blitter/8bpp_base.hpp
rename to src/blitter/8bpp_base.h
index 5a76d79521..96853ec139 100644
--- a/src/blitter/8bpp_base.hpp
+++ b/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 .
*/
-/** @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 {
diff --git a/src/blitter/8bpp_optimized.cpp b/src/blitter/8bpp_optimized.cpp
index 3758e3a80a..6658566c00 100644
--- a/src/blitter/8bpp_optimized.cpp
+++ b/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"
diff --git a/src/blitter/8bpp_optimized.hpp b/src/blitter/8bpp_optimized.h
similarity index 93%
rename from src/blitter/8bpp_optimized.hpp
rename to src/blitter/8bpp_optimized.h
index 169dee0c26..f08142827e 100644
--- a/src/blitter/8bpp_optimized.hpp
+++ b/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 .
*/
-/** @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 {
diff --git a/src/blitter/8bpp_simple.cpp b/src/blitter/8bpp_simple.cpp
index a80ceba115..76ff3b1723 100644
--- a/src/blitter/8bpp_simple.cpp
+++ b/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"
diff --git a/src/blitter/8bpp_simple.hpp b/src/blitter/8bpp_simple.h
similarity index 92%
rename from src/blitter/8bpp_simple.hpp
rename to src/blitter/8bpp_simple.h
index 455d76d937..601851d3d2 100644
--- a/src/blitter/8bpp_simple.hpp
+++ b/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 .
*/
-/** @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 {
diff --git a/src/blitter/CMakeLists.txt b/src/blitter/CMakeLists.txt
index 50faefbc1c..436af2a40e 100644
--- a/src/blitter/CMakeLists.txt
+++ b/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
)
diff --git a/src/blitter/base.hpp b/src/blitter/base.h
similarity index 98%
rename from src/blitter/base.hpp
rename to src/blitter/base.h
index 26ed39eb6d..c2643591c1 100644
--- a/src/blitter/base.hpp
+++ b/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 .
*/
-/** @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 {
diff --git a/src/blitter/common.hpp b/src/blitter/common.h
similarity index 97%
rename from src/blitter/common.hpp
rename to src/blitter/common.h
index eebdfc05e7..ea5387f298 100644
--- a/src/blitter/common.hpp
+++ b/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 .
*/
-/** @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
diff --git a/src/blitter/factory.hpp b/src/blitter/factory.h
similarity index 98%
rename from src/blitter/factory.hpp
rename to src/blitter/factory.h
index 5889cca4f2..e0358ea251 100644
--- a/src/blitter/factory.hpp
+++ b/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 .
*/
-/** @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"
diff --git a/src/blitter/null.cpp b/src/blitter/null.cpp
index f73b5ae331..543eae004e 100644
--- a/src/blitter/null.cpp
+++ b/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"
diff --git a/src/blitter/null.hpp b/src/blitter/null.h
similarity index 96%
rename from src/blitter/null.hpp
rename to src/blitter/null.h
index 61c5cab9de..45344b5122 100644
--- a/src/blitter/null.hpp
+++ b/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 .
*/
-/** @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 {
diff --git a/src/bmp.cpp b/src/bmp.cpp
index eca61335dd..49dea67ff0 100644
--- a/src/bmp.cpp
+++ b/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"
diff --git a/src/bootstrap_gui.cpp b/src/bootstrap_gui.cpp
index 4a1b72d9c5..df7b6fa38e 100644
--- a/src/bootstrap_gui.cpp
+++ b/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};
diff --git a/src/bridge_gui.cpp b/src/bridge_gui.cpp
index fec724bb4c..221bd3da24 100644
--- a/src/bridge_gui.cpp
+++ b/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"
diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp
index 63ce1709e5..0bf6503ea5 100644
--- a/src/build_vehicle_gui.cpp
+++ b/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"
diff --git a/src/cargo_type.h b/src/cargo_type.h
index 871f958790..226f00bef6 100644
--- a/src/cargo_type.h
+++ b/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.
diff --git a/src/cargomonitor.h b/src/cargomonitor.h
index 614f10002e..8e221443cd 100644
--- a/src/cargomonitor.h
+++ b/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;
diff --git a/src/cargopacket.cpp b/src/cargopacket.cpp
index fc5031d7eb..5257e393e5 100644
--- a/src/cargopacket.cpp
+++ b/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"
diff --git a/src/cargopacket.h b/src/cargopacket.h
index 6498760822..11943a0d0b 100644
--- a/src/cargopacket.h
+++ b/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. */
diff --git a/src/cargotype.cpp b/src/cargotype.cpp
index dafb4e1164..0cba5e8c3e 100644
--- a/src/cargotype.cpp
+++ b/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"
diff --git a/src/cargotype.h b/src/cargotype.h
index da4e663495..bf5d91cad5 100644
--- a/src/cargotype.h
+++ b/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;
diff --git a/src/cheat_gui.cpp b/src/cheat_gui.cpp
index 5033faabfd..0bacf7a0f2 100644
--- a/src/cheat_gui.cpp
+++ b/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"
diff --git a/src/clear_cmd.cpp b/src/clear_cmd.cpp
index 5cd00738df..36f9e7c88d 100644
--- a/src/clear_cmd.cpp
+++ b/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"
diff --git a/src/command.cpp b/src/command.cpp
index 48fa93ffcb..3e0aa5df6d 100644
--- a/src/command.cpp
+++ b/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"
diff --git a/src/command_func.h b/src/command_func.h
index 47ce1ffe24..0c28106e20 100644
--- a/src/command_func.h
+++ b/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"
/**
diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp
index d6166d4571..9cfb193784 100644
--- a/src/company_cmd.cpp
+++ b/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"
diff --git a/src/company_gui.cpp b/src/company_gui.cpp
index 0e4ac392a4..cff367b3b0 100644
--- a/src/company_gui.cpp
+++ b/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"
diff --git a/src/company_manager_face.h b/src/company_manager_face.h
index 113a4c728b..ee70f507d9 100644
--- a/src/company_manager_face.h
+++ b/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"
diff --git a/src/company_type.h b/src/company_type.h
index ff22a4d0dc..137b3e940d 100644
--- a/src/company_type.h
+++ b/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.
diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp
index 9c72b8fe3e..498bd54f66 100644
--- a/src/console_cmds.cpp
+++ b/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"
diff --git a/src/console_func.h b/src/console_func.h
index bf7993b78a..4f1331c6b9 100644
--- a/src/console_func.h
+++ b/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;
diff --git a/src/console_gui.cpp b/src/console_gui.cpp
index 0e3ac41a16..c725b14e14 100644
--- a/src/console_gui.cpp
+++ b/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"
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 6307dd2dff..97f101d3f7 100644
--- a/src/core/CMakeLists.txt
+++ b/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
)
diff --git a/src/core/alloc_func.hpp b/src/core/alloc_func.h
similarity index 98%
rename from src/core/alloc_func.hpp
rename to src/core/alloc_func.h
index 0e3920a184..51a5e52e04 100644
--- a/src/core/alloc_func.hpp
+++ b/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 .
*/
-/** @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
diff --git a/src/core/alloc_type.hpp b/src/core/alloc_type.h
similarity index 96%
rename from src/core/alloc_type.hpp
rename to src/core/alloc_type.h
index 173c859f58..02beb5a90f 100644
--- a/src/core/alloc_type.hpp
+++ b/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 .
*/
-/** @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
diff --git a/src/core/backup_type.hpp b/src/core/backup_type.h
similarity index 98%
rename from src/core/backup_type.hpp
rename to src/core/backup_type.h
index 62e6d31329..799373923a 100644
--- a/src/core/backup_type.hpp
+++ b/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 .
*/
-/** @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
diff --git a/src/core/bitmath_func.hpp b/src/core/bitmath_func.h
similarity index 99%
rename from src/core/bitmath_func.hpp
rename to src/core/bitmath_func.h
index c7f7e0c072..63362853ba 100644
--- a/src/core/bitmath_func.hpp
+++ b/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 .
*/
-/** @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
diff --git a/src/core/container_func.hpp b/src/core/container_func.h
similarity index 95%
rename from src/core/container_func.hpp
rename to src/core/container_func.h
index 5a713649aa..b00d709a2f 100644
--- a/src/core/container_func.hpp
+++ b/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 .
*/
-/** @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
diff --git a/src/core/endian_func.hpp b/src/core/endian_func.h
similarity index 91%
rename from src/core/endian_func.hpp
rename to src/core/endian_func.h
index b6cdebda16..c6becc2d1c 100644
--- a/src/core/endian_func.hpp
+++ b/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 .
*/
-/** @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
diff --git a/src/core/endian_type.hpp b/src/core/endian_type.h
similarity index 92%
rename from src/core/endian_type.hpp
rename to src/core/endian_type.h
index 025bae8987..c52045ec67 100644
--- a/src/core/endian_type.hpp
+++ b/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 .
*/
-/** @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
diff --git a/src/core/enum_type.hpp b/src/core/enum_type.h
similarity index 98%
rename from src/core/enum_type.hpp
rename to src/core/enum_type.h
index e8a9d0d76e..4bcf63c3c5 100644
--- a/src/core/enum_type.hpp
+++ b/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 .
*/
-/** @file enum_type.hpp Type (helpers) for enums */
+/** @file enum_type.h Type (helpers) for enums */
#ifndef ENUM_TYPE_HPP
#define ENUM_TYPE_HPP
diff --git a/src/core/format.hpp b/src/core/format.h
similarity index 94%
rename from src/core/format.hpp
rename to src/core/format.h
index d0267e4394..379a52a285 100644
--- a/src/core/format.hpp
+++ b/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 .
*/
-/** @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
struct fmt::formatter::value>> : fmt::formatter::type> {
diff --git a/src/core/geometry_func.cpp b/src/core/geometry_func.cpp
index dccef72ecc..fe34ddcf94 100644
--- a/src/core/geometry_func.cpp
+++ b/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"
diff --git a/src/core/geometry_func.hpp b/src/core/geometry_func.h
similarity index 92%
rename from src/core/geometry_func.hpp
rename to src/core/geometry_func.h
index 175a8a2ba7..0998956e35 100644
--- a/src/core/geometry_func.hpp
+++ b/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 .
*/
-/** @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);
diff --git a/src/core/geometry_type.hpp b/src/core/geometry_type.h
similarity index 99%
rename from src/core/geometry_type.hpp
rename to src/core/geometry_type.h
index c19932a160..0223618590 100644
--- a/src/core/geometry_type.hpp
+++ b/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 .
*/
-/** @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
diff --git a/src/core/kdtree.hpp b/src/core/kdtree.h
similarity index 99%
rename from src/core/kdtree.hpp
rename to src/core/kdtree.h
index 5dc3a1263d..a417b81c3b 100644
--- a/src/core/kdtree.hpp
+++ b/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 .
*/
-/** @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
diff --git a/src/core/math_func.cpp b/src/core/math_func.cpp
index f094e9ece8..366fea60e0 100644
--- a/src/core/math_func.cpp
+++ b/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"
diff --git a/src/core/math_func.hpp b/src/core/math_func.h
similarity index 99%
rename from src/core/math_func.hpp
rename to src/core/math_func.h
index b50e84d299..2ce7738c51 100644
--- a/src/core/math_func.hpp
+++ b/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 .
*/
-/** @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.
diff --git a/src/core/mem_func.hpp b/src/core/mem_func.h
similarity index 95%
rename from src/core/mem_func.hpp
rename to src/core/mem_func.h
index 26bd7c6b7c..7d7fcd2bb3 100644
--- a/src/core/mem_func.hpp
+++ b/src/core/mem_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 .
*/
-/** @file mem_func.hpp Functions related to memory operations. */
+/** @file mem_func.h Functions related to memory operations. */
#ifndef MEM_FUNC_HPP
#define MEM_FUNC_HPP
-#include "math_func.hpp"
+#include "math_func.h"
/**
* Type-safe version of memcpy().
diff --git a/src/core/multimap.hpp b/src/core/multimap.h
similarity index 99%
rename from src/core/multimap.hpp
rename to src/core/multimap.h
index 9a646414d1..a414098367 100644
--- a/src/core/multimap.hpp
+++ b/src/core/multimap.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 .
*/
-/** @file multimap.hpp Multimap with deterministic ordering of items with equal keys. */
+/** @file multimap.h Multimap with deterministic ordering of items with equal keys. */
#ifndef MULTIMAP_HPP
#define MULTIMAP_HPP
diff --git a/src/core/overflowsafe_type.hpp b/src/core/overflowsafe_type.h
similarity index 99%
rename from src/core/overflowsafe_type.hpp
rename to src/core/overflowsafe_type.h
index 8e40973192..6fc65d9b8f 100644
--- a/src/core/overflowsafe_type.hpp
+++ b/src/core/overflowsafe_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 .
*/
-/** @file overflowsafe_type.hpp An overflow safe integer-like type. */
+/** @file overflowsafe_type.h An overflow safe integer-like type. */
#ifndef OVERFLOWSAFE_TYPE_HPP
#define OVERFLOWSAFE_TYPE_HPP
-#include "math_func.hpp"
+#include "math_func.h"
#ifdef __has_builtin
diff --git a/src/core/pool_func.cpp b/src/core/pool_func.cpp
index e59a2de447..3296a74bc9 100644
--- a/src/core/pool_func.cpp
+++ b/src/core/pool_func.cpp
@@ -8,7 +8,7 @@
/** @file pool_func.cpp Implementation of PoolBase methods. */
#include "../stdafx.h"
-#include "pool_type.hpp"
+#include "pool_type.h"
#include "../safeguards.h"
diff --git a/src/core/pool_func.hpp b/src/core/pool_func.h
similarity index 94%
rename from src/core/pool_func.hpp
rename to src/core/pool_func.h
index 51962c35ba..320861b7a8 100644
--- a/src/core/pool_func.hpp
+++ b/src/core/pool_func.h
@@ -5,17 +5,17 @@
* 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 .
*/
-/** @file pool_func.hpp Some methods of Pool are placed here in order to reduce compilation time and binary size. */
+/** @file pool_func.h Some methods of Pool are placed here in order to reduce compilation time and binary size. */
#ifndef POOL_FUNC_HPP
#define POOL_FUNC_HPP
-#include "alloc_func.hpp"
-#include "mem_func.hpp"
-#include "pool_type.hpp"
+#include "alloc_func.h"
+#include "mem_func.h"
+#include "pool_type.h"
#include "../error_func.h"
-#include "../saveload/saveload_error.hpp" // SlErrorCorruptFmt
+#include "../saveload/saveload_error.h" // SlErrorCorruptFmt
/**
* Helper for defining the method's signature.
@@ -219,7 +219,7 @@ DEFINE_POOL_METHOD(void)::CleanPool()
/**
* Force instantiation of pool methods so we don't get linker errors.
- * Only methods accessed from methods defined in pool.hpp need to be
+ * Only methods accessed from methods defined in pool.h need to be
* forcefully instantiated.
*/
#define INSTANTIATE_POOL_METHODS(name) \
diff --git a/src/core/pool_type.hpp b/src/core/pool_type.h
similarity index 98%
rename from src/core/pool_type.hpp
rename to src/core/pool_type.h
index 00547cf7c1..08ea404799 100644
--- a/src/core/pool_type.hpp
+++ b/src/core/pool_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 .
*/
-/** @file pool_type.hpp Definition of Pool, structure used to access PoolItems, and PoolItem, base structure for Vehicle, Town, and other indexed items. */
+/** @file pool_type.h Definition of Pool, structure used to access PoolItems, and PoolItem, base structure for Vehicle, Town, and other indexed items. */
#ifndef POOL_TYPE_HPP
#define POOL_TYPE_HPP
-#include "enum_type.hpp"
+#include "enum_type.h"
/** Various types of a pool. */
enum PoolType {
diff --git a/src/core/random_func.cpp b/src/core/random_func.cpp
index dfbd2311fe..6c517b6dcc 100644
--- a/src/core/random_func.cpp
+++ b/src/core/random_func.cpp
@@ -8,8 +8,8 @@
/** @file random_func.cpp Implementation of the pseudo random generator. */
#include "../stdafx.h"
-#include "random_func.hpp"
-#include "bitmath_func.hpp"
+#include "random_func.h"
+#include "bitmath_func.h"
#include "../debug.h"
#ifdef RANDOM_DEBUG
diff --git a/src/core/random_func.hpp b/src/core/random_func.h
similarity index 98%
rename from src/core/random_func.hpp
rename to src/core/random_func.h
index ef3f4569b2..bce7b7bea3 100644
--- a/src/core/random_func.hpp
+++ b/src/core/random_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 .
*/
-/** @file random_func.hpp Pseudo random number generator. */
+/** @file random_func.h Pseudo random number generator. */
#ifndef RANDOM_FUNC_HPP
#define RANDOM_FUNC_HPP
diff --git a/src/core/smallstack_type.hpp b/src/core/smallstack_type.h
similarity index 98%
rename from src/core/smallstack_type.hpp
rename to src/core/smallstack_type.h
index 503d027bf3..f5c9edee7b 100644
--- a/src/core/smallstack_type.hpp
+++ b/src/core/smallstack_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 .
*/
-/** @file smallstack_type.hpp Minimal stack that uses a pool to avoid pointers and doesn't allocate any heap memory if there is only one valid item. */
+/** @file smallstack_type.h Minimal stack that uses a pool to avoid pointers and doesn't allocate any heap memory if there is only one valid item. */
#ifndef SMALLSTACK_TYPE_HPP
#define SMALLSTACK_TYPE_HPP
diff --git a/src/core/strong_typedef_type.hpp b/src/core/strong_typedef_type.h
similarity index 98%
rename from src/core/strong_typedef_type.hpp
rename to src/core/strong_typedef_type.h
index e1baeee311..311acd6b1e 100644
--- a/src/core/strong_typedef_type.hpp
+++ b/src/core/strong_typedef_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 .
*/
-/** @file strong_typedef_type.hpp Type (helpers) for making a strong typedef that is a distinct type. */
+/** @file strong_typedef_type.h Type (helpers) for making a strong typedef that is a distinct type. */
#ifndef STRONG_TYPEDEF_TYPE_HPP
#define STRONG_TYPEDEF_TYPE_HPP
diff --git a/src/cpu.cpp b/src/cpu.cpp
index f1b498b6c1..bf75f392b1 100644
--- a/src/cpu.cpp
+++ b/src/cpu.cpp
@@ -8,7 +8,7 @@
/** @file cpu.cpp OS/CPU/compiler dependent CPU specific calls. */
#include "stdafx.h"
-#include "core/bitmath_func.hpp"
+#include "core/bitmath_func.h"
#include "safeguards.h"
diff --git a/src/crashlog.cpp b/src/crashlog.cpp
index 682d35f7c1..7a599376da 100644
--- a/src/crashlog.cpp
+++ b/src/crashlog.cpp
@@ -12,9 +12,9 @@
#include "survey.h"
#include "gamelog.h"
#include "map_func.h"
-#include "music/music_driver.hpp"
-#include "sound/sound_driver.hpp"
-#include "video/video_driver.hpp"
+#include "music/music_driver.h"
+#include "sound/sound_driver.h"
+#include "video/video_driver.h"
#include "saveload/saveload.h"
#include "screenshot.h"
#include "network/network_survey.h"
@@ -25,7 +25,7 @@
#include "company_func.h"
#include "3rdparty/fmt/chrono.h"
#include "3rdparty/fmt/std.h"
-#include "core/format.hpp"
+#include "core/format.h"
#include "safeguards.h"
diff --git a/src/currency.cpp b/src/currency.cpp
index 323d302582..4539af87cc 100644
--- a/src/currency.cpp
+++ b/src/currency.cpp
@@ -8,7 +8,7 @@
/** @file currency.cpp Support for different currencies. */
#include "stdafx.h"
-#include "core/bitmath_func.hpp"
+#include "core/bitmath_func.h"
#include "currency.h"
#include "news_func.h"
diff --git a/src/date_gui.cpp b/src/date_gui.cpp
index 035b820ec6..fcd557df71 100644
--- a/src/date_gui.cpp
+++ b/src/date_gui.cpp
@@ -13,7 +13,7 @@
#include "window_func.h"
#include "window_gui.h"
#include "date_gui.h"
-#include "core/geometry_func.hpp"
+#include "core/geometry_func.h"
#include "widgets/dropdown_type.h"
#include "widgets/date_widget.h"
diff --git a/src/debug.h b/src/debug.h
index a46bb8ec53..7365d6053f 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -12,7 +12,7 @@
#include "cpu.h"
#include
-#include "core/format.hpp"
+#include "core/format.h"
/* Debugging messages policy:
* These should be the severities used for direct Debug() calls
diff --git a/src/depot.cpp b/src/depot.cpp
index 13317e8a35..2fd0cd856a 100644
--- a/src/depot.cpp
+++ b/src/depot.cpp
@@ -12,7 +12,7 @@
#include "order_backup.h"
#include "order_func.h"
#include "window_func.h"
-#include "core/pool_func.hpp"
+#include "core/pool_func.h"
#include "vehicle_gui.h"
#include "vehiclelist.h"
diff --git a/src/depot_base.h b/src/depot_base.h
index 1d8330fc74..0c3e0c0f64 100644
--- a/src/depot_base.h
+++ b/src/depot_base.h
@@ -11,7 +11,7 @@
#define DEPOT_BASE_H
#include "depot_map.h"
-#include "core/pool_type.hpp"
+#include "core/pool_type.h"
#include "timer/timer_game_calendar.h"
typedef Pool DepotPool;
diff --git a/src/depot_gui.cpp b/src/depot_gui.cpp
index f523825b85..b99712e97e 100644
--- a/src/depot_gui.cpp
+++ b/src/depot_gui.cpp
@@ -31,7 +31,7 @@
#include "depot_cmd.h"
#include "train_cmd.h"
#include "vehicle_cmd.h"
-#include "core/geometry_func.hpp"
+#include "core/geometry_func.h"
#include "widgets/depot_widget.h"
diff --git a/src/direction_type.h b/src/direction_type.h
index fb08c224af..05771b7ad1 100644
--- a/src/direction_type.h
+++ b/src/direction_type.h
@@ -10,7 +10,7 @@
#ifndef DIRECTION_TYPE_H
#define DIRECTION_TYPE_H
-#include "core/enum_type.hpp"
+#include "core/enum_type.h"
/**
* Defines the 8 directions on the map.
diff --git a/src/disaster_vehicle.cpp b/src/disaster_vehicle.cpp
index bfc4c58ebd..2144a27d7e 100644
--- a/src/disaster_vehicle.cpp
+++ b/src/disaster_vehicle.cpp
@@ -40,11 +40,11 @@
#include "effectvehicle_func.h"
#include "roadveh.h"
#include "train.h"
-#include "ai/ai.hpp"
-#include "game/game.hpp"
+#include "ai/ai.h"
+#include "game/game.h"
#include "company_base.h"
-#include "core/random_func.hpp"
-#include "core/backup_type.hpp"
+#include "core/random_func.h"
+#include "core/backup_type.h"
#include "landscape_cmd.h"
#include "timer/timer.h"
#include "timer/timer_game_calendar.h"
diff --git a/src/driver.cpp b/src/driver.cpp
index 5d3f2addd1..0afdf9e321 100644
--- a/src/driver.cpp
+++ b/src/driver.cpp
@@ -11,9 +11,9 @@
#include "debug.h"
#include "error.h"
#include "error_func.h"
-#include "sound/sound_driver.hpp"
-#include "music/music_driver.hpp"
-#include "video/video_driver.hpp"
+#include "sound/sound_driver.h"
+#include "music/music_driver.h"
+#include "video/video_driver.h"
#include "string_func.h"
#include "table/strings.h"
#include "fileio_func.h"
diff --git a/src/driver.h b/src/driver.h
index 4683784266..02ef4bec7c 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -10,7 +10,7 @@
#ifndef DRIVER_H
#define DRIVER_H
-#include "core/enum_type.hpp"
+#include "core/enum_type.h"
#include "string_type.h"
const char *GetDriverParam(const StringList &parm, const char *name);
diff --git a/src/economy.cpp b/src/economy.cpp
index 8d15c7504a..3173df3be1 100644
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -15,12 +15,12 @@
#include "news_func.h"
#include "network/network.h"
#include "network/network_func.h"
-#include "ai/ai.hpp"
+#include "ai/ai.h"
#include "aircraft.h"
#include "train.h"
#include "newgrf_engine.h"
#include "engine_base.h"
-#include "ground_vehicle.hpp"
+#include "ground_vehicle.h"
#include "newgrf_cargo.h"
#include "newgrf_sound.h"
#include "newgrf_industrytiles.h"
@@ -39,12 +39,12 @@
#include "station_base.h"
#include "waypoint_base.h"
#include "economy_base.h"
-#include "core/pool_func.hpp"
-#include "core/backup_type.hpp"
-#include "core/container_func.hpp"
+#include "core/pool_func.h"
+#include "core/backup_type.h"
+#include "core/container_func.h"
#include "cargo_type.h"
#include "water.h"
-#include "game/game.hpp"
+#include "game/game.h"
#include "cargomonitor.h"
#include "goal_base.h"
#include "story_base.h"
diff --git a/src/economy_type.h b/src/economy_type.h
index 763634ac3b..053fc2ed53 100644
--- a/src/economy_type.h
+++ b/src/economy_type.h
@@ -10,8 +10,8 @@
#ifndef ECONOMY_TYPE_H
#define ECONOMY_TYPE_H
-#include "core/overflowsafe_type.hpp"
-#include "core/enum_type.hpp"
+#include "core/overflowsafe_type.h"
+#include "core/enum_type.h"
typedef OverflowSafeInt64 Money;
diff --git a/src/effectvehicle.cpp b/src/effectvehicle.cpp
index 3db32f9d97..299838ab45 100644
--- a/src/effectvehicle.cpp
+++ b/src/effectvehicle.cpp
@@ -9,7 +9,7 @@
#include "stdafx.h"
#include "landscape.h"
-#include "core/random_func.hpp"
+#include "core/random_func.h"
#include "industry_map.h"
#include "vehicle_func.h"
#include "sound_func.h"
diff --git a/src/engine.cpp b/src/engine.cpp
index 7de1525c1c..e31274adf4 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -15,12 +15,12 @@
#include "newgrf.h"
#include "newgrf_engine.h"
#include "strings_func.h"
-#include "core/random_func.hpp"
+#include "core/random_func.h"
#include "window_func.h"
#include "autoreplace_gui.h"
#include "string_func.h"
-#include "ai/ai.hpp"
-#include "core/pool_func.hpp"
+#include "ai/ai.h"
+#include "core/pool_func.h"
#include "engine_gui.h"
#include "engine_func.h"
#include "engine_base.h"
diff --git a/src/engine_base.h b/src/engine_base.h
index f52d3bd3b7..50ea8d94c4 100644
--- a/src/engine_base.h
+++ b/src/engine_base.h
@@ -12,7 +12,7 @@
#include "engine_type.h"
#include "vehicle_type.h"
-#include "core/pool_type.hpp"
+#include "core/pool_type.h"
#include "newgrf_commons.h"
#include "timer/timer_game_calendar.h"
diff --git a/src/error.h b/src/error.h
index 0f1964fb80..e7381adb95 100644
--- a/src/error.h
+++ b/src/error.h
@@ -13,7 +13,7 @@
#include "strings_type.h"
#include "company_type.h"
#include "command_type.h"
-#include "core/geometry_type.hpp"
+#include "core/geometry_type.h"
#include
diff --git a/src/error_gui.cpp b/src/error_gui.cpp
index 6fed8398c7..c44dd7dfb5 100644
--- a/src/error_gui.cpp
+++ b/src/error_gui.cpp
@@ -8,8 +8,8 @@
/** @file error_gui.cpp GUI related to errors. */
#include "stdafx.h"
-#include "core/geometry_func.hpp"
-#include "core/mem_func.hpp"
+#include "core/geometry_func.h"
+#include "core/mem_func.h"
#include "landscape.h"
#include "newgrf_text.h"
#include "error.h"
diff --git a/src/fileio.cpp b/src/fileio.cpp
index 05aa8718b7..8f35edc123 100644
--- a/src/fileio.cpp
+++ b/src/fileio.cpp
@@ -9,7 +9,7 @@
#include "stdafx.h"
#include "fileio_func.h"
-#include "spriteloader/spriteloader.hpp"
+#include "spriteloader/spriteloader.h"
#include "debug.h"
#include "fios.h"
#include "string_func.h"
diff --git a/src/fileio_func.h b/src/fileio_func.h
index 6f9bd65442..e6c07acbe2 100644
--- a/src/fileio_func.h
+++ b/src/fileio_func.h
@@ -10,7 +10,7 @@
#ifndef FILEIO_FUNC_H
#define FILEIO_FUNC_H
-#include "core/enum_type.hpp"
+#include "core/enum_type.h"
#include "fileio_type.h"
void FioFCloseFile(FILE *f);
diff --git a/src/fileio_type.h b/src/fileio_type.h
index 66d502d88a..2b19ba57b6 100644
--- a/src/fileio_type.h
+++ b/src/fileio_type.h
@@ -10,7 +10,7 @@
#ifndef FILEIO_TYPE_H
#define FILEIO_TYPE_H
-#include "core/enum_type.hpp"
+#include "core/enum_type.h"
/** The different abstract types of files that the system knows about. */
enum AbstractFileType {
diff --git a/src/fios_gui.cpp b/src/fios_gui.cpp
index 26b182184c..5f58cd78de 100644
--- a/src/fios_gui.cpp
+++ b/src/fios_gui.cpp
@@ -24,7 +24,7 @@
#include "engine_func.h"
#include "landscape_type.h"
#include "timer/timer_game_calendar.h"
-#include "core/geometry_func.hpp"
+#include "core/geometry_func.h"
#include "gamelog.h"
#include "stringfilter_type.h"
#include "misc_cmd.h"
diff --git a/src/fontcache.cpp b/src/fontcache.cpp
index 2a5772fc3b..e2cba77c9b 100644
--- a/src/fontcache.cpp
+++ b/src/fontcache.cpp
@@ -10,7 +10,7 @@
#include "stdafx.h"
#include "fontcache.h"
#include "fontdetection.h"
-#include "blitter/factory.hpp"
+#include "blitter/factory.h"
#include "gfx_layout.h"
#include "fontcache/spritefontcache.h"
#include "openttd.h"
diff --git a/src/fontcache/freetypefontcache.cpp b/src/fontcache/freetypefontcache.cpp
index bcbfbc2a52..608f1a7444 100644
--- a/src/fontcache/freetypefontcache.cpp
+++ b/src/fontcache/freetypefontcache.cpp
@@ -11,8 +11,8 @@
#include "../debug.h"
#include "../fontcache.h"
#include "../fontdetection.h"
-#include "../blitter/factory.hpp"
-#include "../core/math_func.hpp"
+#include "../blitter/factory.h"
+#include "../core/math_func.h"
#include "../zoom_func.h"
#include "../fileio_func.h"
#include "../error_func.h"
diff --git a/src/fontcache/truetypefontcache.cpp b/src/fontcache/truetypefontcache.cpp
index 196add775c..c0540836b0 100644
--- a/src/fontcache/truetypefontcache.cpp
+++ b/src/fontcache/truetypefontcache.cpp
@@ -10,8 +10,8 @@
#include "../stdafx.h"
#include "../debug.h"
#include "../fontcache.h"
-#include "../blitter/factory.hpp"
-#include "../core/bitmath_func.hpp"
+#include "../blitter/factory.h"
+#include "../core/bitmath_func.h"
#include "../gfx_layout.h"
#include "truetypefontcache.h"
diff --git a/src/framerate_gui.cpp b/src/framerate_gui.cpp
index 114d5c2d89..1c7733ad7e 100644
--- a/src/framerate_gui.cpp
+++ b/src/framerate_gui.cpp
@@ -18,10 +18,10 @@
#include "console_func.h"
#include "console_type.h"
#include "company_base.h"
-#include "ai/ai_info.hpp"
-#include "ai/ai_instance.hpp"
-#include "game/game.hpp"
-#include "game/game_instance.hpp"
+#include "ai/ai_info.h"
+#include "ai/ai_instance.h"
+#include "game/game.h"
+#include "game/game_instance.h"
#include "timer/timer.h"
#include "timer/timer_window.h"
diff --git a/src/framerate_type.h b/src/framerate_type.h
index 8dd84c29ce..9f4f625bb4 100644
--- a/src/framerate_type.h
+++ b/src/framerate_type.h
@@ -36,7 +36,7 @@
#define FRAMERATE_TYPE_H
#include "stdafx.h"
-#include "core/enum_type.hpp"
+#include "core/enum_type.h"
/**
* Elements of game performance that can be measured.
diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt
index 3f25e9bbe5..363eceaad3 100644
--- a/src/game/CMakeLists.txt
+++ b/src/game/CMakeLists.txt
@@ -1,16 +1,16 @@
add_files(
- game.hpp
+ game.h
game_config.cpp
- game_config.hpp
+ game_config.h
game_core.cpp
game_gui.cpp
- game_gui.hpp
+ game_gui.h
game_info.cpp
- game_info.hpp
+ game_info.h
game_instance.cpp
- game_instance.hpp
+ game_instance.h
game_scanner.cpp
- game_scanner.hpp
+ game_scanner.h
game_text.cpp
- game_text.hpp
+ game_text.h
)
diff --git a/src/game/game.hpp b/src/game/game.h
similarity index 96%
rename from src/game/game.hpp
rename to src/game/game.h
index c3664cd696..4e715060e8 100644
--- a/src/game/game.hpp
+++ b/src/game/game.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 .
*/
-/** @file game.hpp Base functions for all Games. */
+/** @file game.h Base functions for all Games. */
#ifndef GAME_HPP
#define GAME_HPP
-#include "game_scanner.hpp"
+#include "game_scanner.h"
-#include "../script/api/script_event_types.hpp"
+#include "../script/api/script_event_types.h"
/**
* Main Game class. Contains all functions needed to start, stop, save and load Game Scripts.
diff --git a/src/game/game_config.cpp b/src/game/game_config.cpp
index 28b6d281b0..37f293c8b6 100644
--- a/src/game/game_config.cpp
+++ b/src/game/game_config.cpp
@@ -9,9 +9,9 @@
#include "../stdafx.h"
#include "../settings_type.h"
-#include "game.hpp"
-#include "game_config.hpp"
-#include "game_info.hpp"
+#include "game.h"
+#include "game_config.h"
+#include "game_info.h"
#include "../safeguards.h"
diff --git a/src/game/game_config.hpp b/src/game/game_config.h
similarity index 91%
rename from src/game/game_config.hpp
rename to src/game/game_config.h
index 41385035d2..8eb73f81c7 100644
--- a/src/game/game_config.hpp
+++ b/src/game/game_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 .
*/
-/** @file game_config.hpp GameConfig stores the configuration settings of every Game. */
+/** @file game_config.h GameConfig stores the configuration settings of every Game. */
#ifndef GAME_CONFIG_HPP
#define GAME_CONFIG_HPP
-#include "../script/script_config.hpp"
+#include "../script/script_config.h"
class GameConfig : public ScriptConfig {
public:
diff --git a/src/game/game_core.cpp b/src/game/game_core.cpp
index c7763429ff..e2a75062b0 100644
--- a/src/game/game_core.cpp
+++ b/src/game/game_core.cpp
@@ -8,17 +8,17 @@
/** @file game_core.cpp Implementation of Game. */
#include "../stdafx.h"
-#include "../core/backup_type.hpp"
+#include "../core/backup_type.h"
#include "../company_base.h"
#include "../company_func.h"
#include "../network/network.h"
#include "../window_func.h"
#include "../framerate_type.h"
-#include "game.hpp"
-#include "game_scanner.hpp"
-#include "game_config.hpp"
-#include "game_instance.hpp"
-#include "game_info.hpp"
+#include "game.h"
+#include "game_scanner.h"
+#include "game_config.h"
+#include "game_instance.h"
+#include "game_info.h"
#include "../safeguards.h"
diff --git a/src/game/game_gui.cpp b/src/game/game_gui.cpp
index debc06af13..34131481f3 100644
--- a/src/game/game_gui.cpp
+++ b/src/game/game_gui.cpp
@@ -18,12 +18,12 @@
#include "../timer/timer.h"
#include "../timer/timer_window.h"
-#include "game.hpp"
-#include "game_gui.hpp"
-#include "game_config.hpp"
-#include "game_info.hpp"
+#include "game.h"
+#include "game_gui.h"
+#include "game_config.h"
+#include "game_info.h"
#include "../script/script_gui.h"
-#include "../script_config.hpp"
+#include "../script_config.h"
#include "../table/strings.h"
#include "../safeguards.h"
diff --git a/src/game/game_gui.hpp b/src/game/game_gui.h
similarity index 91%
rename from src/game/game_gui.hpp
rename to src/game/game_gui.h
index d0159a00d5..0d09441909 100644
--- a/src/game/game_gui.hpp
+++ b/src/game/game_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 game_gui.hpp %Window for configuring the Games */
+/** @file game_gui.h %Window for configuring the Games */
#ifndef GAME_GUI_HPP
#define GAME_GUI_HPP
diff --git a/src/game/game_info.cpp b/src/game/game_info.cpp
index f6c9bd952c..4816a0a466 100644
--- a/src/game/game_info.cpp
+++ b/src/game/game_info.cpp
@@ -9,9 +9,9 @@
#include "../stdafx.h"
-#include "../script/squirrel_class.hpp"
-#include "game_info.hpp"
-#include "game_scanner.hpp"
+#include "../script/squirrel_class.h"
+#include "game_info.h"
+#include "game_scanner.h"
#include "../debug.h"
#include "../safeguards.h"
diff --git a/src/game/game_info.hpp b/src/game/game_info.h
similarity index 93%
rename from src/game/game_info.hpp
rename to src/game/game_info.h
index d5dd48701d..a373a784d0 100644
--- a/src/game/game_info.hpp
+++ b/src/game/game_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 .
*/
-/** @file game_info.hpp GameInfo keeps track of all information of an Game, like Author, Description, ... */
+/** @file game_info.h GameInfo keeps track of all information of an Game, like Author, Description, ... */
#ifndef GAME_INFO_HPP
#define GAME_INFO_HPP
-#include "../script/script_info.hpp"
+#include "../script/script_info.h"
/** All static information from an Game like name, version, etc. */
class GameInfo : public ScriptInfo {
diff --git a/src/game/game_instance.cpp b/src/game/game_instance.cpp
index d13f5c2192..72dfcdda11 100644
--- a/src/game/game_instance.cpp
+++ b/src/game/game_instance.cpp
@@ -10,16 +10,16 @@
#include "../stdafx.h"
#include "../error.h"
-#include "../script/squirrel_class.hpp"
+#include "../script/squirrel_class.h"
-#include "../script/script_storage.hpp"
+#include "../script/script_storage.h"
#include "../script/script_cmd.h"
#include "../script/script_gui.h"
-#include "game_config.hpp"
-#include "game_info.hpp"
-#include "game_instance.hpp"
-#include "game_text.hpp"
-#include "game.hpp"
+#include "game_config.h"
+#include "game_info.h"
+#include "game_instance.h"
+#include "game_text.h"
+#include "game.h"
/* Convert all Game related classes to Squirrel data. */
#include "../script/api/game/game_includes.h"
diff --git a/src/game/game_instance.hpp b/src/game/game_instance.h
similarity index 92%
rename from src/game/game_instance.hpp
rename to src/game/game_instance.h
index 0a7a83abe1..b6f5e3aa21 100644
--- a/src/game/game_instance.hpp
+++ b/src/game/game_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 .
*/
-/** @file game_instance.hpp The GameInstance tracks games. */
+/** @file game_instance.h The GameInstance tracks games. */
#ifndef GAME_INSTANCE_HPP
#define GAME_INSTANCE_HPP
-#include "../script/script_instance.hpp"
+#include "../script/script_instance.h"
/** Runtime information about a game script like a pointer to the squirrel vm and the current state. */
class GameInstance : public ScriptInstance {
diff --git a/src/game/game_scanner.cpp b/src/game/game_scanner.cpp
index 2707e3eade..c24aefa715 100644
--- a/src/game/game_scanner.cpp
+++ b/src/game/game_scanner.cpp
@@ -9,9 +9,9 @@
#include "../stdafx.h"
-#include "../script/squirrel_class.hpp"
-#include "game_info.hpp"
-#include "game_scanner.hpp"
+#include "../script/squirrel_class.h"
+#include "game_info.h"
+#include "game_scanner.h"
#include "../3rdparty/fmt/format.h"
diff --git a/src/game/game_scanner.hpp b/src/game/game_scanner.h
similarity index 95%
rename from src/game/game_scanner.hpp
rename to src/game/game_scanner.h
index 027649b1ad..a2683623f3 100644
--- a/src/game/game_scanner.hpp
+++ b/src/game/game_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 .
*/
-/** @file game_scanner.hpp declarations of the class for Game scanner */
+/** @file game_scanner.h declarations of the class for Game scanner */
#ifndef GAME_SCANNER_HPP
#define GAME_SCANNER_HPP
-#include "../script/script_scanner.hpp"
+#include "../script/script_scanner.h"
class GameScannerInfo : public ScriptScanner {
public:
diff --git a/src/game/game_text.cpp b/src/game/game_text.cpp
index d6730fe5f6..2b4416bc98 100644
--- a/src/game/game_text.cpp
+++ b/src/game/game_text.cpp
@@ -12,11 +12,11 @@
#include "../debug.h"
#include "../fileio_func.h"
#include "../tar_type.h"
-#include "../script/squirrel_class.hpp"
+#include "../script/squirrel_class.h"
#include "../strings_func.h"
-#include "game_text.hpp"
-#include "game.hpp"
-#include "game_info.hpp"
+#include "game_text.h"
+#include "game.h"
+#include "game_info.h"
#include "table/strings.h"
#include "table/strgen_tables.h"
diff --git a/src/game/game_text.hpp b/src/game/game_text.h
similarity index 97%
rename from src/game/game_text.hpp
rename to src/game/game_text.h
index e0c45741d8..5ff6cdd930 100644
--- a/src/game/game_text.hpp
+++ b/src/game/game_text.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 .
*/
-/** @file game_text.hpp Base functions regarding game texts. */
+/** @file game_text.h Base functions regarding game texts. */
#ifndef GAME_TEXT_HPP
#define GAME_TEXT_HPP
diff --git a/src/genworld.cpp b/src/genworld.cpp
index 9c78403777..63afd77785 100644
--- a/src/genworld.cpp
+++ b/src/genworld.cpp
@@ -20,18 +20,18 @@
#include "timer/timer_game_tick.h"
#include "engine_func.h"
#include "water.h"
-#include "video/video_driver.hpp"
+#include "video/video_driver.h"
#include "tilehighlight_func.h"
#include "saveload/saveload.h"
#include "void_map.h"
#include "town.h"
#include "newgrf.h"
-#include "core/random_func.hpp"
-#include "core/backup_type.hpp"
+#include "core/random_func.h"
+#include "core/backup_type.h"
#include "progress.h"
#include "error.h"
-#include "game/game.hpp"
-#include "game/game_instance.hpp"
+#include "game/game.h"
+#include "game/game_instance.h"
#include "string_func.h"
#include "thread.h"
#include "tgp.h"
diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp
index c895640756..7652d4b5b5 100644
--- a/src/genworld_gui.cpp
+++ b/src/genworld_gui.cpp
@@ -22,16 +22,16 @@
#include "widgets/dropdown_func.h"
#include "querystring_gui.h"
#include "town.h"
-#include "core/geometry_func.hpp"
-#include "core/random_func.hpp"
+#include "core/geometry_func.h"
+#include "core/random_func.h"
#include "saveload/saveload.h"
#include "progress.h"
#include "error.h"
#include "newgrf_townname.h"
#include "townname_type.h"
-#include "video/video_driver.hpp"
-#include "ai/ai_gui.hpp"
-#include "game/game_gui.hpp"
+#include "video/video_driver.h"
+#include "ai/ai_gui.h"
+#include "game/game_gui.h"
#include "industry.h"
#include "widgets/genworld_widget.h"
diff --git a/src/gfx.cpp b/src/gfx.cpp
index 1cf74769e6..5836014844 100644
--- a/src/gfx.cpp
+++ b/src/gfx.cpp
@@ -11,8 +11,8 @@
#include "gfx_layout.h"
#include "progress.h"
#include "zoom_func.h"
-#include "blitter/factory.hpp"
-#include "video/video_driver.hpp"
+#include "blitter/factory.h"
+#include "video/video_driver.h"
#include "strings_func.h"
#include "settings_type.h"
#include "network/network.h"
@@ -20,8 +20,8 @@
#include "window_gui.h"
#include "window_func.h"
#include "newgrf_debug.h"
-#include "core/backup_type.hpp"
-#include "core/container_func.hpp"
+#include "core/backup_type.h"
+#include "core/container_func.h"
#include "viewport_func.h"
#include "table/string_colours.h"
diff --git a/src/gfx_layout.cpp b/src/gfx_layout.cpp
index 6909b4cd28..4485b8c91a 100644
--- a/src/gfx_layout.cpp
+++ b/src/gfx_layout.cpp
@@ -8,7 +8,7 @@
/** @file gfx_layout.cpp Handling of laying out text. */
#include "stdafx.h"
-#include "core/math_func.hpp"
+#include "core/math_func.h"
#include "gfx_layout.h"
#include "string_func.h"
#include "debug.h"
diff --git a/src/gfx_layout.h b/src/gfx_layout.h
index fc0340b179..5ea8545193 100644
--- a/src/gfx_layout.h
+++ b/src/gfx_layout.h
@@ -12,7 +12,7 @@
#include "fontcache.h"
#include "gfx_func.h"
-#include "core/math_func.hpp"
+#include "core/math_func.h"
#include
#include
diff --git a/src/gfx_type.h b/src/gfx_type.h
index fbedceb87c..9a26f6de50 100644
--- a/src/gfx_type.h
+++ b/src/gfx_type.h
@@ -10,8 +10,8 @@
#ifndef GFX_TYPE_H
#define GFX_TYPE_H
-#include "core/endian_type.hpp"
-#include "core/geometry_type.hpp"
+#include "core/endian_type.h"
+#include "core/geometry_type.h"
#include "zoom_type.h"
typedef uint32_t SpriteID; ///< The number of a sprite, without mapping bits and colourtables
diff --git a/src/gfxinit.cpp b/src/gfxinit.cpp
index 785dbde159..e4f9d4548e 100644
--- a/src/gfxinit.cpp
+++ b/src/gfxinit.cpp
@@ -14,8 +14,8 @@
#include "fontcache.h"
#include "gfx_func.h"
#include "transparency.h"
-#include "blitter/factory.hpp"
-#include "video/video_driver.hpp"
+#include "blitter/factory.h"
+#include "video/video_driver.h"
#include "window_func.h"
#include "palette_func.h"
diff --git a/src/goal.cpp b/src/goal.cpp
index 9b0cb20027..15d31fd069 100644
--- a/src/goal.cpp
+++ b/src/goal.cpp
@@ -13,8 +13,8 @@
#include "town.h"
#include "window_func.h"
#include "goal_base.h"
-#include "core/pool_func.hpp"
-#include "game/game.hpp"
+#include "core/pool_func.h"
+#include "game/game.h"
#include "command_func.h"
#include "company_base.h"
#include "story_base.h"
diff --git a/src/goal_base.h b/src/goal_base.h
index bf5954ee18..798c13f901 100644
--- a/src/goal_base.h
+++ b/src/goal_base.h
@@ -12,7 +12,7 @@
#include "company_type.h"
#include "goal_type.h"
-#include "core/pool_type.hpp"
+#include "core/pool_type.h"
typedef Pool GoalPool;
extern GoalPool _goal_pool;
diff --git a/src/goal_gui.cpp b/src/goal_gui.cpp
index d8be74d358..3cd68a6ad0 100644
--- a/src/goal_gui.cpp
+++ b/src/goal_gui.cpp
@@ -15,7 +15,7 @@
#include "viewport_func.h"
#include "gui.h"
#include "goal_base.h"
-#include "core/geometry_func.hpp"
+#include "core/geometry_func.h"
#include "company_func.h"
#include "company_base.h"
#include "company_gui.h"
diff --git a/src/goal_type.h b/src/goal_type.h
index f4af4af197..a992935b9e 100644
--- a/src/goal_type.h
+++ b/src/goal_type.h
@@ -10,7 +10,7 @@
#ifndef GOAL_TYPE_H
#define GOAL_TYPE_H
-#include "core/enum_type.hpp"
+#include "core/enum_type.h"
static const uint32_t GOAL_QUESTION_BUTTON_COUNT = 18; ///< Amount of buttons available.
diff --git a/src/graph_gui.cpp b/src/graph_gui.cpp
index 070ad8754c..f58c5bfa77 100644
--- a/src/graph_gui.cpp
+++ b/src/graph_gui.cpp
@@ -17,7 +17,7 @@
#include "strings_func.h"
#include "window_func.h"
#include "gfx_func.h"
-#include "core/geometry_func.hpp"
+#include "core/geometry_func.h"
#include "currency.h"
#include "timer/timer.h"
#include "timer/timer_window.h"
diff --git a/src/ground_vehicle.hpp b/src/ground_vehicle.h
similarity index 99%
rename from src/ground_vehicle.hpp
rename to src/ground_vehicle.h
index 331b212048..3faae4d113 100644
--- a/src/ground_vehicle.hpp
+++ b/src/ground_vehicle.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 .
*/
-/** @file ground_vehicle.hpp Base class and functions for all vehicles that move through ground. */
+/** @file ground_vehicle.h Base class and functions for all vehicles that move through ground. */
#ifndef GROUND_VEHICLE_HPP
#define GROUND_VEHICLE_HPP
diff --git a/src/group.h b/src/group.h
index 3886b155c4..74f544395f 100644
--- a/src/group.h
+++ b/src/group.h
@@ -11,7 +11,7 @@
#define GROUP_H
#include "group_type.h"
-#include "core/pool_type.hpp"
+#include "core/pool_type.h"
#include "company_type.h"
#include "vehicle_type.h"
#include "engine_type.h"
diff --git a/src/group_cmd.cpp b/src/group_cmd.cpp
index bc379e3212..89f0aac7a9 100644
--- a/src/group_cmd.cpp
+++ b/src/group_cmd.cpp
@@ -16,7 +16,7 @@
#include "autoreplace_func.h"
#include "string_func.h"
#include "company_func.h"
-#include "core/pool_func.hpp"
+#include "core/pool_func.h"
#include "order_backup.h"
#include "group_cmd.h"
diff --git a/src/group_gui.cpp b/src/group_gui.cpp
index 79b04715c4..7c97506e99 100644
--- a/src/group_gui.cpp
+++ b/src/group_gui.cpp
@@ -21,8 +21,8 @@
#include "widgets/dropdown_func.h"
#include "tilehighlight_func.h"
#include "vehicle_gui_base.h"
-#include "core/geometry_func.hpp"
-#include "core/container_func.hpp"
+#include "core/geometry_func.h"
+#include "core/container_func.h"
#include "company_base.h"
#include "company_gui.h"
#include "gui.h"
diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp
index 68cfe9f312..1ef4f69c70 100644
--- a/src/industry_cmd.cpp
+++ b/src/industry_cmd.cpp
@@ -32,12 +32,12 @@
#include "animated_tile_func.h"
#include "effectvehicle_func.h"
#include "effectvehicle_base.h"
-#include "ai/ai.hpp"
-#include "core/pool_func.hpp"
+#include "ai/ai.h"
+#include "core/pool_func.h"
#include "subsidy_func.h"
-#include "core/backup_type.hpp"
+#include "core/backup_type.h"
#include "object_base.h"
-#include "game/game.hpp"
+#include "game/game.h"
#include "error.h"
#include "string_func.h"
#include "industry_cmd.h"
diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp
index af1dac2fbb..4fec9e8c7d 100644
--- a/src/industry_gui.cpp
+++ b/src/industry_gui.cpp
@@ -30,9 +30,9 @@
#include "sortlist_type.h"
#include "widgets/dropdown_func.h"
#include "company_base.h"
-#include "core/geometry_func.hpp"
-#include "core/random_func.hpp"
-#include "core/backup_type.hpp"
+#include "core/geometry_func.h"
+#include "core/random_func.h"
+#include "core/backup_type.h"
#include "genworld.h"
#include "smallmap_gui.h"
#include "widgets/dropdown_type.h"
diff --git a/src/ini.cpp b/src/ini.cpp
index 5931d891ec..0a2001e578 100644
--- a/src/ini.cpp
+++ b/src/ini.cpp
@@ -25,7 +25,7 @@
#ifdef _WIN32
# include
# include
-# include "core/mem_func.hpp"
+# include "core/mem_func.h"
#endif
#include "safeguards.h"
diff --git a/src/ini_load.cpp b/src/ini_load.cpp
index 1a6eed76f5..01ac99fd78 100644
--- a/src/ini_load.cpp
+++ b/src/ini_load.cpp
@@ -8,8 +8,8 @@
/** @file ini_load.cpp Definition of the #IniLoadFile class, related to reading and storing '*.ini' files. */
#include "stdafx.h"
-#include "core/alloc_func.hpp"
-#include "core/mem_func.hpp"
+#include "core/alloc_func.h"
+#include "core/mem_func.h"
#include "ini_type.h"
#include "string_func.h"
diff --git a/src/intro_gui.cpp b/src/intro_gui.cpp
index ed06c0968c..77989b1a28 100644
--- a/src/intro_gui.cpp
+++ b/src/intro_gui.cpp
@@ -23,10 +23,10 @@
#include "landscape.h"
#include "strings_func.h"
#include "fios.h"
-#include "ai/ai_gui.hpp"
-#include "game/game_gui.hpp"
+#include "ai/ai_gui.h"
+#include "game/game_gui.h"
#include "gfx_func.h"
-#include "core/geometry_func.hpp"
+#include "core/geometry_func.h"
#include "language.h"
#include "rev.h"
#include "highscore.h"
diff --git a/src/landscape.cpp b/src/landscape.cpp
index 880c77b576..85fa135e66 100644
--- a/src/landscape.cpp
+++ b/src/landscape.cpp
@@ -27,7 +27,7 @@
#include "effectvehicle_func.h"
#include "landscape_type.h"
#include "animated_tile_func.h"
-#include "core/random_func.hpp"
+#include "core/random_func.h"
#include "object_base.h"
#include "company_func.h"
#include "pathfinder/npf/aystar.h"
diff --git a/src/landscape.h b/src/landscape.h
index e6e00a8e43..dbbcc52f97 100644
--- a/src/landscape.h
+++ b/src/landscape.h
@@ -10,7 +10,7 @@
#ifndef LANDSCAPE_H
#define LANDSCAPE_H
-#include "core/geometry_type.hpp"
+#include "core/geometry_type.h"
#include "tile_cmd.h"
static const uint SNOW_LINE_MONTHS = 12; ///< Number of months in the snow line table.
diff --git a/src/league_base.h b/src/league_base.h
index b43db4ac1f..5dbc5dd9bc 100644
--- a/src/league_base.h
+++ b/src/league_base.h
@@ -13,7 +13,7 @@
#include "company_type.h"
#include "goal_type.h"
#include "league_type.h"
-#include "core/pool_type.hpp"
+#include "core/pool_type.h"
bool IsValidLink(Link link);
diff --git a/src/league_cmd.cpp b/src/league_cmd.cpp
index 8c1e862dd2..41a4b7b40c 100644
--- a/src/league_cmd.cpp
+++ b/src/league_cmd.cpp
@@ -16,7 +16,7 @@
#include "story_base.h"
#include "town.h"
#include "window_func.h"
-#include "core/pool_func.hpp"
+#include "core/pool_func.h"
#include "safeguards.h"
diff --git a/src/linkgraph/linkgraph.cpp b/src/linkgraph/linkgraph.cpp
index 1dcb2eecff..980bc4d61f 100644
--- a/src/linkgraph/linkgraph.cpp
+++ b/src/linkgraph/linkgraph.cpp
@@ -8,7 +8,7 @@
/** @file linkgraph.cpp Definition of link graph classes used for cargo distribution. */
#include "../stdafx.h"
-#include "../core/pool_func.hpp"
+#include "../core/pool_func.h"
#include "linkgraph.h"
#include "../safeguards.h"
diff --git a/src/linkgraph/linkgraph.h b/src/linkgraph/linkgraph.h
index e9c346a4ff..53f558c3da 100644
--- a/src/linkgraph/linkgraph.h
+++ b/src/linkgraph/linkgraph.h
@@ -10,7 +10,7 @@
#ifndef LINKGRAPH_H
#define LINKGRAPH_H
-#include "../core/pool_type.hpp"
+#include "../core/pool_type.h"
#include "../station_base.h"
#include "../cargotype.h"
#include "../timer/timer_game_calendar.h"
diff --git a/src/linkgraph/linkgraph_gui.cpp b/src/linkgraph/linkgraph_gui.cpp
index 6bb9dd60a9..476a05dcf9 100644
--- a/src/linkgraph/linkgraph_gui.cpp
+++ b/src/linkgraph/linkgraph_gui.cpp
@@ -17,7 +17,7 @@
#include "../viewport_func.h"
#include "../zoom_func.h"
#include "../smallmap_gui.h"
-#include "../core/geometry_func.hpp"
+#include "../core/geometry_func.h"
#include "../widgets/link_graph_legend_widget.h"
#include "../strings_func.h"
#include "linkgraph_gui.h"
diff --git a/src/linkgraph/linkgraphjob.cpp b/src/linkgraph/linkgraphjob.cpp
index a4ca8ae2f2..7be704b125 100644
--- a/src/linkgraph/linkgraphjob.cpp
+++ b/src/linkgraph/linkgraphjob.cpp
@@ -8,7 +8,7 @@
/** @file linkgraphjob.cpp Definition of link graph job classes used for cargo distribution. */
#include "../stdafx.h"
-#include "../core/pool_func.hpp"
+#include "../core/pool_func.h"
#include "../window_func.h"
#include "linkgraphjob.h"
#include "linkgraphschedule.h"
diff --git a/src/linkgraph/mcf.cpp b/src/linkgraph/mcf.cpp
index b6160f22f4..ef2ec29129 100644
--- a/src/linkgraph/mcf.cpp
+++ b/src/linkgraph/mcf.cpp
@@ -1,7 +1,7 @@
/** @file mcf.cpp Definition of Multi-Commodity-Flow solver. */
#include "../stdafx.h"
-#include "../core/math_func.hpp"
+#include "../core/math_func.h"
#include "../timer/timer_game_tick.h"
#include "mcf.h"
diff --git a/src/linkgraph/refresh.cpp b/src/linkgraph/refresh.cpp
index 8cb6c81ec3..302f5da9f3 100644
--- a/src/linkgraph/refresh.cpp
+++ b/src/linkgraph/refresh.cpp
@@ -8,7 +8,7 @@
/** @file refresh.h Definition of link refreshing utility. */
#include "../stdafx.h"
-#include "../core/bitmath_func.hpp"
+#include "../core/bitmath_func.h"
#include "../station_func.h"
#include "../engine_base.h"
#include "../vehicle_func.h"
diff --git a/src/map.cpp b/src/map.cpp
index 77e510d498..31ebdf814e 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -9,7 +9,7 @@
#include "stdafx.h"
#include "debug.h"
-#include "core/alloc_func.hpp"
+#include "core/alloc_func.h"
#include "water_map.h"
#include "error_func.h"
#include "string_func.h"
diff --git a/src/map_func.h b/src/map_func.h
index 14d65db690..04253a4d32 100644
--- a/src/map_func.h
+++ b/src/map_func.h
@@ -10,7 +10,7 @@
#ifndef MAP_FUNC_H
#define MAP_FUNC_H
-#include "core/math_func.hpp"
+#include "core/math_func.h"
#include "tile_type.h"
#include "map_type.h"
#include "direction_func.h"
diff --git a/src/misc.cpp b/src/misc.cpp
index 76e4ed4cfc..d92a433cbc 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -10,22 +10,22 @@
#include "stdafx.h"
#include "landscape.h"
#include "news_func.h"
-#include "ai/ai.hpp"
+#include "ai/ai.h"
#include "script/script_gui.h"
#include "newgrf.h"
#include "newgrf_house.h"
#include "economy_func.h"
#include "timer/timer_game_calendar.h"
#include "timer/timer_game_tick.h"
-#include "texteff.hpp"
+#include "texteff.h"
#include "gfx_func.h"
#include "gamelog.h"
#include "animated_tile_func.h"
#include "tilehighlight_func.h"
#include "network/network_func.h"
#include "window_func.h"
-#include "core/pool_type.hpp"
-#include "game/game.hpp"
+#include "core/pool_type.h"
+#include "game/game.h"
#include "linkgraph/linkgraphschedule.h"
#include "station_kdtree.h"
#include "town_kdtree.h"
diff --git a/src/misc/CMakeLists.txt b/src/misc/CMakeLists.txt
index 24cde73e41..730bf75ee6 100644
--- a/src/misc/CMakeLists.txt
+++ b/src/misc/CMakeLists.txt
@@ -1,14 +1,14 @@
add_files(
- array.hpp
- binaryheap.hpp
+ array.h
+ binaryheap.h
countedobj.cpp
- countedptr.hpp
+ countedptr.h
dbg_helpers.cpp
dbg_helpers.h
- endian_buffer.hpp
- fixedsizearray.hpp
+ endian_buffer.h
+ fixedsizearray.h
getoptdata.cpp
getoptdata.h
- hashtable.hpp
- lrucache.hpp
+ hashtable.h
+ lrucache.h
)
diff --git a/src/misc/array.hpp b/src/misc/array.h
similarity index 96%
rename from src/misc/array.hpp
rename to src/misc/array.h
index cc48d295cd..753db83b8d 100644
--- a/src/misc/array.hpp
+++ b/src/misc/array.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 .
*/
-/** @file array.hpp Array without an explicit maximum size. */
+/** @file array.h Array without an explicit maximum size. */
#ifndef ARRAY_HPP
#define ARRAY_HPP
-#include "fixedsizearray.hpp"
+#include "fixedsizearray.h"
#include "../string_func.h"
/**
diff --git a/src/misc/binaryheap.hpp b/src/misc/binaryheap.h
similarity index 98%
rename from src/misc/binaryheap.hpp
rename to src/misc/binaryheap.h
index 067ad1f291..0955cf36e6 100644
--- a/src/misc/binaryheap.hpp
+++ b/src/misc/binaryheap.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 .
*/
-/** @file binaryheap.hpp Binary heap implementation. */
+/** @file binaryheap.h Binary heap implementation. */
#ifndef BINARYHEAP_HPP
#define BINARYHEAP_HPP
-#include "../core/alloc_func.hpp"
+#include "../core/alloc_func.h"
/** Enable it if you suspect binary heap doesn't work well */
#define BINARYHEAP_CHECK 0
diff --git a/src/misc/countedobj.cpp b/src/misc/countedobj.cpp
index 563ae3f4bb..841933f7a7 100644
--- a/src/misc/countedobj.cpp
+++ b/src/misc/countedobj.cpp
@@ -9,7 +9,7 @@
#include "../stdafx.h"
-#include "countedptr.hpp"
+#include "countedptr.h"
#include "../safeguards.h"
diff --git a/src/misc/countedptr.hpp b/src/misc/countedptr.h
similarity index 98%
rename from src/misc/countedptr.hpp
rename to src/misc/countedptr.h
index 625b124200..a1a7a5ea3d 100644
--- a/src/misc/countedptr.hpp
+++ b/src/misc/countedptr.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 .
*/
-/** @file countedptr.hpp CCountedPtr - smart pointer implementation. */
+/** @file countedptr.h CCountedPtr - smart pointer implementation. */
#ifndef COUNTEDPTR_HPP
#define COUNTEDPTR_HPP
diff --git a/src/misc/endian_buffer.hpp b/src/misc/endian_buffer.h
similarity index 98%
rename from src/misc/endian_buffer.hpp
rename to src/misc/endian_buffer.h
index 3229029c53..bb1fb087d0 100644
--- a/src/misc/endian_buffer.hpp
+++ b/src/misc/endian_buffer.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 .
*/
-/** @file endian_buffer.hpp Endian-aware buffer. */
+/** @file endian_buffer.h Endian-aware buffer. */
#ifndef ENDIAN_BUFFER_HPP
#define ENDIAN_BUFFER_HPP
#include
-#include "../core/bitmath_func.hpp"
-#include "../core/overflowsafe_type.hpp"
+#include "../core/bitmath_func.h"
+#include "../core/overflowsafe_type.h"
struct StrongTypedefBase;
diff --git a/src/misc/fixedsizearray.hpp b/src/misc/fixedsizearray.h
similarity index 97%
rename from src/misc/fixedsizearray.hpp
rename to src/misc/fixedsizearray.h
index 7a2c97b58b..8f002b74d8 100644
--- a/src/misc/fixedsizearray.hpp
+++ b/src/misc/fixedsizearray.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 .
*/
-/** @file fixedsizearray.hpp A fixed size array that doesn't create items until needed. */
+/** @file fixedsizearray.h A fixed size array that doesn't create items until needed. */
#ifndef FIXEDSIZEARRAY_HPP
#define FIXEDSIZEARRAY_HPP
-#include "../core/alloc_func.hpp"
+#include "../core/alloc_func.h"
/**
* fixed size array
diff --git a/src/misc/hashtable.hpp b/src/misc/hashtable.h
similarity index 98%
rename from src/misc/hashtable.hpp
rename to src/misc/hashtable.h
index 92e759adbe..8acd8ef8f8 100644
--- a/src/misc/hashtable.hpp
+++ b/src/misc/hashtable.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 .
*/
-/** @file hashtable.hpp Hash table support. */
+/** @file hashtable.h Hash table support. */
#ifndef HASHTABLE_HPP
#define HASHTABLE_HPP
-#include "../core/math_func.hpp"
+#include "../core/math_func.h"
template
struct CHashTableSlotT
diff --git a/src/misc/lrucache.hpp b/src/misc/lrucache.h
similarity index 97%
rename from src/misc/lrucache.hpp
rename to src/misc/lrucache.h
index 3adedbefd4..57720ce5b6 100644
--- a/src/misc/lrucache.hpp
+++ b/src/misc/lrucache.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 .
*/
-/** @file lrucache.hpp Size limited cache map with a least recently used eviction strategy. */
+/** @file lrucache.h Size limited cache map with a least recently used eviction strategy. */
#ifndef LRUCACHE_HPP
#define LRUCACHE_HPP
diff --git a/src/misc_cmd.cpp b/src/misc_cmd.cpp
index aa2f4d6029..87be56730e 100644
--- a/src/misc_cmd.cpp
+++ b/src/misc_cmd.cpp
@@ -19,8 +19,8 @@
#include "company_gui.h"
#include "company_base.h"
#include "tile_map.h"
-#include "texteff.hpp"
-#include "core/backup_type.hpp"
+#include "texteff.h"
+#include "core/backup_type.h"
#include "misc_cmd.h"
#include "table/strings.h"
diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp
index 64e1d02840..ca2c564538 100644
--- a/src/misc_gui.cpp
+++ b/src/misc_gui.cpp
@@ -17,11 +17,11 @@
#include "town.h"
#include "string_func.h"
#include "company_base.h"
-#include "texteff.hpp"
+#include "texteff.h"
#include "strings_func.h"
#include "window_func.h"
#include "querystring_gui.h"
-#include "core/geometry_func.hpp"
+#include "core/geometry_func.h"
#include "newgrf_debug.h"
#include "zoom_func.h"
#include "viewport_func.h"
diff --git a/src/mixer.cpp b/src/mixer.cpp
index 3b30f3d25d..fdc3dee146 100644
--- a/src/mixer.cpp
+++ b/src/mixer.cpp
@@ -10,7 +10,7 @@
#include "stdafx.h"
#include
#include
-#include "core/math_func.hpp"
+#include "core/math_func.h"
#include "framerate_type.h"
#include "mixer.h"
#include "settings_type.h"
diff --git a/src/music/CMakeLists.txt b/src/music/CMakeLists.txt
index 54105bd3cb..761671859f 100644
--- a/src/music/CMakeLists.txt
+++ b/src/music/CMakeLists.txt
@@ -41,8 +41,8 @@ endif()
add_files(
midi.h
midifile.cpp
- midifile.hpp
- music_driver.hpp
+ midifile.h
+ music_driver.h
null_m.cpp
null_m.h
)
diff --git a/src/music/allegro_m.cpp b/src/music/allegro_m.cpp
index b4fd0da8b2..81dbc53e3e 100644
--- a/src/music/allegro_m.cpp
+++ b/src/music/allegro_m.cpp
@@ -12,7 +12,7 @@
#include "../stdafx.h"
#include "../debug.h"
#include "allegro_m.h"
-#include "midifile.hpp"
+#include "midifile.h"
#include
#include "../safeguards.h"
diff --git a/src/music/allegro_m.h b/src/music/allegro_m.h
index b07a7073b6..8c7e252bd3 100644
--- a/src/music/allegro_m.h
+++ b/src/music/allegro_m.h
@@ -10,7 +10,7 @@
#ifndef MUSIC_ALLEGRO_H
#define MUSIC_ALLEGRO_H
-#include "music_driver.hpp"
+#include "music_driver.h"
/** Allegro's music player. */
class MusicDriver_Allegro : public MusicDriver {
diff --git a/src/music/bemidi.cpp b/src/music/bemidi.cpp
index 3e4f5b311c..bb10ef39f1 100644
--- a/src/music/bemidi.cpp
+++ b/src/music/bemidi.cpp
@@ -11,7 +11,7 @@
#include "../openttd.h"
#include "bemidi.h"
#include "../base_media_base.h"
-#include "midifile.hpp"
+#include "midifile.h"
#include "../safeguards.h"
diff --git a/src/music/bemidi.h b/src/music/bemidi.h
index c4ab1f3599..dd3b039e6b 100644
--- a/src/music/bemidi.h
+++ b/src/music/bemidi.h
@@ -10,7 +10,7 @@
#ifndef MUSIC_BEMIDI_H
#define MUSIC_BEMIDI_H
-#include "music_driver.hpp"
+#include "music_driver.h"
/* For BMidiSynthFile */
#include
diff --git a/src/music/cocoa_m.cpp b/src/music/cocoa_m.cpp
index bd9dfc59a1..c3ac255cb3 100644
--- a/src/music/cocoa_m.cpp
+++ b/src/music/cocoa_m.cpp
@@ -16,7 +16,7 @@
#include "../stdafx.h"
#include "../os/macosx/macos.h"
#include "cocoa_m.h"
-#include "midifile.hpp"
+#include "midifile.h"
#include "../debug.h"
#include "../base_media_base.h"
diff --git a/src/music/cocoa_m.h b/src/music/cocoa_m.h
index 046a60c386..358a0155a8 100644
--- a/src/music/cocoa_m.h
+++ b/src/music/cocoa_m.h
@@ -10,7 +10,7 @@
#ifndef MUSIC_MACOSX_COCOA_H
#define MUSIC_MACOSX_COCOA_H
-#include "music_driver.hpp"
+#include "music_driver.h"
class MusicDriver_Cocoa : public MusicDriver {
public:
diff --git a/src/music/dmusic.cpp b/src/music/dmusic.cpp
index 640a0c771e..adead5d51c 100644
--- a/src/music/dmusic.cpp
+++ b/src/music/dmusic.cpp
@@ -14,12 +14,12 @@
#endif
#include "../debug.h"
#include "../os/windows/win32.h"
-#include "../core/mem_func.hpp"
+#include "../core/mem_func.h"
#include "../thread.h"
#include "../fileio_func.h"
#include "../base_media_base.h"
#include "dmusic.h"
-#include "midifile.hpp"
+#include "midifile.h"
#include "midi.h"
#include
diff --git a/src/music/dmusic.h b/src/music/dmusic.h
index 616bf01208..ff96058fd4 100644
--- a/src/music/dmusic.h
+++ b/src/music/dmusic.h
@@ -10,7 +10,7 @@
#ifndef MUSIC_DMUSIC_H
#define MUSIC_DMUSIC_H
-#include "music_driver.hpp"
+#include "music_driver.h"
/** Music player making use of DirectX. */
class MusicDriver_DMusic : public MusicDriver {
diff --git a/src/music/extmidi.cpp b/src/music/extmidi.cpp
index 74539ff569..e392131d98 100644
--- a/src/music/extmidi.cpp
+++ b/src/music/extmidi.cpp
@@ -10,14 +10,14 @@
#include "../stdafx.h"
#include "../debug.h"
#include "../string_func.h"
-#include "../core/alloc_func.hpp"
-#include "../sound/sound_driver.hpp"
-#include "../video/video_driver.hpp"
+#include "../core/alloc_func.h"
+#include "../sound/sound_driver.h"
+#include "../video/video_driver.h"
#include "../gfx_func.h"
#include "extmidi.h"
#include "../base_media_base.h"
#include "../thread.h"
-#include "midifile.hpp"
+#include "midifile.h"
#include
#include
#include
diff --git a/src/music/extmidi.h b/src/music/extmidi.h
index b106ef91f8..277a9b54cb 100644
--- a/src/music/extmidi.h
+++ b/src/music/extmidi.h
@@ -10,7 +10,7 @@
#ifndef MUSIC_EXTERNAL_H
#define MUSIC_EXTERNAL_H
-#include "music_driver.hpp"
+#include "music_driver.h"
class MusicDriver_ExtMidi : public MusicDriver {
private:
diff --git a/src/music/fluidsynth.cpp b/src/music/fluidsynth.cpp
index 7a900579e2..a0f79b5734 100644
--- a/src/music/fluidsynth.cpp
+++ b/src/music/fluidsynth.cpp
@@ -12,7 +12,7 @@
#include "../sound_type.h"
#include "../debug.h"
#include "fluidsynth.h"
-#include "midifile.hpp"
+#include "midifile.h"
#include
#include "../mixer.h"
#include
diff --git a/src/music/fluidsynth.h b/src/music/fluidsynth.h
index 91543662d0..ec183f7e49 100644
--- a/src/music/fluidsynth.h
+++ b/src/music/fluidsynth.h
@@ -10,7 +10,7 @@
#ifndef MUSIC_FLUIDSYNTH_H
#define MUSIC_FLUIDSYNTH_H
-#include "music_driver.hpp"
+#include "music_driver.h"
/** Music driver making use of FluidSynth. */
class MusicDriver_FluidSynth : public MusicDriver {
diff --git a/src/music/midifile.cpp b/src/music/midifile.cpp
index fbb1a1dee1..43f05bc685 100644
--- a/src/music/midifile.cpp
+++ b/src/music/midifile.cpp
@@ -7,12 +7,12 @@
/* @file midifile.cpp Parser for standard MIDI files */
-#include "midifile.hpp"
+#include "midifile.h"
#include "../fileio_func.h"
#include "../fileio_type.h"
#include "../string_func.h"
-#include "../core/endian_func.hpp"
-#include "../core/mem_func.hpp"
+#include "../core/endian_func.h"
+#include "../core/mem_func.h"
#include "../base_media_base.h"
#include "midi.h"
diff --git a/src/music/midifile.hpp b/src/music/midifile.h
similarity index 97%
rename from src/music/midifile.hpp
rename to src/music/midifile.h
index c66094315e..3c1c45e236 100644
--- a/src/music/midifile.hpp
+++ b/src/music/midifile.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 .
*/
-/* @file midifile.hpp Parser for standard MIDI files */
+/* @file midifile.h Parser for standard MIDI files */
#ifndef MUSIC_MIDIFILE_HPP
#define MUSIC_MIDIFILE_HPP
diff --git a/src/music/music_driver.hpp b/src/music/music_driver.h
similarity index 96%
rename from src/music/music_driver.hpp
rename to src/music/music_driver.h
index f8aff0e716..98dbdd8bb2 100644
--- a/src/music/music_driver.hpp
+++ b/src/music/music_driver.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 .
*/
-/** @file music_driver.hpp Base for all music playback. */
+/** @file music_driver.h Base for all music playback. */
#ifndef MUSIC_MUSIC_DRIVER_HPP
#define MUSIC_MUSIC_DRIVER_HPP
diff --git a/src/music/null_m.h b/src/music/null_m.h
index 5754f55642..e0b650af0c 100644
--- a/src/music/null_m.h
+++ b/src/music/null_m.h
@@ -10,7 +10,7 @@
#ifndef MUSIC_NULL_H
#define MUSIC_NULL_H
-#include "music_driver.hpp"
+#include "music_driver.h"
/** The music player that does nothing. */
class MusicDriver_Null : public MusicDriver {
diff --git a/src/music/win32_m.cpp b/src/music/win32_m.cpp
index d07c7214a7..b721d95ed3 100644
--- a/src/music/win32_m.cpp
+++ b/src/music/win32_m.cpp
@@ -14,10 +14,10 @@
#include
#include "../os/windows/win32.h"
#include "../debug.h"
-#include "midifile.hpp"
+#include "midifile.h"
#include "midi.h"
#include "../base_media_base.h"
-#include "../core/mem_func.hpp"
+#include "../core/mem_func.h"
#include
#include "../safeguards.h"
diff --git a/src/music/win32_m.h b/src/music/win32_m.h
index 5101d29321..8ec82d1fd0 100644
--- a/src/music/win32_m.h
+++ b/src/music/win32_m.h
@@ -10,7 +10,7 @@
#ifndef MUSIC_WIN32_H
#define MUSIC_WIN32_H
-#include "music_driver.hpp"
+#include "music_driver.h"
/** The Windows music player. */
class MusicDriver_Win32 : public MusicDriver {
diff --git a/src/music_gui.cpp b/src/music_gui.cpp
index 728ba73c5c..0e1b6be817 100644
--- a/src/music_gui.cpp
+++ b/src/music_gui.cpp
@@ -10,17 +10,17 @@
#include "stdafx.h"
#include "openttd.h"
#include "base_media_base.h"
-#include "music/music_driver.hpp"
+#include "music/music_driver.h"
#include "window_gui.h"
#include "strings_func.h"
#include "window_func.h"
#include "sound_func.h"
#include "gfx_func.h"
#include "zoom_func.h"
-#include "core/random_func.hpp"
-#include "core/mem_func.hpp"
+#include "core/random_func.h"
+#include "core/mem_func.h"
#include "error.h"
-#include "core/geometry_func.hpp"
+#include "core/geometry_func.h"
#include "string_func.h"
#include "settings_type.h"
#include "settings_gui.h"
diff --git a/src/network/core/host.cpp b/src/network/core/host.cpp
index 7504f6986f..f9a44eb9a6 100644
--- a/src/network/core/host.cpp
+++ b/src/network/core/host.cpp
@@ -9,7 +9,7 @@
#include "../../stdafx.h"
#include "../../debug.h"
-#include "../../core/alloc_func.hpp"
+#include "../../core/alloc_func.h"
#include "address.h"
#include "../../safeguards.h"
diff --git a/src/network/core/network_game_info.cpp b/src/network/core/network_game_info.cpp
index ecf6569d86..4e61c81199 100644
--- a/src/network/core/network_game_info.cpp
+++ b/src/network/core/network_game_info.cpp
@@ -11,13 +11,13 @@
#include "../../stdafx.h"
#include "network_game_info.h"
-#include "../../core/bitmath_func.hpp"
+#include "../../core/bitmath_func.h"
#include "../../company_base.h"
#include "../../timer/timer_game_calendar.h"
#include "../../debug.h"
#include "../../map_func.h"
-#include "../../game/game.hpp"
-#include "../../game/game_info.hpp"
+#include "../../game/game.h"
+#include "../../game/game_info.h"
#include "../../settings_type.h"
#include "../../string_func.h"
#include "../../rev.h"
diff --git a/src/network/core/tcp_admin.h b/src/network/core/tcp_admin.h
index 567a791496..b68e50ede4 100644
--- a/src/network/core/tcp_admin.h
+++ b/src/network/core/tcp_admin.h
@@ -15,7 +15,7 @@
#include "os_abstraction.h"
#include "tcp.h"
#include "../network_type.h"
-#include "../../core/pool_type.hpp"
+#include "../../core/pool_type.h"
/**
* Enum with types of TCP packets specific to the admin network.
diff --git a/src/network/core/tcp_content.cpp b/src/network/core/tcp_content.cpp
index 11df443b86..8d6391e709 100644
--- a/src/network/core/tcp_content.cpp
+++ b/src/network/core/tcp_content.cpp
@@ -13,8 +13,8 @@
#include "../../textfile_gui.h"
#include "../../newgrf_config.h"
#include "../../base_media_base.h"
-#include "../../ai/ai.hpp"
-#include "../../game/game.hpp"
+#include "../../ai/ai.h"
+#include "../../game/game.h"
#include "../../fios.h"
#include "tcp_content.h"
diff --git a/src/network/core/tcp_coordinator.h b/src/network/core/tcp_coordinator.h
index 6e6b98f5c1..ea15693b43 100644
--- a/src/network/core/tcp_coordinator.h
+++ b/src/network/core/tcp_coordinator.h
@@ -116,7 +116,7 @@ protected:
* Send an update of the current state of the server to the Game Coordinator.
*
* uint8_t Game Coordinator protocol version.
- * Serialized NetworkGameInfo. See game_info.hpp for details.
+ * Serialized NetworkGameInfo. See game_info.h for details.
*
* @param p The packet that was just received.
* @return True upon success, otherwise false.
@@ -144,7 +144,7 @@ protected:
* uint16_t Amount of public servers in this packet.
* For each server:
* string Connection string for this server.
- * Serialized NetworkGameInfo. See game_info.hpp for details.
+ * Serialized NetworkGameInfo. See game_info.h for details.
*
* @param p The packet that was just received.
* @return True upon success, otherwise false.
diff --git a/src/network/core/tcp_game.h b/src/network/core/tcp_game.h
index 86705a0723..8423d79daf 100644
--- a/src/network/core/tcp_game.h
+++ b/src/network/core/tcp_game.h
@@ -15,7 +15,7 @@
#include "os_abstraction.h"
#include "tcp.h"
#include "../network_type.h"
-#include "../../core/pool_type.hpp"
+#include "../../core/pool_type.h"
#include
/**
diff --git a/src/network/core/tcp_listen.h b/src/network/core/tcp_listen.h
index 088cc7b8cd..954a94e756 100644
--- a/src/network/core/tcp_listen.h
+++ b/src/network/core/tcp_listen.h
@@ -14,7 +14,7 @@
#include "tcp.h"
#include "../network.h"
-#include "../../core/pool_type.hpp"
+#include "../../core/pool_type.h"
#include "../../debug.h"
#include "table/strings.h"
diff --git a/src/network/network.cpp b/src/network/network.cpp
index 9fa5562333..34d6d50cae 100644
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -27,13 +27,13 @@
#include "network_gui.h"
#include "../console_func.h"
#include "../3rdparty/md5/md5.h"
-#include "../core/random_func.hpp"
+#include "../core/random_func.h"
#include "../window_func.h"
#include "../company_func.h"
#include "../company_base.h"
#include "../landscape_type.h"
#include "../rev.h"
-#include "../core/pool_func.hpp"
+#include "../core/pool_func.h"
#include "../gfx_func.h"
#include "../error.h"
#include "../misc_cmd.h"
diff --git a/src/network/network_admin.cpp b/src/network/network_admin.cpp
index 3df0182937..404b5b8cfd 100644
--- a/src/network/network_admin.cpp
+++ b/src/network/network_admin.cpp
@@ -18,10 +18,10 @@
#include "../command_func.h"
#include "../company_base.h"
#include "../console_func.h"
-#include "../core/pool_func.hpp"
+#include "../core/pool_func.h"
#include "../map_func.h"
#include "../rev.h"
-#include "../game/game.hpp"
+#include "../game/game.h"
#include "../safeguards.h"
diff --git a/src/network/network_base.h b/src/network/network_base.h
index 3557cb45e4..08cf31b574 100644
--- a/src/network/network_base.h
+++ b/src/network/network_base.h
@@ -12,7 +12,7 @@
#include "network_type.h"
#include "core/address.h"
-#include "../core/pool_type.hpp"
+#include "../core/pool_type.h"
#include "../company_type.h"
#include "../timer/timer_game_calendar.h"
diff --git a/src/network/network_chat_gui.cpp b/src/network/network_chat_gui.cpp
index c91a74bde6..1fc11ed7dd 100644
--- a/src/network/network_chat_gui.cpp
+++ b/src/network/network_chat_gui.cpp
@@ -9,14 +9,14 @@
#include "../stdafx.h"
#include "../strings_func.h"
-#include "../blitter/factory.hpp"
+#include "../blitter/factory.h"
#include "../console_func.h"
-#include "../video/video_driver.hpp"
+#include "../video/video_driver.h"
#include "../querystring_gui.h"
#include "../town.h"
#include "../window_func.h"
#include "../toolbar_gui.h"
-#include "../core/geometry_func.hpp"
+#include "../core/geometry_func.h"
#include "../zoom_func.h"
#include "../timer/timer.h"
#include "../timer/timer_window.h"
diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp
index fa01e6f110..e7fe231762 100644
--- a/src/network/network_client.cpp
+++ b/src/network/network_client.cpp
@@ -19,7 +19,7 @@
#include "../company_base.h"
#include "../company_gui.h"
#include "../company_cmd.h"
-#include "../core/random_func.hpp"
+#include "../core/random_func.h"
#include "../timer/timer_game_tick.h"
#include "../timer/timer_game_calendar.h"
#include "../gfx_func.h"
@@ -29,7 +29,7 @@
#include "network_base.h"
#include "network_client.h"
#include "network_gamelist.h"
-#include "../core/backup_type.hpp"
+#include "../core/backup_type.h"
#include "../thread.h"
#include "table/strings.h"
diff --git a/src/network/network_content.cpp b/src/network/network_content.cpp
index e4a8ea8675..992ac4e17d 100644
--- a/src/network/network_content.cpp
+++ b/src/network/network_content.cpp
@@ -9,8 +9,8 @@
#include "../stdafx.h"
#include "../rev.h"
-#include "../ai/ai.hpp"
-#include "../game/game.hpp"
+#include "../ai/ai.h"
+#include "../game/game.h"
#include "../window_func.h"
#include "../error.h"
#include "../base_media_base.h"
diff --git a/src/network/network_content.h b/src/network/network_content.h
index a5f75bcd84..64a65eff21 100644
--- a/src/network/network_content.h
+++ b/src/network/network_content.h
@@ -13,7 +13,7 @@
#include "core/tcp_content.h"
#include "core/http.h"
#include
-#include "../core/container_func.hpp"
+#include "../core/container_func.h"
/** Vector with content info */
typedef std::vector ContentVector;
diff --git a/src/network/network_content_gui.cpp b/src/network/network_content_gui.cpp
index e937bfb0ea..93c800c7f0 100644
--- a/src/network/network_content_gui.cpp
+++ b/src/network/network_content_gui.cpp
@@ -12,14 +12,14 @@
#include "../gfx_func.h"
#include "../window_func.h"
#include "../error.h"
-#include "../ai/ai.hpp"
-#include "../game/game.hpp"
+#include "../ai/ai.h"
+#include "../game/game.h"
#include "../base_media_base.h"
#include "../openttd.h"
#include "../sortlist_type.h"
#include "../stringfilter_type.h"
#include "../querystring_gui.h"
-#include "../core/geometry_func.hpp"
+#include "../core/geometry_func.h"
#include "../textfile_gui.h"
#include "../fios.h"
#include "network_content_gui.h"
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index 8e92835663..94199a3401 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -29,7 +29,7 @@
#include "../sortlist_type.h"
#include "../company_func.h"
#include "../command_func.h"
-#include "../core/geometry_func.hpp"
+#include "../core/geometry_func.h"
#include "../genworld.h"
#include "../map_type.h"
#include "../zoom_func.h"
diff --git a/src/network/network_internal.h b/src/network/network_internal.h
index 395e12194f..bad923dcb8 100644
--- a/src/network/network_internal.h
+++ b/src/network/network_internal.h
@@ -16,7 +16,7 @@
#include "../command_type.h"
#include "../command_func.h"
-#include "../misc/endian_buffer.hpp"
+#include "../misc/endian_buffer.h"
#ifdef RANDOM_DEBUG
/**
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp
index a22d6b2d42..a3953eda2c 100644
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -26,8 +26,8 @@
#include "../company_cmd.h"
#include "../roadveh.h"
#include "../order_backup.h"
-#include "../core/pool_func.hpp"
-#include "../core/random_func.hpp"
+#include "../core/pool_func.h"
+#include "../core/random_func.h"
#include "../company_cmd.h"
#include "../rev.h"
#include "../timer/timer.h"
diff --git a/src/network/network_type.h b/src/network/network_type.h
index 5244fe18d6..4305216510 100644
--- a/src/network/network_type.h
+++ b/src/network/network_type.h
@@ -10,7 +10,7 @@
#ifndef NETWORK_TYPE_H
#define NETWORK_TYPE_H
-#include "../core/enum_type.hpp"
+#include "../core/enum_type.h"
/** How many clients can we have */
static const uint MAX_CLIENTS = 255;
diff --git a/src/network/network_udp.cpp b/src/network/network_udp.cpp
index 4d5ff526ea..b7b63e4c66 100644
--- a/src/network/network_udp.cpp
+++ b/src/network/network_udp.cpp
@@ -21,7 +21,7 @@
#include "network_internal.h"
#include "network_udp.h"
#include "network.h"
-#include "../core/endian_func.hpp"
+#include "../core/endian_func.h"
#include "../company_base.h"
#include "../rev.h"
#include "../newgrf_text.h"
diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index 621dd971f2..b9585072d2 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -9,7 +9,7 @@
#include "stdafx.h"
-#include "core/container_func.hpp"
+#include "core/container_func.h"
#include "debug.h"
#include "fileio_func.h"
#include "engine_func.h"
diff --git a/src/newgrf.h b/src/newgrf.h
index 9ca54e86d2..6d74b5b6fa 100644
--- a/src/newgrf.h
+++ b/src/newgrf.h
@@ -14,9 +14,9 @@
#include "rail_type.h"
#include "road_type.h"
#include "fileio_type.h"
-#include "core/bitmath_func.hpp"
-#include "core/alloc_type.hpp"
-#include "core/mem_func.hpp"
+#include "core/bitmath_func.h"
+#include "core/alloc_type.h"
+#include "core/mem_func.h"
/**
* List of different canal 'features'.
diff --git a/src/newgrf_animation_base.h b/src/newgrf_animation_base.h
index 7ab4968194..5f9bcb8dae 100644
--- a/src/newgrf_animation_base.h
+++ b/src/newgrf_animation_base.h
@@ -10,7 +10,7 @@
/* No inclusion guards as this file must only be included from .cpp files. */
#include "animated_tile_func.h"
-#include "core/random_func.hpp"
+#include "core/random_func.h"
#include "timer/timer_game_tick.h"
#include "viewport_func.h"
#include "newgrf_animation_type.h"
diff --git a/src/newgrf_commons.h b/src/newgrf_commons.h
index 08913fd40b..27ac00fd37 100644
--- a/src/newgrf_commons.h
+++ b/src/newgrf_commons.h
@@ -14,7 +14,7 @@
#define NEWGRF_COMMONS_H
#include "sprite.h"
-#include "core/alloc_type.hpp"
+#include "core/alloc_type.h"
#include "command_type.h"
#include "direction_type.h"
#include "company_type.h"
diff --git a/src/newgrf_config.cpp b/src/newgrf_config.cpp
index f3cec8b5a5..59a1ccd1e8 100644
--- a/src/newgrf_config.cpp
+++ b/src/newgrf_config.cpp
@@ -16,7 +16,7 @@
#include "newgrf_text.h"
#include "window_func.h"
#include "progress.h"
-#include "video/video_driver.hpp"
+#include "video/video_driver.h"
#include "string_func.h"
#include "strings_func.h"
#include "textfile_gui.h"
diff --git a/src/newgrf_config.h b/src/newgrf_config.h
index c9f6d51d71..018aa2248c 100644
--- a/src/newgrf_config.h
+++ b/src/newgrf_config.h
@@ -11,8 +11,8 @@
#define NEWGRF_CONFIG_H
#include "strings_type.h"
-#include "core/alloc_type.hpp"
-#include "misc/countedptr.hpp"
+#include "core/alloc_type.h"
+#include "misc/countedptr.h"
#include "fileio_type.h"
#include "textfile_type.h"
#include "newgrf_text.h"
diff --git a/src/newgrf_debug_gui.cpp b/src/newgrf_debug_gui.cpp
index 6bb16255bb..0b8e1041af 100644
--- a/src/newgrf_debug_gui.cpp
+++ b/src/newgrf_debug_gui.cpp
@@ -8,7 +8,7 @@
/** @file newgrf_debug_gui.cpp GUIs for debugging NewGRFs. */
#include "stdafx.h"
-#include "core/backup_type.hpp"
+#include "core/backup_type.h"
#include "window_gui.h"
#include "window_func.h"
#include "random_access_file_type.h"
diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp
index 703858ccc1..7860193fc2 100644
--- a/src/newgrf_engine.cpp
+++ b/src/newgrf_engine.cpp
@@ -16,8 +16,8 @@
#include "newgrf_spritegroup.h"
#include "timer/timer_game_calendar.h"
#include "vehicle_func.h"
-#include "core/random_func.hpp"
-#include "core/container_func.hpp"
+#include "core/random_func.h"
+#include "core/container_func.h"
#include "aircraft.h"
#include "station_base.h"
#include "company_base.h"
diff --git a/src/newgrf_generic.cpp b/src/newgrf_generic.cpp
index dcd660793c..b744e16812 100644
--- a/src/newgrf_generic.cpp
+++ b/src/newgrf_generic.cpp
@@ -11,7 +11,7 @@
#include "debug.h"
#include "newgrf_spritegroup.h"
#include "industrytype.h"
-#include "core/random_func.hpp"
+#include "core/random_func.h"
#include "newgrf_sound.h"
#include "water_map.h"
diff --git a/src/newgrf_gui.cpp b/src/newgrf_gui.cpp
index 0ad96c7b4a..1001c35b8e 100644
--- a/src/newgrf_gui.cpp
+++ b/src/newgrf_gui.cpp
@@ -23,7 +23,7 @@
#include "sortlist_type.h"
#include "stringfilter_type.h"
#include "querystring_gui.h"
-#include "core/geometry_func.hpp"
+#include "core/geometry_func.h"
#include "newgrf_text.h"
#include "textfile_gui.h"
#include "tilehighlight_func.h"
diff --git a/src/newgrf_industries.cpp b/src/newgrf_industries.cpp
index 2f37abf5d4..105ef60018 100644
--- a/src/newgrf_industries.cpp
+++ b/src/newgrf_industries.cpp
@@ -18,7 +18,7 @@
#include "company_base.h"
#include "error.h"
#include "strings_func.h"
-#include "core/random_func.hpp"
+#include "core/random_func.h"
#include "timer/timer_game_calendar.h"
#include "table/strings.h"
diff --git a/src/newgrf_industrytiles.h b/src/newgrf_industrytiles.h
index 8d39a09d59..cb42e55e02 100644
--- a/src/newgrf_industrytiles.h
+++ b/src/newgrf_industrytiles.h
@@ -12,7 +12,7 @@
#include "newgrf_animation_type.h"
#include "newgrf_industries.h"
-#include "core/random_func.hpp"
+#include "core/random_func.h"
/** Resolver for the industry tiles scope. */
struct IndustryTileScopeResolver : public ScopeResolver {
diff --git a/src/newgrf_railtype.cpp b/src/newgrf_railtype.cpp
index 608e63546f..103640d074 100644
--- a/src/newgrf_railtype.cpp
+++ b/src/newgrf_railtype.cpp
@@ -8,7 +8,7 @@
/** @file newgrf_railtype.cpp NewGRF handling of rail types. */
#include "stdafx.h"
-#include "core/container_func.hpp"
+#include "core/container_func.h"
#include "debug.h"
#include "newgrf_railtype.h"
#include "timer/timer_game_calendar.h"
diff --git a/src/newgrf_roadtype.cpp b/src/newgrf_roadtype.cpp
index 4a877c8bf3..5e347df28b 100644
--- a/src/newgrf_roadtype.cpp
+++ b/src/newgrf_roadtype.cpp
@@ -8,7 +8,7 @@
/** @file newgrf_roadtype.cpp NewGRF handling of road types. */
#include "stdafx.h"
-#include "core/container_func.hpp"
+#include "core/container_func.h"
#include "debug.h"
#include "newgrf_roadtype.h"
#include "timer/timer_game_calendar.h"
diff --git a/src/newgrf_spritegroup.cpp b/src/newgrf_spritegroup.cpp
index daa65ca0d7..3b1d43e544 100644
--- a/src/newgrf_spritegroup.cpp
+++ b/src/newgrf_spritegroup.cpp
@@ -11,7 +11,7 @@
#include "debug.h"
#include "newgrf_spritegroup.h"
#include "newgrf_profiling.h"
-#include "core/pool_func.hpp"
+#include "core/pool_func.h"
#include "safeguards.h"
diff --git a/src/newgrf_storage.cpp b/src/newgrf_storage.cpp
index b071c3c743..4c520f789c 100644
--- a/src/newgrf_storage.cpp
+++ b/src/newgrf_storage.cpp
@@ -9,8 +9,8 @@
#include "stdafx.h"
#include "newgrf_storage.h"
-#include "core/pool_func.hpp"
-#include "core/endian_func.hpp"
+#include "core/pool_func.h"
+#include "core/endian_func.h"
#include "debug.h"
#include "safeguards.h"
diff --git a/src/newgrf_storage.h b/src/newgrf_storage.h
index 16c5b8c700..90705f627a 100644
--- a/src/newgrf_storage.h
+++ b/src/newgrf_storage.h
@@ -10,8 +10,8 @@
#ifndef NEWGRF_STORAGE_H
#define NEWGRF_STORAGE_H
-#include "core/alloc_func.hpp"
-#include "core/pool_type.hpp"
+#include "core/alloc_func.h"
+#include "core/pool_type.h"
#include "tile_type.h"
/**
diff --git a/src/newgrf_text.cpp b/src/newgrf_text.cpp
index 40c4d87156..003620eb22 100644
--- a/src/newgrf_text.cpp
+++ b/src/newgrf_text.cpp
@@ -25,7 +25,7 @@
#include "string_func.h"
#include "timer/timer_game_calendar.h"
#include "debug.h"
-#include "core/alloc_type.hpp"
+#include "core/alloc_type.h"
#include "language.h"
#include
diff --git a/src/newgrf_townname.cpp b/src/newgrf_townname.cpp
index 82e9c9aa2c..912275dc50 100644
--- a/src/newgrf_townname.cpp
+++ b/src/newgrf_townname.cpp
@@ -14,7 +14,7 @@
#include "stdafx.h"
#include "newgrf_townname.h"
-#include "core/alloc_func.hpp"
+#include "core/alloc_func.h"
#include "string_func.h"
#include "strings_internal.h"
diff --git a/src/news_gui.cpp b/src/news_gui.cpp
index afd894fee4..9d1217bced 100644
--- a/src/news_gui.cpp
+++ b/src/news_gui.cpp
@@ -27,7 +27,7 @@
#include "company_func.h"
#include "engine_base.h"
#include "engine_gui.h"
-#include "core/geometry_func.hpp"
+#include "core/geometry_func.h"
#include "command_func.h"
#include "company_base.h"
#include "settings_internal.h"
diff --git a/src/news_type.h b/src/news_type.h
index ca6343d6d6..5547aa21e4 100644
--- a/src/news_type.h
+++ b/src/news_type.h
@@ -10,7 +10,7 @@
#ifndef NEWS_TYPE_H
#define NEWS_TYPE_H
-#include "core/enum_type.hpp"
+#include "core/enum_type.h"
#include "gfx_type.h"
#include "timer/timer_game_calendar.h"
#include "strings_type.h"
diff --git a/src/object_base.h b/src/object_base.h
index b54f0344e5..a245457416 100644
--- a/src/object_base.h
+++ b/src/object_base.h
@@ -10,7 +10,7 @@
#ifndef OBJECT_BASE_H
#define OBJECT_BASE_H
-#include "core/pool_type.hpp"
+#include "core/pool_type.h"
#include "object_type.h"
#include "tilearea_type.h"
#include "town_type.h"
diff --git a/src/object_cmd.cpp b/src/object_cmd.cpp
index f8c503499b..4e1757338b 100644
--- a/src/object_cmd.cpp
+++ b/src/object_cmd.cpp
@@ -23,8 +23,8 @@
#include "cheat_type.h"
#include "object.h"
#include "cargopacket.h"
-#include "core/random_func.hpp"
-#include "core/pool_func.hpp"
+#include "core/random_func.h"
+#include "core/pool_func.h"
#include "object_map.h"
#include "object_base.h"
#include "newgrf_config.h"
diff --git a/src/openttd.cpp b/src/openttd.cpp
index 57a7fb9a41..4520726b1c 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -9,10 +9,10 @@
#include "stdafx.h"
-#include "blitter/factory.hpp"
-#include "sound/sound_driver.hpp"
-#include "music/music_driver.hpp"
-#include "video/video_driver.hpp"
+#include "blitter/factory.h"
+#include "sound/sound_driver.h"
+#include "music/music_driver.h"
+#include "video/video_driver.h"
#include "mixer.h"
#include "fontcache.h"
@@ -35,8 +35,8 @@
#include "screenshot.h"
#include "network/network.h"
#include "network/network_func.h"
-#include "ai/ai.hpp"
-#include "ai/ai_config.hpp"
+#include "ai/ai.h"
+#include "ai/ai_config.h"
#include "settings_func.h"
#include "genworld.h"
#include "progress.h"
@@ -51,15 +51,15 @@
#include "station_base.h"
#include "crashlog.h"
#include "engine_func.h"
-#include "core/random_func.hpp"
+#include "core/random_func.h"
#include "rail_gui.h"
#include "road_gui.h"
-#include "core/backup_type.hpp"
+#include "core/backup_type.h"
#include "hotkeys.h"
#include "newgrf.h"
#include "misc/getoptdata.h"
-#include "game/game.hpp"
-#include "game/game_config.hpp"
+#include "game/game.h"
+#include "game/game_config.h"
#include "town.h"
#include "subsidy_func.h"
#include "gfx_layout.h"
diff --git a/src/openttd.h b/src/openttd.h
index 93875dfd6d..ed609719f5 100644
--- a/src/openttd.h
+++ b/src/openttd.h
@@ -12,7 +12,7 @@
#include
#include
-#include "core/enum_type.hpp"
+#include "core/enum_type.h"
/** Mode which defines the state of the game. */
enum GameMode {
diff --git a/src/order_backup.cpp b/src/order_backup.cpp
index f696d8435d..8dfa7b1c68 100644
--- a/src/order_backup.cpp
+++ b/src/order_backup.cpp
@@ -9,7 +9,7 @@
#include "stdafx.h"
#include "command_func.h"
-#include "core/pool_func.hpp"
+#include "core/pool_func.h"
#include "network/network.h"
#include "network/network_func.h"
#include "order_backup.h"
diff --git a/src/order_backup.h b/src/order_backup.h
index 8616c564ee..58e7e520da 100644
--- a/src/order_backup.h
+++ b/src/order_backup.h
@@ -10,7 +10,7 @@
#ifndef ORDER_BACKUP_H
#define ORDER_BACKUP_H
-#include "core/pool_type.hpp"
+#include "core/pool_type.h"
#include "group_type.h"
#include "tile_type.h"
#include "vehicle_type.h"
diff --git a/src/order_base.h b/src/order_base.h
index 4e8e8bd818..04996bc3cc 100644
--- a/src/order_base.h
+++ b/src/order_base.h
@@ -11,8 +11,8 @@
#define ORDER_BASE_H
#include "order_type.h"
-#include "core/pool_type.hpp"
-#include "core/bitmath_func.hpp"
+#include "core/pool_type.h"
+#include "core/bitmath_func.h"
#include "cargo_type.h"
#include "depot_type.h"
#include "station_type.h"
diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp
index d6e1748f90..c76ec4173e 100644
--- a/src/order_cmd.cpp
+++ b/src/order_cmd.cpp
@@ -16,8 +16,8 @@
#include "timetable.h"
#include "vehicle_func.h"
#include "depot_base.h"
-#include "core/pool_func.hpp"
-#include "core/random_func.hpp"
+#include "core/pool_func.h"
+#include "core/random_func.h"
#include "aircraft.h"
#include "roadveh.h"
#include "station_base.h"
diff --git a/src/order_cmd.h b/src/order_cmd.h
index b0ab888d94..01dec9ed7f 100644
--- a/src/order_cmd.h
+++ b/src/order_cmd.h
@@ -12,7 +12,7 @@
#include "command_type.h"
#include "order_base.h"
-#include "misc/endian_buffer.hpp"
+#include "misc/endian_buffer.h"
CommandCost CmdModifyOrder(DoCommandFlag flags, VehicleID veh, VehicleOrderID sel_ord, ModifyOrderFlags mof, uint16_t data);
CommandCost CmdSkipToOrder(DoCommandFlag flags, VehicleID veh_id, VehicleOrderID sel_ord);
diff --git a/src/order_gui.cpp b/src/order_gui.cpp
index ec9b7960bb..7c6f87b82c 100644
--- a/src/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -24,7 +24,7 @@
#include "station_base.h"
#include "industry.h"
#include "waypoint_base.h"
-#include "core/geometry_func.hpp"
+#include "core/geometry_func.h"
#include "hotkeys.h"
#include "aircraft.h"
#include "engine_func.h"
diff --git a/src/order_type.h b/src/order_type.h
index 2e4717c7f2..05967d776f 100644
--- a/src/order_type.h
+++ b/src/order_type.h
@@ -10,7 +10,7 @@
#ifndef ORDER_TYPE_H
#define ORDER_TYPE_H
-#include "core/enum_type.hpp"
+#include "core/enum_type.h"
typedef byte VehicleOrderID; ///< The index of an order within its current vehicle (not pool related)
typedef uint32_t OrderID;
diff --git a/src/os/macosx/crashlog_osx.cpp b/src/os/macosx/crashlog_osx.cpp
index 8e3f4c224b..f43addcc55 100644
--- a/src/os/macosx/crashlog_osx.cpp
+++ b/src/os/macosx/crashlog_osx.cpp
@@ -13,7 +13,7 @@
#include "../../string_func.h"
#include "../../gamelog.h"
#include "../../saveload/saveload.h"
-#include "../../video/video_driver.hpp"
+#include "../../video/video_driver.h"
#include "macos.h"
#include
diff --git a/src/os/macosx/font_osx.cpp b/src/os/macosx/font_osx.cpp
index 2b5f0e14b1..4c8239eeb5 100644
--- a/src/os/macosx/font_osx.cpp
+++ b/src/os/macosx/font_osx.cpp
@@ -10,8 +10,8 @@
#include "../../stdafx.h"
#include "../../debug.h"
#include "font_osx.h"
-#include "../../core/math_func.hpp"
-#include "../../blitter/factory.hpp"
+#include "../../core/math_func.h"
+#include "../../blitter/factory.h"
#include "../../error_func.h"
#include "../../fileio_func.h"
#include "../../fontdetection.h"
diff --git a/src/os/macosx/macos.mm b/src/os/macosx/macos.mm
index 1b1beacab4..43f217941d 100644
--- a/src/os/macosx/macos.mm
+++ b/src/os/macosx/macos.mm
@@ -8,7 +8,7 @@
/** @file macos.mm Code related to MacOSX. */
#include "../../stdafx.h"
-#include "../../core/bitmath_func.hpp"
+#include "../../core/bitmath_func.h"
#include "../../rev.h"
#include "macos.h"
#include "../../string_func.h"
diff --git a/src/os/macosx/osx_main.cpp b/src/os/macosx/osx_main.cpp
index f33e371436..089271ab67 100644
--- a/src/os/macosx/osx_main.cpp
+++ b/src/os/macosx/osx_main.cpp
@@ -10,7 +10,7 @@
#include "../../stdafx.h"
#include "../../openttd.h"
#include "../../crashlog.h"
-#include "../../core/random_func.hpp"
+#include "../../core/random_func.h"
#include "../../string_func.h"
#include
diff --git a/src/os/unix/unix_main.cpp b/src/os/unix/unix_main.cpp
index 41ad22ced5..f37fb32d28 100644
--- a/src/os/unix/unix_main.cpp
+++ b/src/os/unix/unix_main.cpp
@@ -10,7 +10,7 @@
#include "../../stdafx.h"
#include "../../openttd.h"
#include "../../crashlog.h"
-#include "../../core/random_func.hpp"
+#include "../../core/random_func.h"
#include "../../string_func.h"
#include
diff --git a/src/os/windows/crashlog_win.cpp b/src/os/windows/crashlog_win.cpp
index e74fc5ed0b..c2471a9372 100644
--- a/src/os/windows/crashlog_win.cpp
+++ b/src/os/windows/crashlog_win.cpp
@@ -10,13 +10,13 @@
#include "../../stdafx.h"
#include "../../crashlog.h"
#include "win32.h"
-#include "../../core/math_func.hpp"
+#include "../../core/math_func.h"
#include "../../string_func.h"
#include "../../fileio_func.h"
#include "../../strings_func.h"
#include "../../gamelog.h"
#include "../../saveload/saveload.h"
-#include "../../video/video_driver.hpp"
+#include "../../video/video_driver.h"
#include "../../library_loader.h"
#include
diff --git a/src/os/windows/font_win32.cpp b/src/os/windows/font_win32.cpp
index 1dc1977b37..de8e9d822b 100644
--- a/src/os/windows/font_win32.cpp
+++ b/src/os/windows/font_win32.cpp
@@ -9,10 +9,10 @@
#include "../../stdafx.h"
#include "../../debug.h"
-#include "../../blitter/factory.hpp"
-#include "../../core/alloc_func.hpp"
-#include "../../core/math_func.hpp"
-#include "../../core/mem_func.hpp"
+#include "../../blitter/factory.h"
+#include "../../core/alloc_func.h"
+#include "../../core/math_func.h"
+#include "../../core/mem_func.h"
#include "../../error_func.h"
#include "../../fileio_func.h"
#include "../../fontcache.h"
diff --git a/src/os/windows/win32.cpp b/src/os/windows/win32.cpp
index b198ed92c4..1bccbc38ff 100644
--- a/src/os/windows/win32.cpp
+++ b/src/os/windows/win32.cpp
@@ -22,7 +22,7 @@
#include
#include "win32.h"
#include "../../fios.h"
-#include "../../core/alloc_func.hpp"
+#include "../../core/alloc_func.h"
#include "../../string_func.h"
#include
#include "../../language.h"
diff --git a/src/os/windows/win32_main.cpp b/src/os/windows/win32_main.cpp
index ebc22ffc71..6011b9a1c3 100644
--- a/src/os/windows/win32_main.cpp
+++ b/src/os/windows/win32_main.cpp
@@ -11,7 +11,7 @@
#include
#include
#include "../../openttd.h"
-#include "../../core/random_func.hpp"
+#include "../../core/random_func.h"
#include "../../string_func.h"
#include "../../crashlog.h"
#include "../../debug.h"
diff --git a/src/osk_gui.cpp b/src/osk_gui.cpp
index 00d311ff24..bdce426635 100644
--- a/src/osk_gui.cpp
+++ b/src/osk_gui.cpp
@@ -14,7 +14,7 @@
#include "window_func.h"
#include "gfx_func.h"
#include "querystring_gui.h"
-#include "video/video_driver.hpp"
+#include "video/video_driver.h"
#include "zoom_func.h"
#include "widgets/osk_widget.h"
diff --git a/src/palette.cpp b/src/palette.cpp
index c2311ed08a..5234688428 100644
--- a/src/palette.cpp
+++ b/src/palette.cpp
@@ -8,8 +8,8 @@
/** @file palette.cpp Handling of palettes. */
#include "stdafx.h"
-#include "blitter/base.hpp"
-#include "blitter/factory.hpp"
+#include "blitter/base.h"
+#include "blitter/factory.h"
#include "fileio_func.h"
#include "gfx_type.h"
#include "landscape_type.h"
diff --git a/src/pathfinder/CMakeLists.txt b/src/pathfinder/CMakeLists.txt
index adf896895d..aad62d56e5 100644
--- a/src/pathfinder/CMakeLists.txt
+++ b/src/pathfinder/CMakeLists.txt
@@ -2,7 +2,7 @@ add_subdirectory(npf)
add_subdirectory(yapf)
add_files(
- follow_track.hpp
+ follow_track.h
pathfinder_func.h
pathfinder_type.h
water_regions.h
diff --git a/src/pathfinder/follow_track.hpp b/src/pathfinder/follow_track.h
similarity index 99%
rename from src/pathfinder/follow_track.hpp
rename to src/pathfinder/follow_track.h
index 3cdb3625b5..b6630ae137 100644
--- a/src/pathfinder/follow_track.hpp
+++ b/src/pathfinder/follow_track.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 .
*/
-/** @file follow_track.hpp Template function for track followers */
+/** @file follow_track.h Template function for track followers */
#ifndef FOLLOW_TRACK_HPP
#define FOLLOW_TRACK_HPP
diff --git a/src/pathfinder/npf/aystar.cpp b/src/pathfinder/npf/aystar.cpp
index b52b762d84..090bef93c3 100644
--- a/src/pathfinder/npf/aystar.cpp
+++ b/src/pathfinder/npf/aystar.cpp
@@ -22,7 +22,7 @@
*/
#include "../../stdafx.h"
-#include "../../core/alloc_func.hpp"
+#include "../../core/alloc_func.h"
#include "aystar.h"
#include "../../safeguards.h"
diff --git a/src/pathfinder/npf/npf.cpp b/src/pathfinder/npf/npf.cpp
index 2bc642a52f..1f5855f76c 100644
--- a/src/pathfinder/npf/npf.cpp
+++ b/src/pathfinder/npf/npf.cpp
@@ -16,7 +16,7 @@
#include "../../vehicle_func.h"
#include "../pathfinder_func.h"
#include "../pathfinder_type.h"
-#include "../follow_track.hpp"
+#include "../follow_track.h"
#include "aystar.h"
#include "../../safeguards.h"
diff --git a/src/pathfinder/npf/queue.cpp b/src/pathfinder/npf/queue.cpp
index 66b05004b4..e7b5f25dc9 100644
--- a/src/pathfinder/npf/queue.cpp
+++ b/src/pathfinder/npf/queue.cpp
@@ -8,7 +8,7 @@
/** @file queue.cpp Implementation of the #BinaryHeap/#Hash. */
#include "../../stdafx.h"
-#include "../../core/alloc_func.hpp"
+#include "../../core/alloc_func.h"
#include "queue.h"
#include "../../safeguards.h"
diff --git a/src/pathfinder/water_regions.cpp b/src/pathfinder/water_regions.cpp
index 2bda5aa1cf..d97b3061e0 100644
--- a/src/pathfinder/water_regions.cpp
+++ b/src/pathfinder/water_regions.cpp
@@ -16,7 +16,7 @@
#include "transport_type.h"
#include "landscape.h"
#include "tunnelbridge_map.h"
-#include "follow_track.hpp"
+#include "follow_track.h"
#include "ship.h"
using TWaterRegionTraversabilityBits = uint16_t;
diff --git a/src/pathfinder/yapf/CMakeLists.txt b/src/pathfinder/yapf/CMakeLists.txt
index 529cd022eb..cc9cb9c59e 100644
--- a/src/pathfinder/yapf/CMakeLists.txt
+++ b/src/pathfinder/yapf/CMakeLists.txt
@@ -1,22 +1,22 @@
add_files(
- nodelist.hpp
+ nodelist.h
yapf.h
- yapf_base.hpp
+ yapf_base.h
yapf_cache.h
- yapf_common.hpp
- yapf_costbase.hpp
- yapf_costcache.hpp
- yapf_costrail.hpp
- yapf_destrail.hpp
+ yapf_common.h
+ yapf_costbase.h
+ yapf_costcache.h
+ yapf_costrail.h
+ yapf_destrail.h
yapf_includes.h
- yapf_node.hpp
- yapf_node_rail.hpp
- yapf_node_road.hpp
- yapf_node_ship.hpp
+ yapf_node.h
+ yapf_node_rail.h
+ yapf_node_road.h
+ yapf_node_ship.h
yapf_rail.cpp
yapf_road.cpp
yapf_ship.cpp
yapf_ship_regions.h
yapf_ship_regions.cpp
- yapf_type.hpp
+ yapf_type.h
)
diff --git a/src/pathfinder/yapf/nodelist.hpp b/src/pathfinder/yapf/nodelist.h
similarity index 96%
rename from src/pathfinder/yapf/nodelist.hpp
rename to src/pathfinder/yapf/nodelist.h
index b74345e544..b9ff6df032 100644
--- a/src/pathfinder/yapf/nodelist.hpp
+++ b/src/pathfinder/yapf/nodelist.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 .
*/
-/** @file nodelist.hpp List of nodes used for the A-star pathfinder. */
+/** @file nodelist.h List of nodes used for the A-star pathfinder. */
#ifndef NODELIST_HPP
#define NODELIST_HPP
-#include "../../misc/array.hpp"
-#include "../../misc/hashtable.hpp"
-#include "../../misc/binaryheap.hpp"
+#include "../../misc/array.h"
+#include "../../misc/hashtable.h"
+#include "../../misc/binaryheap.h"
/**
* Hash table based node list multi-container class.
diff --git a/src/pathfinder/yapf/yapf_base.hpp b/src/pathfinder/yapf/yapf_base.h
similarity index 99%
rename from src/pathfinder/yapf/yapf_base.hpp
rename to src/pathfinder/yapf/yapf_base.h
index 07d90cf939..92c9d866db 100644
--- a/src/pathfinder/yapf/yapf_base.hpp
+++ b/src/pathfinder/yapf/yapf_base.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 .
*/
-/** @file yapf_base.hpp Base classes for YAPF. */
+/** @file yapf_base.h Base classes for YAPF. */
#ifndef YAPF_BASE_HPP
#define YAPF_BASE_HPP
diff --git a/src/pathfinder/yapf/yapf_common.hpp b/src/pathfinder/yapf/yapf_common.h
similarity index 99%
rename from src/pathfinder/yapf/yapf_common.hpp
rename to src/pathfinder/yapf/yapf_common.h
index 3a136e995a..e03de65a4f 100644
--- a/src/pathfinder/yapf/yapf_common.hpp
+++ b/src/pathfinder/yapf/yapf_common.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 .
*/
-/** @file yapf_common.hpp Commonly used classes for YAPF. */
+/** @file yapf_common.h Commonly used classes for YAPF. */
#ifndef YAPF_COMMON_HPP
#define YAPF_COMMON_HPP
diff --git a/src/pathfinder/yapf/yapf_costbase.hpp b/src/pathfinder/yapf/yapf_costbase.h
similarity index 96%
rename from src/pathfinder/yapf/yapf_costbase.hpp
rename to src/pathfinder/yapf/yapf_costbase.h
index 8da9257d91..7f8bc5eb6a 100644
--- a/src/pathfinder/yapf/yapf_costbase.hpp
+++ b/src/pathfinder/yapf/yapf_costbase.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 .
*/
-/** @file yapf_costbase.hpp Handling of cost determination. */
+/** @file yapf_costbase.h Handling of cost determination. */
#ifndef YAPF_COSTBASE_HPP
#define YAPF_COSTBASE_HPP
diff --git a/src/pathfinder/yapf/yapf_costcache.hpp b/src/pathfinder/yapf/yapf_costcache.h
similarity index 98%
rename from src/pathfinder/yapf/yapf_costcache.hpp
rename to src/pathfinder/yapf/yapf_costcache.h
index 06e8566a79..840cd2392b 100644
--- a/src/pathfinder/yapf/yapf_costcache.hpp
+++ b/src/pathfinder/yapf/yapf_costcache.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 .
*/
-/** @file yapf_costcache.hpp Caching of segment costs. */
+/** @file yapf_costcache.h Caching of segment costs. */
#ifndef YAPF_COSTCACHE_HPP
#define YAPF_COSTCACHE_HPP
@@ -116,7 +116,7 @@ struct CSegmentCostCacheBase
* be always the same (TileIndex + DiagDirection) that represent the beginning
* of the segment (origin tile and exit-dir from this tile).
* Different CYapfCachedCostT types can share the same type of CSegmentCostCacheT.
- * Look at CYapfRailSegment (yapf_node_rail.hpp) for the segment example
+ * Look at CYapfRailSegment (yapf_node_rail.h) for the segment example
*/
template
struct CSegmentCostCacheT : public CSegmentCostCacheBase {
diff --git a/src/pathfinder/yapf/yapf_costrail.hpp b/src/pathfinder/yapf/yapf_costrail.h
similarity index 99%
rename from src/pathfinder/yapf/yapf_costrail.hpp
rename to src/pathfinder/yapf/yapf_costrail.h
index f6217d2b24..c61abe8acd 100644
--- a/src/pathfinder/yapf/yapf_costrail.hpp
+++ b/src/pathfinder/yapf/yapf_costrail.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 .
*/
-/** @file yapf_costrail.hpp Cost determination for rails. */
+/** @file yapf_costrail.h Cost determination for rails. */
#ifndef YAPF_COSTRAIL_HPP
#define YAPF_COSTRAIL_HPP
diff --git a/src/pathfinder/yapf/yapf_destrail.hpp b/src/pathfinder/yapf/yapf_destrail.h
similarity index 98%
rename from src/pathfinder/yapf/yapf_destrail.hpp
rename to src/pathfinder/yapf/yapf_destrail.h
index 7abc4294ee..8f6736c056 100644
--- a/src/pathfinder/yapf/yapf_destrail.hpp
+++ b/src/pathfinder/yapf/yapf_destrail.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 .
*/
-/** @file yapf_destrail.hpp Determining the destination for rail vehicles. */
+/** @file yapf_destrail.h Determining the destination for rail vehicles. */
#ifndef YAPF_DESTRAIL_HPP
#define YAPF_DESTRAIL_HPP
diff --git a/src/pathfinder/yapf/yapf_includes.h b/src/pathfinder/yapf/yapf_includes.h
index 053991bf2b..e2e982f3bb 100644
--- a/src/pathfinder/yapf/yapf_includes.h
+++ b/src/pathfinder/yapf/yapf_includes.h
@@ -14,19 +14,19 @@
#include "../pathfinder_func.h"
#include "yapf.h"
-#include "../../misc/fixedsizearray.hpp"
-#include "../../misc/array.hpp"
-#include "../../misc/hashtable.hpp"
-#include "../../misc/binaryheap.hpp"
+#include "../../misc/fixedsizearray.h"
+#include "../../misc/array.h"
+#include "../../misc/hashtable.h"
+#include "../../misc/binaryheap.h"
#include "../../misc/dbg_helpers.h"
-#include "nodelist.hpp"
-#include "../follow_track.hpp"
-#include "yapf_type.hpp"
-#include "yapf_base.hpp"
-#include "yapf_node.hpp"
-#include "yapf_common.hpp"
-#include "yapf_costbase.hpp"
-#include "yapf_costcache.hpp"
+#include "nodelist.h"
+#include "../follow_track.h"
+#include "yapf_type.h"
+#include "yapf_base.h"
+#include "yapf_node.h"
+#include "yapf_common.h"
+#include "yapf_costbase.h"
+#include "yapf_costcache.h"
#endif /* YAPF_HPP */
diff --git a/src/pathfinder/yapf/yapf_node.hpp b/src/pathfinder/yapf/yapf_node.h
similarity index 98%
rename from src/pathfinder/yapf/yapf_node.hpp
rename to src/pathfinder/yapf/yapf_node.h
index 82c212708b..8355095d5a 100644
--- a/src/pathfinder/yapf/yapf_node.hpp
+++ b/src/pathfinder/yapf/yapf_node.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 .
*/
-/** @file yapf_node.hpp Node in the pathfinder's graph. */
+/** @file yapf_node.h Node in the pathfinder's graph. */
#ifndef YAPF_NODE_HPP
#define YAPF_NODE_HPP
diff --git a/src/pathfinder/yapf/yapf_node_rail.hpp b/src/pathfinder/yapf/yapf_node_rail.h
similarity index 98%
rename from src/pathfinder/yapf/yapf_node_rail.hpp
rename to src/pathfinder/yapf/yapf_node_rail.h
index 7309fa02d2..af88baae74 100644
--- a/src/pathfinder/yapf/yapf_node_rail.hpp
+++ b/src/pathfinder/yapf/yapf_node_rail.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 .
*/
-/** @file yapf_node_rail.hpp Node tailored for rail pathfinding. */
+/** @file yapf_node_rail.h Node tailored for rail pathfinding. */
#ifndef YAPF_NODE_RAIL_HPP
#define YAPF_NODE_RAIL_HPP
diff --git a/src/pathfinder/yapf/yapf_node_road.hpp b/src/pathfinder/yapf/yapf_node_road.h
similarity index 95%
rename from src/pathfinder/yapf/yapf_node_road.hpp
rename to src/pathfinder/yapf/yapf_node_road.h
index cf5fda95c9..c275184c7c 100644
--- a/src/pathfinder/yapf/yapf_node_road.hpp
+++ b/src/pathfinder/yapf/yapf_node_road.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 .
*/
-/** @file yapf_node_road.hpp Node tailored for road pathfinding. */
+/** @file yapf_node_road.h Node tailored for road pathfinding. */
#ifndef YAPF_NODE_ROAD_HPP
#define YAPF_NODE_ROAD_HPP
diff --git a/src/pathfinder/yapf/yapf_node_ship.hpp b/src/pathfinder/yapf/yapf_node_ship.h
similarity index 95%
rename from src/pathfinder/yapf/yapf_node_ship.hpp
rename to src/pathfinder/yapf/yapf_node_ship.h
index 63e21987a3..5ffb775dc7 100644
--- a/src/pathfinder/yapf/yapf_node_ship.hpp
+++ b/src/pathfinder/yapf/yapf_node_ship.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 .
*/
-/** @file yapf_node_ship.hpp Node tailored for ship pathfinding. */
+/** @file yapf_node_ship.h Node tailored for ship pathfinding. */
#ifndef YAPF_NODE_SHIP_HPP
#define YAPF_NODE_SHIP_HPP
diff --git a/src/pathfinder/yapf/yapf_rail.cpp b/src/pathfinder/yapf/yapf_rail.cpp
index 825e2ca0eb..0eab91b7fe 100644
--- a/src/pathfinder/yapf/yapf_rail.cpp
+++ b/src/pathfinder/yapf/yapf_rail.cpp
@@ -11,9 +11,9 @@
#include "yapf_includes.h"
#include "yapf_cache.h"
-#include "yapf_node_rail.hpp"
-#include "yapf_costrail.hpp"
-#include "yapf_destrail.hpp"
+#include "yapf_node_rail.h"
+#include "yapf_costrail.h"
+#include "yapf_destrail.h"
#include "../../viewport_func.h"
#include "../../newgrf_station.h"
diff --git a/src/pathfinder/yapf/yapf_road.cpp b/src/pathfinder/yapf/yapf_road.cpp
index 5ae0292a0d..c64ecc5c59 100644
--- a/src/pathfinder/yapf/yapf_road.cpp
+++ b/src/pathfinder/yapf/yapf_road.cpp
@@ -9,7 +9,7 @@
#include "../../stdafx.h"
#include "yapf_includes.h"
-#include "yapf_node_road.hpp"
+#include "yapf_node_road.h"
#include "../../roadstop_base.h"
#include "../../safeguards.h"
diff --git a/src/pathfinder/yapf/yapf_ship.cpp b/src/pathfinder/yapf/yapf_ship.cpp
index 02789d047d..807eaa6c46 100644
--- a/src/pathfinder/yapf/yapf_ship.cpp
+++ b/src/pathfinder/yapf/yapf_ship.cpp
@@ -13,7 +13,7 @@
#include "../../vehicle_func.h"
#include "yapf_includes.h"
-#include "yapf_node_ship.hpp"
+#include "yapf_node_ship.h"
#include "yapf_ship_regions.h"
#include "../water_regions.h"
diff --git a/src/pathfinder/yapf/yapf_type.hpp b/src/pathfinder/yapf/yapf_type.h
similarity index 98%
rename from src/pathfinder/yapf/yapf_type.hpp
rename to src/pathfinder/yapf/yapf_type.h
index 4f301b0fb7..bf95c9d565 100644
--- a/src/pathfinder/yapf/yapf_type.hpp
+++ b/src/pathfinder/yapf/yapf_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 .
*/
-/** @file yapf_type.hpp Types used by YAPF. */
+/** @file yapf_type.h Types used by YAPF. */
#ifndef YAPF_TYPE_HPP
#define YAPF_TYPE_HPP
diff --git a/src/pbs.cpp b/src/pbs.cpp
index df3a5cf339..1e2df3243c 100644
--- a/src/pbs.cpp
+++ b/src/pbs.cpp
@@ -11,7 +11,7 @@
#include "viewport_func.h"
#include "vehicle_func.h"
#include "newgrf_station.h"
-#include "pathfinder/follow_track.hpp"
+#include "pathfinder/follow_track.h"
#include "safeguards.h"
diff --git a/src/rail.h b/src/rail.h
index 6fe9c28d69..bb53563837 100644
--- a/src/rail.h
+++ b/src/rail.h
@@ -13,7 +13,7 @@
#include "rail_type.h"
#include "track_type.h"
#include "gfx_type.h"
-#include "core/bitmath_func.hpp"
+#include "core/bitmath_func.h"
#include "economy_func.h"
#include "slope_type.h"
#include "strings_type.h"
diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp
index c59b195551..995bf4d62f 100644
--- a/src/rail_cmd.cpp
+++ b/src/rail_cmd.cpp
@@ -25,8 +25,8 @@
#include "town.h"
#include "pbs.h"
#include "company_base.h"
-#include "core/backup_type.hpp"
-#include "core/container_func.hpp"
+#include "core/backup_type.h"
+#include "core/container_func.h"
#include "timer/timer_game_calendar.h"
#include "strings_func.h"
#include "company_gui.h"
diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp
index 4b443941d2..d96e03fc88 100644
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -25,7 +25,7 @@
#include "tunnelbridge.h"
#include "tilehighlight_func.h"
#include "spritecache.h"
-#include "core/geometry_func.hpp"
+#include "core/geometry_func.h"
#include "hotkeys.h"
#include "engine_base.h"
#include "vehicle_func.h"
diff --git a/src/rail_type.h b/src/rail_type.h
index ec44021f5d..ab697f5978 100644
--- a/src/rail_type.h
+++ b/src/rail_type.h
@@ -10,7 +10,7 @@
#ifndef RAIL_TYPE_H
#define RAIL_TYPE_H
-#include "core/enum_type.hpp"
+#include "core/enum_type.h"
typedef uint32_t RailTypeLabel;
diff --git a/src/rev.cpp.in b/src/rev.cpp.in
index a2270c2c1d..48bf1815e4 100644
--- a/src/rev.cpp.in
+++ b/src/rev.cpp.in
@@ -8,7 +8,7 @@
/** @file rev.cpp Autogenerated file with the revision and such of OpenTTD. */
#include "stdafx.h"
-#include "core/bitmath_func.hpp"
+#include "core/bitmath_func.h"
#include "rev.h"
#include "safeguards.h"
diff --git a/src/road.h b/src/road.h
index c6a88e8552..963c66bca1 100644
--- a/src/road.h
+++ b/src/road.h
@@ -12,10 +12,10 @@
#include "road_type.h"
#include "gfx_type.h"
-#include "core/bitmath_func.hpp"
+#include "core/bitmath_func.h"
#include "strings_type.h"
#include "timer/timer_game_calendar.h"
-#include "core/enum_type.hpp"
+#include "core/enum_type.h"
#include "newgrf.h"
#include "economy_func.h"
diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp
index 69f540d43d..ccb801e0fc 100644
--- a/src/road_cmd.cpp
+++ b/src/road_cmd.cpp
@@ -29,8 +29,8 @@
#include "train.h"
#include "town.h"
#include "company_base.h"
-#include "core/random_func.hpp"
-#include "core/container_func.hpp"
+#include "core/random_func.h"
+#include "core/container_func.h"
#include "newgrf_debug.h"
#include "newgrf_railtype.h"
#include "newgrf_roadtype.h"
diff --git a/src/road_func.h b/src/road_func.h
index 7c73597b9f..076ec62727 100644
--- a/src/road_func.h
+++ b/src/road_func.h
@@ -10,7 +10,7 @@
#ifndef ROAD_FUNC_H
#define ROAD_FUNC_H
-#include "core/bitmath_func.hpp"
+#include "core/bitmath_func.h"
#include "road.h"
#include "economy_func.h"
#include "transparency.h"
diff --git a/src/road_gui.cpp b/src/road_gui.cpp
index adb88f33e6..fad7f6a81d 100644
--- a/src/road_gui.cpp
+++ b/src/road_gui.cpp
@@ -29,7 +29,7 @@
#include "zoom_func.h"
#include "engine_base.h"
#include "strings_func.h"
-#include "core/geometry_func.hpp"
+#include "core/geometry_func.h"
#include "station_cmd.h"
#include "road_cmd.h"
#include "tunnelbridge_cmd.h"
diff --git a/src/road_type.h b/src/road_type.h
index e36f023d44..17ae6e4361 100644
--- a/src/road_type.h
+++ b/src/road_type.h
@@ -10,7 +10,7 @@
#ifndef ROAD_TYPE_H
#define ROAD_TYPE_H
-#include "core/enum_type.hpp"
+#include "core/enum_type.h"
typedef uint32_t RoadTypeLabel;
diff --git a/src/roadstop.cpp b/src/roadstop.cpp
index 2e4f441973..f1336f9194 100644
--- a/src/roadstop.cpp
+++ b/src/roadstop.cpp
@@ -9,7 +9,7 @@
#include "stdafx.h"
#include "roadveh.h"
-#include "core/pool_func.hpp"
+#include "core/pool_func.h"
#include "roadstop_base.h"
#include "station_base.h"
#include "vehicle_func.h"
diff --git a/src/roadstop_base.h b/src/roadstop_base.h
index 768b54282d..722a44f3ec 100644
--- a/src/roadstop_base.h
+++ b/src/roadstop_base.h
@@ -11,8 +11,8 @@
#define ROADSTOP_BASE_H
#include "station_type.h"
-#include "core/pool_type.hpp"
-#include "core/bitmath_func.hpp"
+#include "core/pool_type.h"
+#include "core/bitmath_func.h"
#include "vehicle_type.h"
typedef Pool RoadStopPool;
diff --git a/src/roadveh.h b/src/roadveh.h
index 90b02ba878..e91178a1f5 100644
--- a/src/roadveh.h
+++ b/src/roadveh.h
@@ -10,7 +10,7 @@
#ifndef ROADVEH_H
#define ROADVEH_H
-#include "ground_vehicle.hpp"
+#include "ground_vehicle.h"
#include "engine_base.h"
#include "cargotype.h"
#include "track_func.h"
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp
index 52e1e4ac58..99d870e5ca 100644
--- a/src/roadveh_cmd.cpp
+++ b/src/roadveh_cmd.cpp
@@ -23,15 +23,15 @@
#include "timer/timer_game_calendar.h"
#include "vehicle_func.h"
#include "sound_func.h"
-#include "ai/ai.hpp"
-#include "game/game.hpp"
+#include "ai/ai.h"
+#include "game/game.h"
#include "depot_map.h"
#include "effectvehicle_func.h"
#include "roadstop_base.h"
#include "spritecache.h"
-#include "core/random_func.hpp"
+#include "core/random_func.h"
#include "company_base.h"
-#include "core/backup_type.hpp"
+#include "core/backup_type.h"
#include "newgrf.h"
#include "zoom_func.h"
#include "framerate_type.h"
diff --git a/src/roadveh_gui.cpp b/src/roadveh_gui.cpp
index f2ee0c6684..a1ecb62db9 100644
--- a/src/roadveh_gui.cpp
+++ b/src/roadveh_gui.cpp
@@ -8,7 +8,7 @@
/** @file roadveh_gui.cpp GUI for road vehicles. */
#include "stdafx.h"
-#include "core/backup_type.hpp"
+#include "core/backup_type.h"
#include "roadveh.h"
#include "window_gui.h"
#include "strings_func.h"
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp
index 33d12648b5..c61818f1b3 100644
--- a/src/saveload/afterload.cpp
+++ b/src/saveload/afterload.cpp
@@ -38,9 +38,9 @@
#include "../tree_map.h"
#include "../company_func.h"
#include "../road_cmd.h"
-#include "../ai/ai.hpp"
+#include "../ai/ai.h"
#include "../script/script_gui.h"
-#include "../game/game.hpp"
+#include "../game/game.h"
#include "../town.h"
#include "../economy_base.h"
#include "../animated_tile_func.h"
@@ -50,7 +50,7 @@
#include "../newgrf_station.h"
#include "../engine_func.h"
#include "../rail_gui.h"
-#include "../core/backup_type.hpp"
+#include "../core/backup_type.h"
#include "../smallmap_gui.h"
#include "../news_func.h"
#include "../order_backup.h"
diff --git a/src/saveload/ai_sl.cpp b/src/saveload/ai_sl.cpp
index 927c130470..a5919c3a1d 100644
--- a/src/saveload/ai_sl.cpp
+++ b/src/saveload/ai_sl.cpp
@@ -16,10 +16,10 @@
#include "../company_base.h"
#include "../string_func.h"
-#include "../ai/ai.hpp"
-#include "../ai/ai_config.hpp"
+#include "../ai/ai.h"
+#include "../ai/ai_config.h"
#include "../network/network.h"
-#include "../ai/ai_instance.hpp"
+#include "../ai/ai_instance.h"
#include "../safeguards.h"
diff --git a/src/saveload/game_sl.cpp b/src/saveload/game_sl.cpp
index 87083c6694..8a17286020 100644
--- a/src/saveload/game_sl.cpp
+++ b/src/saveload/game_sl.cpp
@@ -14,11 +14,11 @@
#include "compat/game_sl_compat.h"
#include "../string_func.h"
-#include "../game/game.hpp"
-#include "../game/game_config.hpp"
+#include "../game/game.h"
+#include "../game/game_config.h"
#include "../network/network.h"
-#include "../game/game_instance.hpp"
-#include "../game/game_text.hpp"
+#include "../game/game_instance.h"
+#include "../game/game_text.h"
#include "../safeguards.h"
diff --git a/src/saveload/map_sl.cpp b/src/saveload/map_sl.cpp
index f5407dd04e..142ee6b893 100644
--- a/src/saveload/map_sl.cpp
+++ b/src/saveload/map_sl.cpp
@@ -13,7 +13,7 @@
#include "compat/map_sl_compat.h"
#include "../map_func.h"
-#include "../core/bitmath_func.hpp"
+#include "../core/bitmath_func.h"
#include "../fios.h"
#include "../safeguards.h"
diff --git a/src/saveload/misc_sl.cpp b/src/saveload/misc_sl.cpp
index f50cab48b5..3263df06a5 100644
--- a/src/saveload/misc_sl.cpp
+++ b/src/saveload/misc_sl.cpp
@@ -18,7 +18,7 @@
#include "../window_func.h"
#include "../viewport_func.h"
#include "../gfx_func.h"
-#include "../core/random_func.hpp"
+#include "../core/random_func.h"
#include "../fios.h"
#include "../timer/timer.h"
#include "../timer/timer_game_tick.h"
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp
index 7c484a3ad0..87c781e668 100644
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -28,7 +28,7 @@
#include "../network/network.h"
#include "../window_func.h"
#include "../strings_func.h"
-#include "../core/endian_func.hpp"
+#include "../core/endian_func.h"
#include "../vehicle_base.h"
#include "../company_func.h"
#include "../timer/timer_game_calendar.h"
diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h
index be139df5ab..4b9e6f1925 100644
--- a/src/saveload/saveload.h
+++ b/src/saveload/saveload.h
@@ -10,7 +10,7 @@
#ifndef SAVELOAD_H
#define SAVELOAD_H
-#include "saveload_error.hpp"
+#include "saveload_error.h"
#include "../fileio_type.h"
#include "../fios.h"
diff --git a/src/saveload/saveload_error.hpp b/src/saveload/saveload_error.h
similarity index 100%
rename from src/saveload/saveload_error.hpp
rename to src/saveload/saveload_error.h
diff --git a/src/saveload/strings_sl.cpp b/src/saveload/strings_sl.cpp
index 3d9a315f0d..1f6ae9641d 100644
--- a/src/saveload/strings_sl.cpp
+++ b/src/saveload/strings_sl.cpp
@@ -8,7 +8,7 @@
/** @file strings_sl.cpp Code handling saving and loading of strings */
#include "../stdafx.h"
-#include "../core/alloc_func.hpp"
+#include "../core/alloc_func.h"
#include "../string_func.h"
#include "../strings_func.h"
#include "saveload_internal.h"
diff --git a/src/saveload/town_sl.cpp b/src/saveload/town_sl.cpp
index 10c0763599..7509bbd31b 100644
--- a/src/saveload/town_sl.cpp
+++ b/src/saveload/town_sl.cpp
@@ -18,7 +18,7 @@
#include "../landscape.h"
#include "../subsidy_func.h"
#include "../strings_func.h"
-#include "../tilematrix_type.hpp"
+#include "../tilematrix_type.h"
#include "../safeguards.h"
diff --git a/src/screenshot.cpp b/src/screenshot.cpp
index b57e484bfe..264c9ee6b5 100644
--- a/src/screenshot.cpp
+++ b/src/screenshot.cpp
@@ -8,15 +8,15 @@
/** @file screenshot.cpp The creation of screenshots! */
#include "stdafx.h"
-#include "core/backup_type.hpp"
+#include "core/backup_type.h"
#include "fileio_func.h"
#include "viewport_func.h"
#include "gfx_func.h"
#include "screenshot.h"
#include "screenshot_gui.h"
-#include "blitter/factory.hpp"
+#include "blitter/factory.h"
#include "zoom_func.h"
-#include "core/endian_func.hpp"
+#include "core/endian_func.h"
#include "saveload/saveload.h"
#include "company_base.h"
#include "company_func.h"
@@ -27,7 +27,7 @@
#include "window_func.h"
#include "tile_map.h"
#include "landscape.h"
-#include "video/video_driver.hpp"
+#include "video/video_driver.h"
#include "smallmap_gui.h"
#include "table/strings.h"
@@ -234,7 +234,7 @@ static bool MakeBMPImage(const char *name, ScreenshotCallback *callb, void *user
#ifdef PNG_TEXT_SUPPORTED
#include "rev.h"
#include "newgrf_config.h"
-#include "ai/ai_info.hpp"
+#include "ai/ai_info.h"
#include "company_base.h"
#include "base_media_base.h"
#endif /* PNG_TEXT_SUPPORTED */
diff --git a/src/script/CMakeLists.txt b/src/script/CMakeLists.txt
index d945e54ab9..16f1cd61cc 100644
--- a/src/script/CMakeLists.txt
+++ b/src/script/CMakeLists.txt
@@ -7,24 +7,24 @@ endif()
add_files(
script_cmd.h
script_config.cpp
- script_config.hpp
- script_fatalerror.hpp
+ script_config.h
+ script_fatalerror.h
script_gui.h
script_gui.cpp
script_info.cpp
- script_info.hpp
+ script_info.h
script_info_dummy.cpp
script_instance.cpp
- script_instance.hpp
+ script_instance.h
script_scanner.cpp
- script_scanner.hpp
- script_storage.hpp
- script_suspend.hpp
+ script_scanner.h
+ script_storage.h
+ script_suspend.h
squirrel.cpp
- squirrel.hpp
- squirrel_class.hpp
- squirrel_helper.hpp
- squirrel_helper_type.hpp
+ squirrel.h
+ squirrel_class.h
+ squirrel_helper.h
+ squirrel_helper_type.h
squirrel_std.cpp
- squirrel_std.hpp
+ squirrel_std.h
)
diff --git a/src/script/api/CMakeLists.txt b/src/script/api/CMakeLists.txt
index c9bcf292b0..6463147633 100644
--- a/src/script/api/CMakeLists.txt
+++ b/src/script/api/CMakeLists.txt
@@ -32,7 +32,7 @@ target_include_directories(script_api
${CMAKE_CURRENT_SOURCE_DIR}
)
-file(GLOB SCRIPT_API_FILES "script_*.hpp")
+file(GLOB SCRIPT_API_FILES "script_*.h")
list(APPEND SCRIPT_API_FILES ${CMAKE_BINARY_DIR}/generated/script/api/script_window.h)
foreach(API "ai;AI" "game;GS" "template;Template")
@@ -141,82 +141,82 @@ add_library(openttd::script_api ALIAS script_api)
add_files(
- ai_changelog.hpp
- game_changelog.hpp
- script_accounting.hpp
- script_admin.hpp
- script_airport.hpp
- script_asyncmode.hpp
- script_base.hpp
- script_basestation.hpp
- script_bridge.hpp
- script_bridgelist.hpp
- script_cargo.hpp
- script_cargolist.hpp
- script_cargomonitor.hpp
- script_client.hpp
- script_clientlist.hpp
- script_company.hpp
- script_companymode.hpp
- script_controller.hpp
- script_date.hpp
- script_depotlist.hpp
- script_engine.hpp
- script_enginelist.hpp
- script_error.hpp
- script_event.hpp
- script_event_types.hpp
- script_execmode.hpp
- script_game.hpp
- script_gamesettings.hpp
- script_goal.hpp
- script_group.hpp
- script_grouplist.hpp
- script_industry.hpp
- script_industrylist.hpp
- script_industrytype.hpp
- script_industrytypelist.hpp
- script_info_docs.hpp
- script_infrastructure.hpp
- script_league.hpp
- script_list.hpp
- script_log.hpp
- script_log_types.hpp
- script_map.hpp
- script_marine.hpp
- script_newgrf.hpp
- script_news.hpp
- script_object.hpp
- script_objecttype.hpp
- script_objecttypelist.hpp
- script_order.hpp
- script_priorityqueue.hpp
- script_rail.hpp
- script_railtypelist.hpp
- script_road.hpp
- script_roadtypelist.hpp
- script_sign.hpp
- script_signlist.hpp
- script_station.hpp
- script_stationlist.hpp
- script_story_page.hpp
- script_storypagelist.hpp
- script_storypageelementlist.hpp
- script_subsidy.hpp
- script_subsidylist.hpp
- script_testmode.hpp
- script_text.hpp
- script_tile.hpp
- script_tilelist.hpp
- script_town.hpp
- script_townlist.hpp
- script_tunnel.hpp
- script_types.hpp
- script_vehicle.hpp
- script_vehiclelist.hpp
- script_viewport.hpp
- script_waypoint.hpp
- script_waypointlist.hpp
+ ai_changelog.h
+ game_changelog.h
+ script_accounting.h
+ script_admin.h
+ script_airport.h
+ script_asyncmode.h
+ script_base.h
+ script_basestation.h
+ script_bridge.h
+ script_bridgelist.h
+ script_cargo.h
+ script_cargolist.h
+ script_cargomonitor.h
+ script_client.h
+ script_clientlist.h
+ script_company.h
+ script_companymode.h
+ script_controller.h
+ script_date.h
+ script_depotlist.h
+ script_engine.h
+ script_enginelist.h
+ script_error.h
+ script_event.h
+ script_event_types.h
+ script_execmode.h
+ script_game.h
+ script_gamesettings.h
+ script_goal.h
+ script_group.h
+ script_grouplist.h
+ script_industry.h
+ script_industrylist.h
+ script_industrytype.h
+ script_industrytypelist.h
+ script_info_docs.h
+ script_infrastructure.h
+ script_league.h
+ script_list.h
+ script_log.h
+ script_log_types.h
+ script_map.h
+ script_marine.h
+ script_newgrf.h
+ script_news.h
+ script_object.h
+ script_objecttype.h
+ script_objecttypelist.h
+ script_order.h
+ script_priorityqueue.h
+ script_rail.h
+ script_railtypelist.h
+ script_road.h
+ script_roadtypelist.h
+ script_sign.h
+ script_signlist.h
+ script_station.h
+ script_stationlist.h
+ script_story_page.h
+ script_storypagelist.h
+ script_storypageelementlist.h
+ script_subsidy.h
+ script_subsidylist.h
+ script_testmode.h
+ script_text.h
+ script_tile.h
+ script_tilelist.h
+ script_town.h
+ script_townlist.h
+ script_tunnel.h
+ script_types.h
+ script_vehicle.h
+ script_vehiclelist.h
+ script_viewport.h
+ script_waypoint.h
+ script_waypointlist.h
script_accounting.cpp
script_admin.cpp
script_airport.cpp
diff --git a/src/script/api/Doxyfile_AI.in b/src/script/api/Doxyfile_AI.in
index 43b6eee03b..1551c17f1e 100644
--- a/src/script/api/Doxyfile_AI.in
+++ b/src/script/api/Doxyfile_AI.in
@@ -92,8 +92,8 @@ WARN_LOGFILE =
#---------------------------------------------------------------------------
INPUT = . ${FIND_VERSION_BINARY_DIR}/script/api
INPUT_ENCODING = UTF-8
-FILE_PATTERNS = script_*.hpp \
- ai_*.hpp
+FILE_PATTERNS = script_*.h \
+ ai_*.h
RECURSIVE = YES
EXCLUDE =
EXCLUDE_SYMLINKS = NO
diff --git a/src/script/api/Doxyfile_GS.in b/src/script/api/Doxyfile_GS.in
index c1914b3dcc..ac570fb5c3 100644
--- a/src/script/api/Doxyfile_GS.in
+++ b/src/script/api/Doxyfile_GS.in
@@ -92,8 +92,8 @@ WARN_LOGFILE =
#---------------------------------------------------------------------------
INPUT = . ${FIND_VERSION_BINARY_DIR}/script/api
INPUT_ENCODING = UTF-8
-FILE_PATTERNS = script_*.hpp \
- game_*.hpp
+FILE_PATTERNS = script_*.h \
+ game_*.h
RECURSIVE = YES
EXCLUDE =
EXCLUDE_SYMLINKS = NO
diff --git a/src/script/api/ai/ai_controller.h.sq b/src/script/api/ai/ai_controller.h.sq
index d37cb75b51..7edcb3d113 100644
--- a/src/script/api/ai/ai_controller.h.sq
+++ b/src/script/api/ai/ai_controller.h.sq
@@ -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 .
*/
-#include "../script_controller.hpp"
+#include "../script_controller.h"
template <> const char *GetClassName() { return "AIController"; }
diff --git a/src/script/api/ai_changelog.hpp b/src/script/api/ai_changelog.h
similarity index 99%
rename from src/script/api/ai_changelog.hpp
rename to src/script/api/ai_changelog.h
index 0a35d43ed4..7bb98e8212 100644
--- a/src/script/api/ai_changelog.hpp
+++ b/src/script/api/ai_changelog.h
@@ -6,7 +6,7 @@
*/
/**
- * @file ai_changelog.hpp Lists all changes / additions to the API.
+ * @file ai_changelog.h Lists all changes / additions to the API.
*
* Only new / renamed / deleted api functions will be listed here. A list of
* bug fixes can be found in the normal changelog. Note that removed API
diff --git a/src/script/api/doxygen_filter.sh b/src/script/api/doxygen_filter.sh
index e63c7183d8..22b7d948c7 100755
--- a/src/script/api/doxygen_filter.sh
+++ b/src/script/api/doxygen_filter.sh
@@ -19,8 +19,8 @@ if [ "$?" != "0" ]; then
fi
case $2 in
- *ai_changelog.hpp) cat $2; exit 0;;
- *game_changelog.hpp) cat $2; exit 0;;
+ *ai_changelog.h) cat $2; exit 0;;
+ *game_changelog.h) cat $2; exit 0;;
esac
${AWK} -v api=$1 -f doxygen_filter.awk $2
diff --git a/src/script/api/game/game_controller.h.sq b/src/script/api/game/game_controller.h.sq
index cbf61b89cd..c14468a8ae 100644
--- a/src/script/api/game/game_controller.h.sq
+++ b/src/script/api/game/game_controller.h.sq
@@ -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 .
*/
-#include "../script_controller.hpp"
+#include "../script_controller.h"
template <> const char *GetClassName() { return "GSController"; }
diff --git a/src/script/api/game_changelog.hpp b/src/script/api/game_changelog.h
similarity index 99%
rename from src/script/api/game_changelog.hpp
rename to src/script/api/game_changelog.h
index 0dfb08c2e5..f37c7bcd84 100644
--- a/src/script/api/game_changelog.hpp
+++ b/src/script/api/game_changelog.h
@@ -6,7 +6,7 @@
*/
/**
- * @file game_changelog.hpp Lists all changes / additions to the API.
+ * @file game_changelog.h Lists all changes / additions to the API.
*
* Only new / renamed / deleted api functions will be listed here. A list of
* bug fixes can be found in the normal changelog. Note that removed API
diff --git a/src/script/api/script_accounting.cpp b/src/script/api/script_accounting.cpp
index 1564c2e1ef..895b69087c 100644
--- a/src/script/api/script_accounting.cpp
+++ b/src/script/api/script_accounting.cpp
@@ -8,7 +8,7 @@
/** @file script_accounting.cpp Implementation of ScriptAccounting. */
#include "../../stdafx.h"
-#include "script_accounting.hpp"
+#include "script_accounting.h"
#include "../../safeguards.h"
diff --git a/src/script/api/script_accounting.hpp b/src/script/api/script_accounting.h
similarity index 94%
rename from src/script/api/script_accounting.hpp
rename to src/script/api/script_accounting.h
index 04c022e735..cbacb8b73d 100644
--- a/src/script/api/script_accounting.hpp
+++ b/src/script/api/script_accounting.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 .
*/
-/** @file script_accounting.hpp Everything to handle script accounting things. */
+/** @file script_accounting.h Everything to handle script accounting things. */
#ifndef SCRIPT_ACCOUNTING_HPP
#define SCRIPT_ACCOUNTING_HPP
-#include "script_object.hpp"
+#include "script_object.h"
/**
* Class that keeps track of the costs, so you can request how much a block of
diff --git a/src/script/api/script_admin.cpp b/src/script/api/script_admin.cpp
index 4288233d97..376d748b1c 100644
--- a/src/script/api/script_admin.cpp
+++ b/src/script/api/script_admin.cpp
@@ -8,10 +8,10 @@
/** @file script_admin.cpp Implementation of ScriptAdmin. */
#include "../../stdafx.h"
-#include "script_admin.hpp"
-#include "script_log.hpp"
+#include "script_admin.h"
+#include "script_log.h"
#include "../../network/network_admin.h"
-#include "../script_instance.hpp"
+#include "../script_instance.h"
#include "../../string_func.h"
#include "../../3rdparty/nlohmann/json.hpp"
diff --git a/src/script/api/script_admin.hpp b/src/script/api/script_admin.h
similarity index 93%
rename from src/script/api/script_admin.hpp
rename to src/script/api/script_admin.h
index 877506e98d..6098e78505 100644
--- a/src/script/api/script_admin.hpp
+++ b/src/script/api/script_admin.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 .
*/
-/** @file script_admin.hpp Everything to communicate with the AdminPort. */
+/** @file script_admin.h Everything to communicate with the AdminPort. */
#ifndef SCRIPT_ADMIN_HPP
#define SCRIPT_ADMIN_HPP
-#include "script_object.hpp"
+#include "script_object.h"
/**
* Class that handles communication with the AdminPort.
diff --git a/src/script/api/script_airport.cpp b/src/script/api/script_airport.cpp
index 81e24fe0f6..c8ed23f262 100644
--- a/src/script/api/script_airport.cpp
+++ b/src/script/api/script_airport.cpp
@@ -8,8 +8,8 @@
/** @file script_airport.cpp Implementation of ScriptAirport. */
#include "../../stdafx.h"
-#include "script_airport.hpp"
-#include "script_station.hpp"
+#include "script_airport.h"
+#include "script_station.h"
#include "../../station_base.h"
#include "../../town.h"
#include "../../landscape_cmd.h"
diff --git a/src/script/api/script_airport.hpp b/src/script/api/script_airport.h
similarity index 98%
rename from src/script/api/script_airport.hpp
rename to src/script/api/script_airport.h
index 9534f05d21..c95b8cb7ca 100644
--- a/src/script/api/script_airport.hpp
+++ b/src/script/api/script_airport.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 .
*/
-/** @file script_airport.hpp Everything to query and build airports. */
+/** @file script_airport.h Everything to query and build airports. */
#ifndef SCRIPT_AIRPORT_HPP
#define SCRIPT_AIRPORT_HPP
-#include "script_object.hpp"
+#include "script_object.h"
#include "../../airport.h"
/**
diff --git a/src/script/api/script_asyncmode.cpp b/src/script/api/script_asyncmode.cpp
index 4e95460e72..cb5fc3075f 100644
--- a/src/script/api/script_asyncmode.cpp
+++ b/src/script/api/script_asyncmode.cpp
@@ -8,9 +8,9 @@
/** @file script_asyncmode.cpp Implementation of ScriptAsyncMode. */
#include "../../stdafx.h"
-#include "script_asyncmode.hpp"
-#include "../script_instance.hpp"
-#include "../script_fatalerror.hpp"
+#include "script_asyncmode.h"
+#include "../script_instance.h"
+#include "../script_fatalerror.h"
#include "../../safeguards.h"
diff --git a/src/script/api/script_asyncmode.hpp b/src/script/api/script_asyncmode.h
similarity index 95%
rename from src/script/api/script_asyncmode.hpp
rename to src/script/api/script_asyncmode.h
index 788508ee8d..4f10d01189 100644
--- a/src/script/api/script_asyncmode.hpp
+++ b/src/script/api/script_asyncmode.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 .
*/
-/** @file script_asyncmode.hpp Switch the script instance to Async Mode. */
+/** @file script_asyncmode.h Switch the script instance to Async Mode. */
#ifndef SCRIPT_ASYNCMODE_HPP
#define SCRIPT_ASYNCMODE_HPP
-#include "script_object.hpp"
+#include "script_object.h"
/**
* Class to switch current mode to Async Mode.
diff --git a/src/script/api/script_base.cpp b/src/script/api/script_base.cpp
index 18c3519b65..5c66d0621a 100644
--- a/src/script/api/script_base.cpp
+++ b/src/script/api/script_base.cpp
@@ -8,8 +8,8 @@
/** @file script_base.cpp Implementation of ScriptBase. */
#include "../../stdafx.h"
-#include "script_base.hpp"
-#include "script_error.hpp"
+#include "script_base.h"
+#include "script_error.h"
#include "../../safeguards.h"
diff --git a/src/script/api/script_base.hpp b/src/script/api/script_base.h
similarity index 97%
rename from src/script/api/script_base.hpp
rename to src/script/api/script_base.h
index aaaa3b2340..ba443103fb 100644
--- a/src/script/api/script_base.hpp
+++ b/src/script/api/script_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 .
*/
-/** @file script_base.hpp Everything to query basic things. */
+/** @file script_base.h Everything to query basic things. */
#ifndef SCRIPT_BASE_HPP
#define SCRIPT_BASE_HPP
-#include "script_object.hpp"
+#include "script_object.h"
/**
* Class that handles some basic functions.
diff --git a/src/script/api/script_basestation.cpp b/src/script/api/script_basestation.cpp
index 2c450937b5..f53c3b7fa6 100644
--- a/src/script/api/script_basestation.cpp
+++ b/src/script/api/script_basestation.cpp
@@ -8,8 +8,8 @@
/** @file script_basestation.cpp Implementation of ScriptBaseStation. */
#include "../../stdafx.h"
-#include "script_basestation.hpp"
-#include "script_error.hpp"
+#include "script_basestation.h"
+#include "script_error.h"
#include "../../station_base.h"
#include "../../string_func.h"
#include "../../strings_func.h"
diff --git a/src/script/api/script_basestation.hpp b/src/script/api/script_basestation.h
similarity index 95%
rename from src/script/api/script_basestation.hpp
rename to src/script/api/script_basestation.h
index 52df57f78c..1b30e6d41e 100644
--- a/src/script/api/script_basestation.hpp
+++ b/src/script/api/script_basestation.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 .
*/
-/** @file script_basestation.hpp Base for stations/waypoint handling. */
+/** @file script_basestation.h Base for stations/waypoint handling. */
#ifndef SCRIPT_BASESTATION_HPP
#define SCRIPT_BASESTATION_HPP
-#include "script_text.hpp"
-#include "script_date.hpp"
+#include "script_text.h"
+#include "script_date.h"
/**
* Base class for stations and waypoints.
diff --git a/src/script/api/script_bridge.cpp b/src/script/api/script_bridge.cpp
index 165fc60a2f..26d3a6eb6c 100644
--- a/src/script/api/script_bridge.cpp
+++ b/src/script/api/script_bridge.cpp
@@ -8,9 +8,9 @@
/** @file script_bridge.cpp Implementation of ScriptBridge. */
#include "../../stdafx.h"
-#include "script_bridge.hpp"
-#include "script_rail.hpp"
-#include "../script_instance.hpp"
+#include "script_bridge.h"
+#include "script_rail.h"
+#include "../script_instance.h"
#include "../../bridge_map.h"
#include "../../strings_func.h"
#include "../../landscape_cmd.h"
diff --git a/src/script/api/script_bridge.hpp b/src/script/api/script_bridge.h
similarity index 98%
rename from src/script/api/script_bridge.hpp
rename to src/script/api/script_bridge.h
index 01f52a55bd..241961d732 100644
--- a/src/script/api/script_bridge.hpp
+++ b/src/script/api/script_bridge.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 .
*/
-/** @file script_bridge.hpp Everything to query and build bridges. */
+/** @file script_bridge.h Everything to query and build bridges. */
#ifndef SCRIPT_BRIDGE_HPP
#define SCRIPT_BRIDGE_HPP
-#include "script_vehicle.hpp"
+#include "script_vehicle.h"
/**
* Class that handles all bridge related functions.
diff --git a/src/script/api/script_bridgelist.cpp b/src/script/api/script_bridgelist.cpp
index bc78e7bf36..5a3efd1c3a 100644
--- a/src/script/api/script_bridgelist.cpp
+++ b/src/script/api/script_bridgelist.cpp
@@ -8,8 +8,8 @@
/** @file script_bridgelist.cpp Implementation of ScriptBridgeList and friends. */
#include "../../stdafx.h"
-#include "script_bridgelist.hpp"
-#include "script_bridge.hpp"
+#include "script_bridgelist.h"
+#include "script_bridge.h"
#include "../../bridge.h"
#include "../../safeguards.h"
diff --git a/src/script/api/script_bridgelist.hpp b/src/script/api/script_bridgelist.h
similarity index 93%
rename from src/script/api/script_bridgelist.hpp
rename to src/script/api/script_bridgelist.h
index 17991f41f1..4917048010 100644
--- a/src/script/api/script_bridgelist.hpp
+++ b/src/script/api/script_bridgelist.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 .
*/
-/** @file script_bridgelist.hpp List all the bridges. */
+/** @file script_bridgelist.h List all the bridges. */
#ifndef SCRIPT_BRIDGELIST_HPP
#define SCRIPT_BRIDGELIST_HPP
-#include "script_list.hpp"
+#include "script_list.h"
/**
* Create a list of bridges types.
diff --git a/src/script/api/script_cargo.cpp b/src/script/api/script_cargo.cpp
index 814f7b36c2..a20af6d04d 100644
--- a/src/script/api/script_cargo.cpp
+++ b/src/script/api/script_cargo.cpp
@@ -8,10 +8,10 @@
/** @file script_cargo.cpp Implementation of ScriptCargo. */
#include "../../stdafx.h"
-#include "script_cargo.hpp"
+#include "script_cargo.h"
#include "../../economy_func.h"
-#include "../../core/alloc_func.hpp"
-#include "../../core/bitmath_func.hpp"
+#include "../../core/alloc_func.h"
+#include "../../core/bitmath_func.h"
#include "../../strings_func.h"
#include "../../settings_type.h"
#include "table/strings.h"
diff --git a/src/script/api/script_cargo.hpp b/src/script/api/script_cargo.h
similarity index 98%
rename from src/script/api/script_cargo.hpp
rename to src/script/api/script_cargo.h
index 40977df165..c99f5b2ca3 100644
--- a/src/script/api/script_cargo.hpp
+++ b/src/script/api/script_cargo.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 .
*/
-/** @file script_cargo.hpp Everything to query cargoes. */
+/** @file script_cargo.h Everything to query cargoes. */
#ifndef SCRIPT_CARGO_HPP
#define SCRIPT_CARGO_HPP
-#include "script_object.hpp"
+#include "script_object.h"
#include "../../cargotype.h"
#include "../../linkgraph/linkgraph_type.h"
diff --git a/src/script/api/script_cargolist.cpp b/src/script/api/script_cargolist.cpp
index 14fe8ed935..2d6129abdd 100644
--- a/src/script/api/script_cargolist.cpp
+++ b/src/script/api/script_cargolist.cpp
@@ -8,9 +8,9 @@
/** @file script_cargolist.cpp Implementation of ScriptCargoList and friends. */
#include "../../stdafx.h"
-#include "script_cargolist.hpp"
-#include "script_industry.hpp"
-#include "script_station.hpp"
+#include "script_cargolist.h"
+#include "script_industry.h"
+#include "script_station.h"
#include "../../cargotype.h"
#include "../../industry.h"
#include "../../station_base.h"
diff --git a/src/script/api/script_cargolist.hpp b/src/script/api/script_cargolist.h
similarity index 96%
rename from src/script/api/script_cargolist.hpp
rename to src/script/api/script_cargolist.h
index 11223debc1..9fd6bf54ed 100644
--- a/src/script/api/script_cargolist.hpp
+++ b/src/script/api/script_cargolist.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 .
*/
-/** @file script_cargolist.hpp List all the cargoes. */
+/** @file script_cargolist.h List all the cargoes. */
#ifndef SCRIPT_CARGOLIST_HPP
#define SCRIPT_CARGOLIST_HPP
-#include "script_list.hpp"
+#include "script_list.h"
/**
* Creates a list of cargoes that can be produced in the current game.
diff --git a/src/script/api/script_cargomonitor.cpp b/src/script/api/script_cargomonitor.cpp
index 96828c83b6..21fb4c4d21 100644
--- a/src/script/api/script_cargomonitor.cpp
+++ b/src/script/api/script_cargomonitor.cpp
@@ -8,8 +8,8 @@
/** @file script_cargomonitor.cpp Code to monitor cargo pickup and deliveries by companies. */
#include "../../stdafx.h"
-#include "script_cargo.hpp"
-#include "script_cargomonitor.hpp"
+#include "script_cargo.h"
+#include "script_cargomonitor.h"
#include "../../town.h"
#include "../../industry.h"
diff --git a/src/script/api/script_cargomonitor.hpp b/src/script/api/script_cargomonitor.h
similarity index 96%
rename from src/script/api/script_cargomonitor.hpp
rename to src/script/api/script_cargomonitor.h
index f16b99cd95..c5abf38857 100644
--- a/src/script/api/script_cargomonitor.hpp
+++ b/src/script/api/script_cargomonitor.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 .
*/
-/** @file script_cargomonitor.hpp Everything to monitor cargo pickup and deliveries by companies. */
+/** @file script_cargomonitor.h Everything to monitor cargo pickup and deliveries by companies. */
#ifndef SCRIPT_CARGO_MONITOR_HPP
#define SCRIPT_CARGO_MONITOR_HPP
-#include "script_list.hpp"
-#include "script_object.hpp"
-#include "script_company.hpp"
+#include "script_list.h"
+#include "script_object.h"
+#include "script_company.h"
#include "../../cargomonitor.h"
/**
diff --git a/src/script/api/script_client.cpp b/src/script/api/script_client.cpp
index 9b65f638db..93d51677dd 100644
--- a/src/script/api/script_client.cpp
+++ b/src/script/api/script_client.cpp
@@ -8,7 +8,7 @@
/** @file script_client.cpp Implementation of ScriptClient. */
#include "../../stdafx.h"
-#include "script_client.hpp"
+#include "script_client.h"
#include "../../network/network.h"
#include "../../network/network_base.h"
diff --git a/src/script/api/script_client.hpp b/src/script/api/script_client.h
similarity index 93%
rename from src/script/api/script_client.hpp
rename to src/script/api/script_client.h
index 7b5d6f5dc3..02c2e85f19 100644
--- a/src/script/api/script_client.hpp
+++ b/src/script/api/script_client.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 .
*/
-/** @file script_client.hpp Everything to query a network client's information */
+/** @file script_client.h Everything to query a network client's information */
#ifndef SCRIPT_CLIENT_HPP
#define SCRIPT_CLIENT_HPP
-#include "script_text.hpp"
-#include "script_date.hpp"
-#include "script_company.hpp"
+#include "script_text.h"
+#include "script_date.h"
+#include "script_company.h"
#include "../../network/network_type.h"
/**
diff --git a/src/script/api/script_clientlist.cpp b/src/script/api/script_clientlist.cpp
index eb57d8e44a..fdb4eeb9c6 100644
--- a/src/script/api/script_clientlist.cpp
+++ b/src/script/api/script_clientlist.cpp
@@ -8,8 +8,8 @@
/** @file script_clientlist.cpp Implementation of ScriptClientList and friends. */
#include "../../stdafx.h"
-#include "script_company.hpp"
-#include "script_clientlist.hpp"
+#include "script_company.h"
+#include "script_clientlist.h"
#include "../../network/network.h"
#include "../../network/network_base.h"
diff --git a/src/script/api/script_clientlist.hpp b/src/script/api/script_clientlist.h
similarity index 89%
rename from src/script/api/script_clientlist.hpp
rename to src/script/api/script_clientlist.h
index ea7859a6af..654c017bd2 100644
--- a/src/script/api/script_clientlist.hpp
+++ b/src/script/api/script_clientlist.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 .
*/
-/** @file script_clientlist.hpp List all the clients in a game or in a company. */
+/** @file script_clientlist.h List all the clients in a game or in a company. */
#ifndef SCRIPT_CLIENTLIST_HPP
#define SCRIPT_CLIENTLIST_HPP
-#include "script_list.hpp"
-#include "script_company.hpp"
+#include "script_list.h"
+#include "script_company.h"
/**
diff --git a/src/script/api/script_company.cpp b/src/script/api/script_company.cpp
index b1d5a10d5f..6e72842d42 100644
--- a/src/script/api/script_company.cpp
+++ b/src/script/api/script_company.cpp
@@ -8,9 +8,9 @@
/** @file script_company.cpp Implementation of ScriptCompany. */
#include "../../stdafx.h"
-#include "script_company.hpp"
-#include "script_error.hpp"
-#include "script_companymode.hpp"
+#include "script_company.h"
+#include "script_error.h"
+#include "script_companymode.h"
#include "../../company_func.h"
#include "../../company_base.h"
#include "../../company_manager_face.h"
diff --git a/src/script/api/script_company.hpp b/src/script/api/script_company.h
similarity index 99%
rename from src/script/api/script_company.hpp
rename to src/script/api/script_company.h
index 6e4ef1e2ae..d5a5242ae8 100644
--- a/src/script/api/script_company.hpp
+++ b/src/script/api/script_company.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 .
*/
-/** @file script_company.hpp Everything to query a company's financials and statistics or build company related buildings. */
+/** @file script_company.h Everything to query a company's financials and statistics or build company related buildings. */
#ifndef SCRIPT_COMPANY_HPP
#define SCRIPT_COMPANY_HPP
-#include "script_text.hpp"
+#include "script_text.h"
#include "../../economy_type.h"
#include "../../livery.h"
#include "../../gfx_type.h"
diff --git a/src/script/api/script_companymode.cpp b/src/script/api/script_companymode.cpp
index 3a5c5f48f7..16c1d85cb7 100644
--- a/src/script/api/script_companymode.cpp
+++ b/src/script/api/script_companymode.cpp
@@ -9,7 +9,7 @@
#include "../../stdafx.h"
#include "../../company_base.h"
-#include "script_companymode.hpp"
+#include "script_companymode.h"
#include "../../safeguards.h"
diff --git a/src/script/api/script_companymode.hpp b/src/script/api/script_companymode.h
similarity index 96%
rename from src/script/api/script_companymode.hpp
rename to src/script/api/script_companymode.h
index 8378e11c4c..1c85b64c2b 100644
--- a/src/script/api/script_companymode.hpp
+++ b/src/script/api/script_companymode.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 .
*/
-/** @file script_companymode.hpp Switch the company. */
+/** @file script_companymode.h Switch the company. */
#ifndef SCRIPT_COMPANYMODE_HPP
#define SCRIPT_COMPANYMODE_HPP
-#include "script_object.hpp"
+#include "script_object.h"
/**
* Class to switch the current company.
diff --git a/src/script/api/script_controller.cpp b/src/script/api/script_controller.cpp
index 2ffbf46730..b148cf55b3 100644
--- a/src/script/api/script_controller.cpp
+++ b/src/script/api/script_controller.cpp
@@ -9,15 +9,15 @@
#include "../../stdafx.h"
#include "../../string_func.h"
-#include "../../script/squirrel.hpp"
+#include "../../script/squirrel.h"
#include "../../rev.h"
-#include "script_controller.hpp"
-#include "script_error.hpp"
-#include "../script_fatalerror.hpp"
-#include "../script_info.hpp"
-#include "../script_instance.hpp"
-#include "script_log.hpp"
+#include "script_controller.h"
+#include "script_error.h"
+#include "../script_fatalerror.h"
+#include "../script_info.h"
+#include "../script_instance.h"
+#include "script_log.h"
#include "../script_gui.h"
#include "../../settings_type.h"
#include "../../network/network.h"
diff --git a/src/script/api/script_controller.hpp b/src/script/api/script_controller.h
similarity index 98%
rename from src/script/api/script_controller.hpp
rename to src/script/api/script_controller.h
index 1a26c006d4..83934eced9 100644
--- a/src/script/api/script_controller.hpp
+++ b/src/script/api/script_controller.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 .
*/
-/** @file script_controller.hpp The controller of the script. */
+/** @file script_controller.h The controller of the script. */
#ifndef SCRIPT_CONTROLLER_HPP
#define SCRIPT_CONTROLLER_HPP
-#include "script_types.hpp"
+#include "script_types.h"
/**
* The Controller, the class each Script should extend. It creates the Script,
diff --git a/src/script/api/script_date.cpp b/src/script/api/script_date.cpp
index 4d3a3866cf..945ce773bb 100644
--- a/src/script/api/script_date.cpp
+++ b/src/script/api/script_date.cpp
@@ -8,7 +8,7 @@
/** @file script_date.cpp Implementation of ScriptDate. */
#include "../../stdafx.h"
-#include "script_date.hpp"
+#include "script_date.h"
#include "../../timer/timer_game_calendar.h"
#include
diff --git a/src/script/api/script_date.hpp b/src/script/api/script_date.h
similarity index 96%
rename from src/script/api/script_date.hpp
rename to src/script/api/script_date.h
index 43d197226f..1544f0b17e 100644
--- a/src/script/api/script_date.hpp
+++ b/src/script/api/script_date.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 .
*/
-/** @file script_date.hpp Everything to query and manipulate date related information. */
+/** @file script_date.h Everything to query and manipulate date related information. */
#ifndef SCRIPT_DATE_HPP
#define SCRIPT_DATE_HPP
-#include "script_object.hpp"
+#include "script_object.h"
#include "../../timer/timer_game_calendar.h"
/**
diff --git a/src/script/api/script_depotlist.cpp b/src/script/api/script_depotlist.cpp
index eb43139165..546f6e84b2 100644
--- a/src/script/api/script_depotlist.cpp
+++ b/src/script/api/script_depotlist.cpp
@@ -8,7 +8,7 @@
/** @file script_depotlist.cpp Implementation of ScriptDepotList and friends. */
#include "../../stdafx.h"
-#include "script_depotlist.hpp"
+#include "script_depotlist.h"
#include "../../depot_base.h"
#include "../../station_base.h"
diff --git a/src/script/api/script_depotlist.hpp b/src/script/api/script_depotlist.h
similarity index 89%
rename from src/script/api/script_depotlist.hpp
rename to src/script/api/script_depotlist.h
index efbe701bda..26255ea8c4 100644
--- a/src/script/api/script_depotlist.hpp
+++ b/src/script/api/script_depotlist.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 .
*/
-/** @file script_depotlist.hpp List all the depots (you own). */
+/** @file script_depotlist.h List all the depots (you own). */
#ifndef SCRIPT_DEPOTLIST_HPP
#define SCRIPT_DEPOTLIST_HPP
-#include "script_list.hpp"
-#include "script_tile.hpp"
+#include "script_list.h"
+#include "script_tile.h"
/**
* Creates a list of the locations of the depots (and hangars) of which you are the owner.
diff --git a/src/script/api/script_engine.cpp b/src/script/api/script_engine.cpp
index 088b692925..c25c506449 100644
--- a/src/script/api/script_engine.cpp
+++ b/src/script/api/script_engine.cpp
@@ -8,8 +8,8 @@
/** @file script_engine.cpp Implementation of ScriptEngine. */
#include "../../stdafx.h"
-#include "script_engine.hpp"
-#include "script_cargo.hpp"
+#include "script_engine.h"
+#include "script_cargo.h"
#include "../../company_base.h"
#include "../../strings_func.h"
#include "../../rail.h"
diff --git a/src/script/api/script_engine.hpp b/src/script/api/script_engine.h
similarity index 98%
rename from src/script/api/script_engine.hpp
rename to src/script/api/script_engine.h
index 2baed5bec3..68d9afc9e9 100644
--- a/src/script/api/script_engine.hpp
+++ b/src/script/api/script_engine.h
@@ -5,15 +5,15 @@
* 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 .
*/
-/** @file script_engine.hpp Everything to query and build engines. */
+/** @file script_engine.h Everything to query and build engines. */
#ifndef SCRIPT_ENGINE_HPP
#define SCRIPT_ENGINE_HPP
-#include "script_vehicle.hpp"
-#include "script_rail.hpp"
-#include "script_airport.hpp"
-#include "script_date.hpp"
+#include "script_vehicle.h"
+#include "script_rail.h"
+#include "script_airport.h"
+#include "script_date.h"
/**
* Class that handles all engine related functions.
diff --git a/src/script/api/script_enginelist.cpp b/src/script/api/script_enginelist.cpp
index e7c38f840b..f5343dc3ed 100644
--- a/src/script/api/script_enginelist.cpp
+++ b/src/script/api/script_enginelist.cpp
@@ -8,7 +8,7 @@
/** @file script_enginelist.cpp Implementation of ScriptEngineList and friends. */
#include "../../stdafx.h"
-#include "script_enginelist.hpp"
+#include "script_enginelist.h"
#include "../../engine_base.h"
#include "../../safeguards.h"
diff --git a/src/script/api/script_enginelist.hpp b/src/script/api/script_enginelist.h
similarity index 89%
rename from src/script/api/script_enginelist.hpp
rename to src/script/api/script_enginelist.h
index 05cfc03853..9d42b7998d 100644
--- a/src/script/api/script_enginelist.hpp
+++ b/src/script/api/script_enginelist.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 .
*/
-/** @file script_enginelist.hpp List all the engines. */
+/** @file script_enginelist.h List all the engines. */
#ifndef SCRIPT_ENGINELIST_HPP
#define SCRIPT_ENGINELIST_HPP
-#include "script_list.hpp"
-#include "script_vehicle.hpp"
+#include "script_list.h"
+#include "script_vehicle.h"
/**
* Create a list of engines based on a vehicle type.
diff --git a/src/script/api/script_error.cpp b/src/script/api/script_error.cpp
index 3d365c23bb..773a2de963 100644
--- a/src/script/api/script_error.cpp
+++ b/src/script/api/script_error.cpp
@@ -8,8 +8,8 @@
/** @file script_error.cpp Implementation of ScriptError. */
#include "../../stdafx.h"
-#include "script_error.hpp"
-#include "../../core/bitmath_func.hpp"
+#include "script_error.h"
+#include "../../core/bitmath_func.h"
#include "../../string_func.h"
#include "../../strings_func.h"
diff --git a/src/script/api/script_error.hpp b/src/script/api/script_error.h
similarity index 98%
rename from src/script/api/script_error.hpp
rename to src/script/api/script_error.h
index 0fe7d92d56..30056c85dc 100644
--- a/src/script/api/script_error.hpp
+++ b/src/script/api/script_error.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 .
*/
-/** @file script_error.hpp Everything to query errors. */
+/** @file script_error.h Everything to query errors. */
#ifndef SCRIPT_ERROR_HPP
#define SCRIPT_ERROR_HPP
-#include "script_object.hpp"
-#include "script_companymode.hpp"
+#include "script_object.h"
+#include "script_companymode.h"
/**
* Helper to write precondition enforcers for the script API in an abbreviated manner.
diff --git a/src/script/api/script_event.cpp b/src/script/api/script_event.cpp
index efdc720cf3..3a22fd2ee1 100644
--- a/src/script/api/script_event.cpp
+++ b/src/script/api/script_event.cpp
@@ -8,7 +8,7 @@
/** @file script_event.cpp Implementation of ScriptEvent. */
#include "../../stdafx.h"
-#include "script_event_types.hpp"
+#include "script_event_types.h"
#include
diff --git a/src/script/api/script_event.hpp b/src/script/api/script_event.h
similarity index 96%
rename from src/script/api/script_event.hpp
rename to src/script/api/script_event.h
index 2ff813aa81..4fc3335ec7 100644
--- a/src/script/api/script_event.hpp
+++ b/src/script/api/script_event.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 .
*/
-/** @file script_event.hpp Everything to handle events from the game. */
+/** @file script_event.h Everything to handle events from the game. */
#ifndef SCRIPT_EVENT_HPP
#define SCRIPT_EVENT_HPP
-#include "script_object.hpp"
+#include "script_object.h"
/**
* Class that handles all event related functions.
diff --git a/src/script/api/script_event_types.cpp b/src/script/api/script_event_types.cpp
index 6344c907ca..a97e24e789 100644
--- a/src/script/api/script_event_types.cpp
+++ b/src/script/api/script_event_types.cpp
@@ -8,9 +8,9 @@
/** @file script_event_types.cpp Implementation of all EventTypes. */
#include "../../stdafx.h"
-#include "script_event_types.hpp"
-#include "script_vehicle.hpp"
-#include "script_log.hpp"
+#include "script_event_types.h"
+#include "script_vehicle.h"
+#include "script_log.h"
#include "../../strings_func.h"
#include "../../settings_type.h"
#include "../../engine_base.h"
diff --git a/src/script/api/script_event_types.hpp b/src/script/api/script_event_types.h
similarity index 99%
rename from src/script/api/script_event_types.hpp
rename to src/script/api/script_event_types.h
index cb1a5b9456..455a69f18c 100644
--- a/src/script/api/script_event_types.hpp
+++ b/src/script/api/script_event_types.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 .
*/
-/** @file script_event_types.hpp The detailed types of all events. */
+/** @file script_event_types.h The detailed types of all events. */
#ifndef SCRIPT_EVENT_TYPES_HPP
#define SCRIPT_EVENT_TYPES_HPP
-#include "script_event.hpp"
-#include "script_goal.hpp"
+#include "script_event.h"
+#include "script_goal.h"
#include "script_window.h"
/**
diff --git a/src/script/api/script_execmode.cpp b/src/script/api/script_execmode.cpp
index 007dd1ef58..2bdd5b401a 100644
--- a/src/script/api/script_execmode.cpp
+++ b/src/script/api/script_execmode.cpp
@@ -8,9 +8,9 @@
/** @file script_execmode.cpp Implementation of ScriptExecMode. */
#include "../../stdafx.h"
-#include "script_execmode.hpp"
-#include "../script_instance.hpp"
-#include "../script_fatalerror.hpp"
+#include "script_execmode.h"
+#include "../script_instance.h"
+#include "../script_fatalerror.h"
#include "../../safeguards.h"
diff --git a/src/script/api/script_execmode.hpp b/src/script/api/script_execmode.h
similarity index 94%
rename from src/script/api/script_execmode.hpp
rename to src/script/api/script_execmode.h
index a673a195b2..0d762b8e15 100644
--- a/src/script/api/script_execmode.hpp
+++ b/src/script/api/script_execmode.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 .
*/
-/** @file script_execmode.hpp Switch the script to Execute Mode. */
+/** @file script_execmode.h Switch the script to Execute Mode. */
#ifndef SCRIPT_EXECMODE_HPP
#define SCRIPT_EXECMODE_HPP
-#include "script_object.hpp"
+#include "script_object.h"
/**
* Class to switch current mode to Execute Mode.
diff --git a/src/script/api/script_game.cpp b/src/script/api/script_game.cpp
index d338837f14..57fb77388a 100644
--- a/src/script/api/script_game.cpp
+++ b/src/script/api/script_game.cpp
@@ -8,8 +8,8 @@
/** @file script_game.cpp Implementation of ScriptGame. */
#include "../../stdafx.h"
-#include "script_game.hpp"
-#include "script_error.hpp"
+#include "script_game.h"
+#include "script_error.h"
#include "../../command_type.h"
#include "../../settings_type.h"
#include "../../network/network.h"
diff --git a/src/script/api/script_game.hpp b/src/script/api/script_game.h
similarity index 94%
rename from src/script/api/script_game.hpp
rename to src/script/api/script_game.h
index b5fd62c524..430121e4c1 100644
--- a/src/script/api/script_game.hpp
+++ b/src/script/api/script_game.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 .
*/
-/** @file script_game.hpp Everything to manipulate the current running game. */
+/** @file script_game.h Everything to manipulate the current running game. */
#ifndef SCRIPT_GAME_HPP
#define SCRIPT_GAME_HPP
-#include "script_object.hpp"
+#include "script_object.h"
#include "../../landscape_type.h"
/**
diff --git a/src/script/api/script_gamesettings.cpp b/src/script/api/script_gamesettings.cpp
index 2749bb6773..e0af028ed5 100644
--- a/src/script/api/script_gamesettings.cpp
+++ b/src/script/api/script_gamesettings.cpp
@@ -8,7 +8,7 @@
/** @file script_gamesettings.cpp Implementation of ScriptGameSettings. */
#include "../../stdafx.h"
-#include "script_gamesettings.hpp"
+#include "script_gamesettings.h"
#include "../../settings_internal.h"
#include "../../settings_type.h"
#include "../../command_type.h"
diff --git a/src/script/api/script_gamesettings.hpp b/src/script/api/script_gamesettings.h
similarity index 97%
rename from src/script/api/script_gamesettings.hpp
rename to src/script/api/script_gamesettings.h
index b706e86d18..8b3b908a68 100644
--- a/src/script/api/script_gamesettings.hpp
+++ b/src/script/api/script_gamesettings.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 .
*/
-/** @file script_gamesettings.hpp Everything to read game settings. */
+/** @file script_gamesettings.h Everything to read game settings. */
#ifndef SCRIPT_GAMESETTINGS_HPP
#define SCRIPT_GAMESETTINGS_HPP
-#include "script_vehicle.hpp"
+#include "script_vehicle.h"
/**
* Class that handles all game settings related functions.
diff --git a/src/script/api/script_goal.cpp b/src/script/api/script_goal.cpp
index bcd8b4eddf..38f662fc7a 100644
--- a/src/script/api/script_goal.cpp
+++ b/src/script/api/script_goal.cpp
@@ -8,14 +8,14 @@
/** @file script_goal.cpp Implementation of ScriptGoal. */
#include "../../stdafx.h"
-#include "script_game.hpp"
-#include "script_goal.hpp"
-#include "script_error.hpp"
-#include "script_industry.hpp"
-#include "script_map.hpp"
-#include "script_town.hpp"
-#include "script_story_page.hpp"
-#include "../script_instance.hpp"
+#include "script_game.h"
+#include "script_goal.h"
+#include "script_error.h"
+#include "script_industry.h"
+#include "script_map.h"
+#include "script_town.h"
+#include "script_story_page.h"
+#include "../script_instance.h"
#include "../../goal_base.h"
#include "../../string_func.h"
#include "../../network/network_base.h"
diff --git a/src/script/api/script_goal.hpp b/src/script/api/script_goal.h
similarity index 98%
rename from src/script/api/script_goal.hpp
rename to src/script/api/script_goal.h
index d956d75ba7..7606d80f85 100644
--- a/src/script/api/script_goal.hpp
+++ b/src/script/api/script_goal.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 .
*/
-/** @file script_goal.hpp Everything to manipulate the current running goal. */
+/** @file script_goal.h Everything to manipulate the current running goal. */
#ifndef SCRIPT_GOAL_HPP
#define SCRIPT_GOAL_HPP
-#include "script_client.hpp"
-#include "script_company.hpp"
+#include "script_client.h"
+#include "script_company.h"
#include "../../goal_type.h"
/**
diff --git a/src/script/api/script_group.cpp b/src/script/api/script_group.cpp
index 62888ac0af..f7e3ee7ef1 100644
--- a/src/script/api/script_group.cpp
+++ b/src/script/api/script_group.cpp
@@ -8,9 +8,9 @@
/** @file script_group.cpp Implementation of ScriptGroup. */
#include "../../stdafx.h"
-#include "script_group.hpp"
-#include "script_engine.hpp"
-#include "../script_instance.hpp"
+#include "script_group.h"
+#include "script_engine.h"
+#include "../script_instance.h"
#include "../../string_func.h"
#include "../../strings_func.h"
#include "../../autoreplace_func.h"
diff --git a/src/script/api/script_group.hpp b/src/script/api/script_group.h
similarity index 99%
rename from src/script/api/script_group.hpp
rename to src/script/api/script_group.h
index 9971525765..e975d3fa82 100644
--- a/src/script/api/script_group.hpp
+++ b/src/script/api/script_group.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 .
*/
-/** @file script_group.hpp Everything to put vehicles into groups. */
+/** @file script_group.h Everything to put vehicles into groups. */
#ifndef SCRIPT_GROUP_HPP
#define SCRIPT_GROUP_HPP
-#include "script_vehicle.hpp"
+#include "script_vehicle.h"
#include "../../group_type.h"
/**
diff --git a/src/script/api/script_grouplist.cpp b/src/script/api/script_grouplist.cpp
index 363b4d9f53..ee54f1c521 100644
--- a/src/script/api/script_grouplist.cpp
+++ b/src/script/api/script_grouplist.cpp
@@ -8,8 +8,8 @@
/** @file script_grouplist.cpp Implementation of ScriptGroupList and friends. */
#include "../../stdafx.h"
-#include "script_grouplist.hpp"
-#include "script_error.hpp"
+#include "script_grouplist.h"
+#include "script_error.h"
#include "../../group.h"
#include "../../safeguards.h"
diff --git a/src/script/api/script_grouplist.hpp b/src/script/api/script_grouplist.h
similarity index 95%
rename from src/script/api/script_grouplist.hpp
rename to src/script/api/script_grouplist.h
index d85303b854..7e535f53a9 100644
--- a/src/script/api/script_grouplist.hpp
+++ b/src/script/api/script_grouplist.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 .
*/
-/** @file script_grouplist.hpp List all the groups (you own). */
+/** @file script_grouplist.h List all the groups (you own). */
#ifndef SCRIPT_GROUPLIST_HPP
#define SCRIPT_GROUPLIST_HPP
-#include "script_list.hpp"
+#include "script_list.h"
/**
* Creates a list of groups of which you are the owner.
diff --git a/src/script/api/script_industry.cpp b/src/script/api/script_industry.cpp
index 86f5a85e40..eec63350b6 100644
--- a/src/script/api/script_industry.cpp
+++ b/src/script/api/script_industry.cpp
@@ -8,11 +8,11 @@
/** @file script_industry.cpp Implementation of ScriptIndustry. */
#include "../../stdafx.h"
-#include "script_industry.hpp"
-#include "script_cargo.hpp"
-#include "script_company.hpp"
-#include "script_error.hpp"
-#include "script_map.hpp"
+#include "script_industry.h"
+#include "script_cargo.h"
+#include "script_company.h"
+#include "script_error.h"
+#include "script_map.h"
#include "../../company_base.h"
#include "../../industry.h"
#include "../../string_func.h"
diff --git a/src/script/api/script_industry.hpp b/src/script/api/script_industry.h
similarity index 98%
rename from src/script/api/script_industry.hpp
rename to src/script/api/script_industry.h
index 3bca023d56..f6efeed9ce 100644
--- a/src/script/api/script_industry.hpp
+++ b/src/script/api/script_industry.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 .
*/
-/** @file script_industry.hpp Everything to query and build industries. */
+/** @file script_industry.h Everything to query and build industries. */
#ifndef SCRIPT_INDUSTRY_HPP
#define SCRIPT_INDUSTRY_HPP
-#include "script_company.hpp"
-#include "script_date.hpp"
-#include "script_object.hpp"
+#include "script_company.h"
+#include "script_date.h"
+#include "script_object.h"
#include "../../industry.h"
/**
diff --git a/src/script/api/script_industrylist.cpp b/src/script/api/script_industrylist.cpp
index 25faec31ee..dba923420d 100644
--- a/src/script/api/script_industrylist.cpp
+++ b/src/script/api/script_industrylist.cpp
@@ -8,7 +8,7 @@
/** @file script_industrylist.cpp Implementation of ScriptIndustryList and friends. */
#include "../../stdafx.h"
-#include "script_industrylist.hpp"
+#include "script_industrylist.h"
#include "../../industry.h"
#include "../../safeguards.h"
diff --git a/src/script/api/script_industrylist.hpp b/src/script/api/script_industrylist.h
similarity index 96%
rename from src/script/api/script_industrylist.hpp
rename to src/script/api/script_industrylist.h
index 2139b2258e..e58de1b697 100644
--- a/src/script/api/script_industrylist.hpp
+++ b/src/script/api/script_industrylist.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 .
*/
-/** @file script_industrylist.hpp List all the industries. */
+/** @file script_industrylist.h List all the industries. */
#ifndef SCRIPT_INDUSTRYLIST_HPP
#define SCRIPT_INDUSTRYLIST_HPP
-#include "script_list.hpp"
+#include "script_list.h"
/**
* Creates a list of industries that are currently on the map.
diff --git a/src/script/api/script_industrytype.cpp b/src/script/api/script_industrytype.cpp
index 64ccd1260c..9e7cabde46 100644
--- a/src/script/api/script_industrytype.cpp
+++ b/src/script/api/script_industrytype.cpp
@@ -8,14 +8,14 @@
/** @file script_industrytype.cpp Implementation of ScriptIndustryType. */
#include "../../stdafx.h"
-#include "script_industrytype.hpp"
-#include "script_base.hpp"
-#include "script_map.hpp"
-#include "script_error.hpp"
+#include "script_industrytype.h"
+#include "script_base.h"
+#include "script_map.h"
+#include "script_error.h"
#include "../../strings_func.h"
#include "../../industry.h"
#include "../../newgrf_industries.h"
-#include "../../core/random_func.hpp"
+#include "../../core/random_func.h"
#include "../../industry_cmd.h"
#include "../../safeguards.h"
diff --git a/src/script/api/script_industrytype.hpp b/src/script/api/script_industrytype.h
similarity index 98%
rename from src/script/api/script_industrytype.hpp
rename to src/script/api/script_industrytype.h
index dfa4586f02..f3a58c4000 100644
--- a/src/script/api/script_industrytype.hpp
+++ b/src/script/api/script_industrytype.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 .
*/
-/** @file script_industrytype.hpp Everything to query and build industries. */
+/** @file script_industrytype.h Everything to query and build industries. */
#ifndef SCRIPT_INDUSTRYTYPE_HPP
#define SCRIPT_INDUSTRYTYPE_HPP
-#include "script_list.hpp"
+#include "script_list.h"
/**
* Class that handles all industry-type related functions.
diff --git a/src/script/api/script_industrytypelist.cpp b/src/script/api/script_industrytypelist.cpp
index c8986f675a..43c923730b 100644
--- a/src/script/api/script_industrytypelist.cpp
+++ b/src/script/api/script_industrytypelist.cpp
@@ -8,7 +8,7 @@
/** @file script_industrytypelist.cpp Implementation of ScriptIndustryTypeList. */
#include "../../stdafx.h"
-#include "script_industrytypelist.hpp"
+#include "script_industrytypelist.h"
#include "../../industry.h"
#include "../../safeguards.h"
diff --git a/src/script/api/script_industrytypelist.hpp b/src/script/api/script_industrytypelist.h
similarity index 88%
rename from src/script/api/script_industrytypelist.hpp
rename to src/script/api/script_industrytypelist.h
index 2d2f8775be..7451f07ccf 100644
--- a/src/script/api/script_industrytypelist.hpp
+++ b/src/script/api/script_industrytypelist.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 .
*/
-/** @file script_industrytypelist.hpp List all available industry types. */
+/** @file script_industrytypelist.h List all available industry types. */
#ifndef SCRIPT_INDUSTRYTYPELIST_HPP
#define SCRIPT_INDUSTRYTYPELIST_HPP
-#include "script_industrytype.hpp"
+#include "script_industrytype.h"
/**
* Creates a list of valid industry types.
diff --git a/src/script/api/script_info_docs.hpp b/src/script/api/script_info_docs.h
similarity index 99%
rename from src/script/api/script_info_docs.hpp
rename to src/script/api/script_info_docs.h
index 902fc7357a..08f900c061 100644
--- a/src/script/api/script_info_docs.hpp
+++ b/src/script/api/script_info_docs.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 .
*/
-/** @file script_info_docs.hpp Description of the functions an Script can/must provide in ScriptInfo. */
+/** @file script_info_docs.h Description of the functions an Script can/must provide in ScriptInfo. */
/* This file exists purely for doxygen purposes. */
diff --git a/src/script/api/script_infrastructure.cpp b/src/script/api/script_infrastructure.cpp
index 3d6bdd2fcc..cc32a2f59c 100644
--- a/src/script/api/script_infrastructure.cpp
+++ b/src/script/api/script_infrastructure.cpp
@@ -8,7 +8,7 @@
/** @file script_infrastructure.cpp Implementation of ScriptInfrastructure. */
#include "../../stdafx.h"
-#include "script_infrastructure.hpp"
+#include "script_infrastructure.h"
#include "../../company_base.h"
#include "../../rail.h"
#include "../../road_func.h"
diff --git a/src/script/api/script_infrastructure.hpp b/src/script/api/script_infrastructure.h
similarity index 96%
rename from src/script/api/script_infrastructure.hpp
rename to src/script/api/script_infrastructure.h
index 9b3a499b7d..dca77ce990 100644
--- a/src/script/api/script_infrastructure.hpp
+++ b/src/script/api/script_infrastructure.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 .
*/
-/** @file script_infrastructure.hpp Everything to query a company's infrastructure. */
+/** @file script_infrastructure.h Everything to query a company's infrastructure. */
#ifndef SCRIPT_INFRASTRUCTURE_HPP
#define SCRIPT_INFRASTRUCTURE_HPP
-#include "script_road.hpp"
-#include "script_rail.hpp"
+#include "script_road.h"
+#include "script_rail.h"
/**
* Class that handles all company infrastructure related functions.
diff --git a/src/script/api/script_league.cpp b/src/script/api/script_league.cpp
index 28a4e8e674..be44a2f913 100644
--- a/src/script/api/script_league.cpp
+++ b/src/script/api/script_league.cpp
@@ -9,10 +9,10 @@
#include "../../stdafx.h"
-#include "script_league.hpp"
+#include "script_league.h"
-#include "../script_instance.hpp"
-#include "script_error.hpp"
+#include "../script_instance.h"
+#include "script_error.h"
#include "../../league_base.h"
#include "../../league_cmd.h"
diff --git a/src/script/api/script_league.hpp b/src/script/api/script_league.h
similarity index 97%
rename from src/script/api/script_league.hpp
rename to src/script/api/script_league.h
index 7da4074a27..90db748252 100644
--- a/src/script/api/script_league.hpp
+++ b/src/script/api/script_league.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 .
*/
-/** @file script_league.hpp Everything to manipulate league tables. */
+/** @file script_league.h Everything to manipulate league tables. */
#ifndef SCRIPT_LEAGUE_HPP
#define SCRIPT_LEAGUE_HPP
-#include "script_company.hpp"
-#include "script_text.hpp"
+#include "script_company.h"
+#include "script_text.h"
#include "../../league_type.h"
/**
diff --git a/src/script/api/script_list.cpp b/src/script/api/script_list.cpp
index f774b2a004..37267a02f4 100644
--- a/src/script/api/script_list.cpp
+++ b/src/script/api/script_list.cpp
@@ -8,9 +8,9 @@
/** @file script_list.cpp Implementation of ScriptList. */
#include "../../stdafx.h"
-#include "script_list.hpp"
+#include "script_list.h"
#include "../../debug.h"
-#include "../../script/squirrel.hpp"
+#include "../../script/squirrel.h"
#include "../../safeguards.h"
diff --git a/src/script/api/script_list.hpp b/src/script/api/script_list.h
similarity index 99%
rename from src/script/api/script_list.hpp
rename to src/script/api/script_list.h
index a59ff218de..405732b2d4 100644
--- a/src/script/api/script_list.hpp
+++ b/src/script/api/script_list.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 .
*/
-/** @file script_list.hpp A list which can keep item/value pairs, which you can walk. */
+/** @file script_list.h A list which can keep item/value pairs, which you can walk. */
/** @defgroup ScriptList Classes that create a list of items. */
#ifndef SCRIPT_LIST_HPP
#define SCRIPT_LIST_HPP
-#include "script_object.hpp"
+#include "script_object.h"
/** Maximum number of operations allowed for valuating a list. */
static const int MAX_VALUATE_OPS = 500000;
diff --git a/src/script/api/script_log.cpp b/src/script/api/script_log.cpp
index bb6fb0060f..553cb386eb 100644
--- a/src/script/api/script_log.cpp
+++ b/src/script/api/script_log.cpp
@@ -8,9 +8,9 @@
/** @file script_log.cpp Implementation of ScriptLog. */
#include "../../stdafx.h"
-#include "script_log_types.hpp"
-#include "script_log.hpp"
-#include "../../core/alloc_func.hpp"
+#include "script_log_types.h"
+#include "script_log.h"
+#include "../../core/alloc_func.h"
#include "../../debug.h"
#include "../../window_func.h"
#include "../../string_func.h"
diff --git a/src/script/api/script_log.hpp b/src/script/api/script_log.h
similarity index 95%
rename from src/script/api/script_log.hpp
rename to src/script/api/script_log.h
index cac45a3067..5a8e1206d0 100644
--- a/src/script/api/script_log.hpp
+++ b/src/script/api/script_log.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 .
*/
-/** @file script_log.hpp Everything to handle and issue log messages. */
+/** @file script_log.h Everything to handle and issue log messages. */
#ifndef SCRIPT_LOG_HPP
#define SCRIPT_LOG_HPP
-#include "script_object.hpp"
+#include "script_object.h"
/**
* Class that handles all log related functions.
diff --git a/src/script/api/script_log_types.hpp b/src/script/api/script_log_types.h
similarity index 95%
rename from src/script/api/script_log_types.hpp
rename to src/script/api/script_log_types.h
index d52be944f8..c97a8342b6 100644
--- a/src/script/api/script_log_types.hpp
+++ b/src/script/api/script_log_types.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 .
*/
-/** @file script_log_types.hpp Data types for script log messages. */
+/** @file script_log_types.h Data types for script log messages. */
#ifndef SCRIPT_LOG_TYPES_HPP
#define SCRIPT_LOG_TYPES_HPP
diff --git a/src/script/api/script_map.cpp b/src/script/api/script_map.cpp
index fb76ac0bf6..bffd572aa1 100644
--- a/src/script/api/script_map.cpp
+++ b/src/script/api/script_map.cpp
@@ -8,7 +8,7 @@
/** @file script_map.cpp Implementation of ScriptMap. */
#include "../../stdafx.h"
-#include "script_map.hpp"
+#include "script_map.h"
#include "../../tile_map.h"
#include "../../safeguards.h"
diff --git a/src/script/api/script_map.hpp b/src/script/api/script_map.h
similarity index 97%
rename from src/script/api/script_map.hpp
rename to src/script/api/script_map.h
index 323ba31c28..59e371b3a4 100644
--- a/src/script/api/script_map.hpp
+++ b/src/script/api/script_map.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 .
*/
-/** @file script_map.hpp Everything to query and manipulate map metadata. */
+/** @file script_map.h Everything to query and manipulate map metadata. */
#ifndef SCRIPT_MAP_HPP
#define SCRIPT_MAP_HPP
-#include "script_object.hpp"
+#include "script_object.h"
#include "../../tile_type.h"
/**
diff --git a/src/script/api/script_marine.cpp b/src/script/api/script_marine.cpp
index 6c04e19046..0d21f99860 100644
--- a/src/script/api/script_marine.cpp
+++ b/src/script/api/script_marine.cpp
@@ -8,8 +8,8 @@
/** @file script_marine.cpp Implementation of ScriptMarine. */
#include "../../stdafx.h"
-#include "script_marine.hpp"
-#include "script_station.hpp"
+#include "script_marine.h"
+#include "script_station.h"
#include "../../station_base.h"
#include "../../dock_cmd.h"
#include "../../landscape_cmd.h"
diff --git a/src/script/api/script_marine.hpp b/src/script/api/script_marine.h
similarity index 98%
rename from src/script/api/script_marine.hpp
rename to src/script/api/script_marine.h
index e6d5a2600b..9ec585a246 100644
--- a/src/script/api/script_marine.hpp
+++ b/src/script/api/script_marine.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 .
*/
-/** @file script_marine.hpp Everything to query and build marine. */
+/** @file script_marine.h Everything to query and build marine. */
#ifndef SCRIPT_MARINE_HPP
#define SCRIPT_MARINE_HPP
-#include "script_error.hpp"
+#include "script_error.h"
/**
* Class that handles all marine related functions.
diff --git a/src/script/api/script_newgrf.cpp b/src/script/api/script_newgrf.cpp
index 884918c549..a5b5e0dcef 100644
--- a/src/script/api/script_newgrf.cpp
+++ b/src/script/api/script_newgrf.cpp
@@ -8,8 +8,8 @@
/** @file script_newgrf.cpp Implementation of ScriptNewGRF and friends. */
#include "../../stdafx.h"
-#include "script_newgrf.hpp"
-#include "../../core/bitmath_func.hpp"
+#include "script_newgrf.h"
+#include "../../core/bitmath_func.h"
#include "../../newgrf_config.h"
#include "../../string_func.h"
diff --git a/src/script/api/script_newgrf.hpp b/src/script/api/script_newgrf.h
similarity index 95%
rename from src/script/api/script_newgrf.hpp
rename to src/script/api/script_newgrf.h
index 7b9b2286c5..daad9a4e3e 100644
--- a/src/script/api/script_newgrf.hpp
+++ b/src/script/api/script_newgrf.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 .
*/
-/** @file script_newgrf.hpp NewGRF info for scripts. */
+/** @file script_newgrf.h NewGRF info for scripts. */
#ifndef SCRIPT_NEWGRF_HPP
#define SCRIPT_NEWGRF_HPP
-#include "script_list.hpp"
+#include "script_list.h"
/**
* Create a list of loaded NewGRFs.
diff --git a/src/script/api/script_news.cpp b/src/script/api/script_news.cpp
index 93462436f0..554907f2c7 100644
--- a/src/script/api/script_news.cpp
+++ b/src/script/api/script_news.cpp
@@ -8,12 +8,12 @@
/** @file script_news.cpp Implementation of ScriptNews. */
#include "../../stdafx.h"
-#include "script_news.hpp"
-#include "script_industry.hpp"
-#include "script_station.hpp"
-#include "script_map.hpp"
-#include "script_town.hpp"
-#include "script_error.hpp"
+#include "script_news.h"
+#include "script_industry.h"
+#include "script_station.h"
+#include "script_map.h"
+#include "script_town.h"
+#include "script_error.h"
#include "../../command_type.h"
#include "../../string_func.h"
#include "../../news_cmd.h"
diff --git a/src/script/api/script_news.hpp b/src/script/api/script_news.h
similarity index 97%
rename from src/script/api/script_news.hpp
rename to src/script/api/script_news.h
index 808964f7ba..1bb1b8e9d4 100644
--- a/src/script/api/script_news.hpp
+++ b/src/script/api/script_news.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 .
*/
-/** @file script_news.hpp Everything to handle news messages. */
+/** @file script_news.h Everything to handle news messages. */
#ifndef SCRIPT_NEWS_HPP
#define SCRIPT_NEWS_HPP
-#include "script_company.hpp"
+#include "script_company.h"
#include "../../news_type.h"
/**
diff --git a/src/script/api/script_object.cpp b/src/script/api/script_object.cpp
index 8e3a684240..edf8762852 100644
--- a/src/script/api/script_object.cpp
+++ b/src/script/api/script_object.cpp
@@ -8,7 +8,7 @@
/** @file script_object.cpp Implementation of ScriptObject. */
#include "../../stdafx.h"
-#include "../../script/squirrel.hpp"
+#include "../../script/squirrel.h"
#include "../../company_func.h"
#include "../../company_base.h"
#include "../../network/network.h"
@@ -17,10 +17,10 @@
#include "../../strings_func.h"
#include "../../command_func.h"
-#include "../script_storage.hpp"
-#include "../script_instance.hpp"
-#include "../script_fatalerror.hpp"
-#include "script_error.hpp"
+#include "../script_storage.h"
+#include "../script_instance.h"
+#include "../script_fatalerror.h"
+#include "script_error.h"
#include "../../debug.h"
#include "../../safeguards.h"
diff --git a/src/script/api/script_object.hpp b/src/script/api/script_object.h
similarity index 98%
rename from src/script/api/script_object.hpp
rename to src/script/api/script_object.h
index 28cac81d59..c0d27baa86 100644
--- a/src/script/api/script_object.hpp
+++ b/src/script/api/script_object.h
@@ -5,22 +5,22 @@
* 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 .
*/
-/** @file script_object.hpp Main object, on which all objects depend. */
+/** @file script_object.h Main object, on which all objects depend. */
#ifndef SCRIPT_OBJECT_HPP
#define SCRIPT_OBJECT_HPP
-#include "../../misc/countedptr.hpp"
+#include "../../misc/countedptr.h"
#include "../../road_type.h"
#include "../../rail_type.h"
#include "../../string_func.h"
#include "../../command_func.h"
-#include "../../core/random_func.hpp"
+#include "../../core/random_func.h"
-#include "script_types.hpp"
-#include "script_log_types.hpp"
-#include "../script_suspend.hpp"
-#include "../squirrel.hpp"
+#include "script_types.h"
+#include "script_log_types.h"
+#include "../script_suspend.h"
+#include "../squirrel.h"
#include
diff --git a/src/script/api/script_objecttype.cpp b/src/script/api/script_objecttype.cpp
index 7e036a3e3d..df1b46e381 100644
--- a/src/script/api/script_objecttype.cpp
+++ b/src/script/api/script_objecttype.cpp
@@ -9,10 +9,10 @@
#include "../../stdafx.h"
-#include "script_objecttype.hpp"
+#include "script_objecttype.h"
-#include "script_error.hpp"
-#include "script_map.hpp"
+#include "script_error.h"
+#include "script_map.h"
#include "../../object_cmd.h"
#include "../../safeguards.h"
diff --git a/src/script/api/script_objecttype.hpp b/src/script/api/script_objecttype.h
similarity index 95%
rename from src/script/api/script_objecttype.hpp
rename to src/script/api/script_objecttype.h
index 9a5c47278f..a3d854cfc8 100644
--- a/src/script/api/script_objecttype.hpp
+++ b/src/script/api/script_objecttype.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 .
*/
-/** @file script_objecttype.hpp Everything to query and build industries. */
+/** @file script_objecttype.h Everything to query and build industries. */
#ifndef SCRIPT_OBJECTTYPE_HPP
#define SCRIPT_OBJECTTYPE_HPP
-#include "script_list.hpp"
+#include "script_list.h"
#include "../../newgrf_object.h"
diff --git a/src/script/api/script_objecttypelist.cpp b/src/script/api/script_objecttypelist.cpp
index 725997067b..9a367b6cae 100644
--- a/src/script/api/script_objecttypelist.cpp
+++ b/src/script/api/script_objecttypelist.cpp
@@ -8,7 +8,7 @@
/** @file script_objecttypelist.cpp Implementation of ScriptObjectTypeList. */
#include "../../stdafx.h"
-#include "script_objecttypelist.hpp"
+#include "script_objecttypelist.h"
#include "../../newgrf_object.h"
#include "../../safeguards.h"
diff --git a/src/script/api/script_objecttypelist.hpp b/src/script/api/script_objecttypelist.h
similarity index 89%
rename from src/script/api/script_objecttypelist.hpp
rename to src/script/api/script_objecttypelist.h
index 0276838e8c..318154d894 100644
--- a/src/script/api/script_objecttypelist.hpp
+++ b/src/script/api/script_objecttypelist.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 .
*/
-/** @file script_objecttypelist.hpp List all available object types. */
+/** @file script_objecttypelist.h List all available object types. */
#ifndef SCRIPT_OBJECTTYPELIST_HPP
#define SCRIPT_OBJECTTYPELIST_HPP
-#include "script_objecttype.hpp"
+#include "script_objecttype.h"
/**
* Creates a list of valid object types.
diff --git a/src/script/api/script_order.cpp b/src/script/api/script_order.cpp
index 554e3ecfab..13de273002 100644
--- a/src/script/api/script_order.cpp
+++ b/src/script/api/script_order.cpp
@@ -8,10 +8,10 @@
/** @file script_order.cpp Implementation of ScriptOrder. */
#include "../../stdafx.h"
-#include "script_order.hpp"
-#include "script_cargo.hpp"
-#include "script_map.hpp"
-#include "../script_instance.hpp"
+#include "script_order.h"
+#include "script_cargo.h"
+#include "script_map.h"
+#include "../script_instance.h"
#include "../../debug.h"
#include "../../vehicle_base.h"
#include "../../roadstop_base.h"
diff --git a/src/script/api/script_order.hpp b/src/script/api/script_order.h
similarity index 99%
rename from src/script/api/script_order.hpp
rename to src/script/api/script_order.h
index d3e7066cd5..d8332205a6 100644
--- a/src/script/api/script_order.hpp
+++ b/src/script/api/script_order.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 .
*/
-/** @file script_order.hpp Everything to query and build orders. */
+/** @file script_order.h Everything to query and build orders. */
#ifndef SCRIPT_ORDER_HPP
#define SCRIPT_ORDER_HPP
-#include "script_vehicle.hpp"
+#include "script_vehicle.h"
#include "../../order_type.h"
/**
diff --git a/src/script/api/script_priorityqueue.cpp b/src/script/api/script_priorityqueue.cpp
index c9cdc82862..3ee53a615e 100644
--- a/src/script/api/script_priorityqueue.cpp
+++ b/src/script/api/script_priorityqueue.cpp
@@ -8,10 +8,10 @@
/** @file script_priorityqueue.cpp Implementation of ScriptPriorityQueue. */
#include "../../stdafx.h"
-#include "script_priorityqueue.hpp"
-#include "script_error.hpp"
-#include "../squirrel_helper.hpp"
-#include "../script_instance.hpp"
+#include "script_priorityqueue.h"
+#include "script_error.h"
+#include "../squirrel_helper.h"
+#include "../script_instance.h"
#include "../../debug.h"
#include "../../safeguards.h"
diff --git a/src/script/api/script_priorityqueue.hpp b/src/script/api/script_priorityqueue.h
similarity index 95%
rename from src/script/api/script_priorityqueue.hpp
rename to src/script/api/script_priorityqueue.h
index 43c173b350..d60fb26d49 100644
--- a/src/script/api/script_priorityqueue.hpp
+++ b/src/script/api/script_priorityqueue.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 .
*/
-/** @file script_priorityqueue.hpp A queue that keeps a list of items sorted by a priority. */
+/** @file script_priorityqueue.h A queue that keeps a list of items sorted by a priority. */
/** @defgroup ScriptPriorityQueue Classes that create a priority queue of items. */
#ifndef SCRIPT_PRIORITYQUEUE_HPP
#define SCRIPT_PRIORITYQUEUE_HPP
-#include "script_object.hpp"
+#include "script_object.h"
#include
/**
diff --git a/src/script/api/script_rail.cpp b/src/script/api/script_rail.cpp
index 001d7952d8..00d984eb77 100644
--- a/src/script/api/script_rail.cpp
+++ b/src/script/api/script_rail.cpp
@@ -8,11 +8,11 @@
/** @file script_rail.cpp Implementation of ScriptRail. */
#include "../../stdafx.h"
-#include "script_rail.hpp"
-#include "script_map.hpp"
-#include "script_station.hpp"
-#include "script_industrytype.hpp"
-#include "script_cargo.hpp"
+#include "script_rail.h"
+#include "script_map.h"
+#include "script_station.h"
+#include "script_industrytype.h"
+#include "script_cargo.h"
#include "../../debug.h"
#include "../../station_base.h"
#include "../../newgrf_generic.h"
diff --git a/src/script/api/script_rail.hpp b/src/script/api/script_rail.h
similarity index 99%
rename from src/script/api/script_rail.hpp
rename to src/script/api/script_rail.h
index da0edb04c0..ec6260227e 100644
--- a/src/script/api/script_rail.hpp
+++ b/src/script/api/script_rail.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 .
*/
-/** @file script_rail.hpp Everything to query and build rails. */
+/** @file script_rail.h Everything to query and build rails. */
#ifndef SCRIPT_RAIL_HPP
#define SCRIPT_RAIL_HPP
-#include "script_tile.hpp"
+#include "script_tile.h"
#include "../../signal_type.h"
#include "../../track_type.h"
diff --git a/src/script/api/script_railtypelist.cpp b/src/script/api/script_railtypelist.cpp
index 3cdc9b83c6..9d3d41bc98 100644
--- a/src/script/api/script_railtypelist.cpp
+++ b/src/script/api/script_railtypelist.cpp
@@ -8,8 +8,8 @@
/** @file script_railtypelist.cpp Implementation of ScriptRailTypeList and friends. */
#include "../../stdafx.h"
-#include "script_railtypelist.hpp"
-#include "script_error.hpp"
+#include "script_railtypelist.h"
+#include "script_error.h"
#include "../../rail.h"
#include "../../safeguards.h"
diff --git a/src/script/api/script_railtypelist.hpp b/src/script/api/script_railtypelist.h
similarity index 90%
rename from src/script/api/script_railtypelist.hpp
rename to src/script/api/script_railtypelist.h
index 78c7f9ecff..464cbfad0f 100644
--- a/src/script/api/script_railtypelist.hpp
+++ b/src/script/api/script_railtypelist.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 .
*/
-/** @file script_railtypelist.hpp List all available railtypes. */
+/** @file script_railtypelist.h List all available railtypes. */
#ifndef SCRIPT_RAILTYPELIST_HPP
#define SCRIPT_RAILTYPELIST_HPP
-#include "script_list.hpp"
+#include "script_list.h"
/**
* Creates a list of all available railtypes.
diff --git a/src/script/api/script_road.cpp b/src/script/api/script_road.cpp
index 2be3dac282..12b9f84ae8 100644
--- a/src/script/api/script_road.cpp
+++ b/src/script/api/script_road.cpp
@@ -8,15 +8,15 @@
/** @file script_road.cpp Implementation of ScriptRoad. */
#include "../../stdafx.h"
-#include "script_map.hpp"
-#include "script_station.hpp"
-#include "script_cargo.hpp"
+#include "script_map.h"
+#include "script_station.h"
+#include "script_cargo.h"
#include "../../station_base.h"
#include "../../landscape_cmd.h"
#include "../../road_cmd.h"
#include "../../station_cmd.h"
#include "../../newgrf_roadstop.h"
-#include "../../script/squirrel_helper_type.hpp"
+#include "../../script/squirrel_helper_type.h"
#include "../../safeguards.h"
diff --git a/src/script/api/script_road.hpp b/src/script/api/script_road.h
similarity index 99%
rename from src/script/api/script_road.hpp
rename to src/script/api/script_road.h
index 007c44adce..dd3421f5d5 100644
--- a/src/script/api/script_road.hpp
+++ b/src/script/api/script_road.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 .
*/
-/** @file script_road.hpp Everything to query and build roads. */
+/** @file script_road.h Everything to query and build roads. */
#ifndef SCRIPT_ROAD_HPP
#define SCRIPT_ROAD_HPP
-#include "script_tile.hpp"
-#include "../squirrel_helper_type.hpp"
+#include "script_tile.h"
+#include "../squirrel_helper_type.h"
#include "../../../road.h"
/**
diff --git a/src/script/api/script_roadtypelist.cpp b/src/script/api/script_roadtypelist.cpp
index 18b0d6845d..609d752a83 100644
--- a/src/script/api/script_roadtypelist.cpp
+++ b/src/script/api/script_roadtypelist.cpp
@@ -8,7 +8,7 @@
/** @file script_roadtypelist.cpp Implementation of ScriptRoadTypeList and friends. */
#include "../../stdafx.h"
-#include "script_roadtypelist.hpp"
+#include "script_roadtypelist.h"
#include "../../road_func.h"
#include "../../safeguards.h"
diff --git a/src/script/api/script_roadtypelist.hpp b/src/script/api/script_roadtypelist.h
similarity index 88%
rename from src/script/api/script_roadtypelist.hpp
rename to src/script/api/script_roadtypelist.h
index 41cf9fe2e8..07b1e12b32 100644
--- a/src/script/api/script_roadtypelist.hpp
+++ b/src/script/api/script_roadtypelist.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 .
*/
-/** @file script_roadtypelist.hpp List all available roadtypes. */
+/** @file script_roadtypelist.h List all available roadtypes. */
#ifndef SCRIPT_ROADTYPELIST_HPP
#define SCRIPT_ROADTYPELIST_HPP
-#include "script_list.hpp"
-#include "script_road.hpp"
+#include "script_list.h"
+#include "script_road.h"
/**
* Creates a list of all available roadtypes.
diff --git a/src/script/api/script_sign.cpp b/src/script/api/script_sign.cpp
index 59077aa55c..ef44436e47 100644
--- a/src/script/api/script_sign.cpp
+++ b/src/script/api/script_sign.cpp
@@ -8,9 +8,9 @@
/** @file script_sign.cpp Implementation of ScriptSign. */
#include "../../stdafx.h"
-#include "script_sign.hpp"
+#include "script_sign.h"
#include "table/strings.h"
-#include "../script_instance.hpp"
+#include "../script_instance.h"
#include "../../signs_base.h"
#include "../../string_func.h"
#include "../../strings_func.h"
diff --git a/src/script/api/script_sign.hpp b/src/script/api/script_sign.h
similarity index 96%
rename from src/script/api/script_sign.hpp
rename to src/script/api/script_sign.h
index 1569ad9932..59f255afd5 100644
--- a/src/script/api/script_sign.hpp
+++ b/src/script/api/script_sign.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 .
*/
-/** @file script_sign.hpp Everything to query and build signs. */
+/** @file script_sign.h Everything to query and build signs. */
#ifndef SCRIPT_SIGN_HPP
#define SCRIPT_SIGN_HPP
-#include "script_company.hpp"
-#include "script_error.hpp"
+#include "script_company.h"
+#include "script_error.h"
/**
* Class that handles all sign related functions.
diff --git a/src/script/api/script_signlist.cpp b/src/script/api/script_signlist.cpp
index 000c104093..24b0e8108b 100644
--- a/src/script/api/script_signlist.cpp
+++ b/src/script/api/script_signlist.cpp
@@ -8,8 +8,8 @@
/** @file script_signlist.cpp Implementation of ScriptSignList and friends. */
#include "../../stdafx.h"
-#include "script_signlist.hpp"
-#include "script_sign.hpp"
+#include "script_signlist.h"
+#include "script_sign.h"
#include "../../signs_base.h"
#include "../../safeguards.h"
diff --git a/src/script/api/script_signlist.hpp b/src/script/api/script_signlist.h
similarity index 94%
rename from src/script/api/script_signlist.hpp
rename to src/script/api/script_signlist.h
index 7e5117fca0..411db2ec4a 100644
--- a/src/script/api/script_signlist.hpp
+++ b/src/script/api/script_signlist.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 .
*/
-/** @file script_signlist.hpp List all the signs of your company. */
+/** @file script_signlist.h List all the signs of your company. */
#ifndef SCRIPT_SIGNLIST_HPP
#define SCRIPT_SIGNLIST_HPP
-#include "script_list.hpp"
+#include "script_list.h"
/**
* Create a list of signs your company has created.
diff --git a/src/script/api/script_station.cpp b/src/script/api/script_station.cpp
index ee3ff0d5d6..76a596d0d9 100644
--- a/src/script/api/script_station.cpp
+++ b/src/script/api/script_station.cpp
@@ -8,10 +8,10 @@
/** @file script_station.cpp Implementation of ScriptStation. */
#include "../../stdafx.h"
-#include "script_station.hpp"
-#include "script_map.hpp"
-#include "script_town.hpp"
-#include "script_cargo.hpp"
+#include "script_station.h"
+#include "script_map.h"
+#include "script_town.h"
+#include "script_cargo.h"
#include "../../station_base.h"
#include "../../roadstop_base.h"
#include "../../town.h"
diff --git a/src/script/api/script_station.hpp b/src/script/api/script_station.h
similarity index 99%
rename from src/script/api/script_station.hpp
rename to src/script/api/script_station.h
index 4f705a518a..a82a94519a 100644
--- a/src/script/api/script_station.hpp
+++ b/src/script/api/script_station.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 .
*/
-/** @file script_station.hpp Everything to query and build stations. */
+/** @file script_station.h Everything to query and build stations. */
#ifndef SCRIPT_STATION_HPP
#define SCRIPT_STATION_HPP
-#include "script_road.hpp"
-#include "script_basestation.hpp"
+#include "script_road.h"
+#include "script_basestation.h"
#include "../../station_type.h"
/**
diff --git a/src/script/api/script_stationlist.cpp b/src/script/api/script_stationlist.cpp
index d2c1d532b1..b86116e7fd 100644
--- a/src/script/api/script_stationlist.cpp
+++ b/src/script/api/script_stationlist.cpp
@@ -8,9 +8,9 @@
/** @file script_stationlist.cpp Implementation of ScriptStationList and friends. */
#include "../../stdafx.h"
-#include "script_stationlist.hpp"
-#include "script_vehicle.hpp"
-#include "script_cargo.hpp"
+#include "script_stationlist.h"
+#include "script_vehicle.h"
+#include "script_cargo.h"
#include "../../station_base.h"
#include "../../vehicle_base.h"
diff --git a/src/script/api/script_stationlist.hpp b/src/script/api/script_stationlist.h
similarity index 98%
rename from src/script/api/script_stationlist.hpp
rename to src/script/api/script_stationlist.h
index 8628dbb4a3..40f0b78b54 100644
--- a/src/script/api/script_stationlist.hpp
+++ b/src/script/api/script_stationlist.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 .
*/
-/** @file script_stationlist.hpp List all the stations (you own). */
+/** @file script_stationlist.h List all the stations (you own). */
#ifndef SCRIPT_STATIONLIST_HPP
#define SCRIPT_STATIONLIST_HPP
-#include "script_list.hpp"
-#include "script_station.hpp"
+#include "script_list.h"
+#include "script_station.h"
/**
* Creates a list of stations of which you are the owner.
diff --git a/src/script/api/script_story_page.cpp b/src/script/api/script_story_page.cpp
index 87a46427eb..175eb898cb 100644
--- a/src/script/api/script_story_page.cpp
+++ b/src/script/api/script_story_page.cpp
@@ -8,13 +8,13 @@
/** @file script_story_page.cpp Implementation of ScriptStoryPage. */
#include "../../stdafx.h"
-#include "script_story_page.hpp"
-#include "script_error.hpp"
-#include "script_industry.hpp"
-#include "script_map.hpp"
-#include "script_town.hpp"
-#include "script_goal.hpp"
-#include "../script_instance.hpp"
+#include "script_story_page.h"
+#include "script_error.h"
+#include "script_industry.h"
+#include "script_map.h"
+#include "script_town.h"
+#include "script_goal.h"
+#include "../script_instance.h"
#include "../../story_base.h"
#include "../../goal_base.h"
#include "../../string_func.h"
diff --git a/src/script/api/script_story_page.hpp b/src/script/api/script_story_page.h
similarity index 98%
rename from src/script/api/script_story_page.hpp
rename to src/script/api/script_story_page.h
index c51c4c9363..0e64eadb0e 100644
--- a/src/script/api/script_story_page.hpp
+++ b/src/script/api/script_story_page.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 .
*/
-/** @file script_story_page.hpp Everything to manipulate a story page. */
+/** @file script_story_page.h Everything to manipulate a story page. */
#ifndef SCRIPT_STORY_HPP
#define SCRIPT_STORY_HPP
-#include "script_company.hpp"
-#include "script_date.hpp"
-#include "script_vehicle.hpp"
+#include "script_company.h"
+#include "script_date.h"
+#include "script_vehicle.h"
#include "../../story_type.h"
#include "../../story_base.h"
diff --git a/src/script/api/script_storypageelementlist.cpp b/src/script/api/script_storypageelementlist.cpp
index 506342c7c6..6c31e34430 100644
--- a/src/script/api/script_storypageelementlist.cpp
+++ b/src/script/api/script_storypageelementlist.cpp
@@ -8,7 +8,7 @@
/** @file script_storypageelementlist.cpp Implementation of ScriptStoryPageElementList and friends. */
#include "../../stdafx.h"
-#include "script_storypageelementlist.hpp"
+#include "script_storypageelementlist.h"
#include "../../story_base.h"
#include "../../safeguards.h"
diff --git a/src/script/api/script_storypageelementlist.hpp b/src/script/api/script_storypageelementlist.h
similarity index 86%
rename from src/script/api/script_storypageelementlist.hpp
rename to src/script/api/script_storypageelementlist.h
index 5bd1adab5f..9c80766c18 100644
--- a/src/script/api/script_storypageelementlist.hpp
+++ b/src/script/api/script_storypageelementlist.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 .
*/
-/** @file script_storypageelementlist.hpp List all story page elements. */
+/** @file script_storypageelementlist.h List all story page elements. */
#ifndef SCRIPT_STORYPAGEELEMENTLIST_HPP
#define SCRIPT_STORYPAGEELEMENTLIST_HPP
-#include "script_list.hpp"
-#include "script_company.hpp"
-#include "script_story_page.hpp"
+#include "script_list.h"
+#include "script_company.h"
+#include "script_story_page.h"
/**
* Create a list of all story page elements.
diff --git a/src/script/api/script_storypagelist.cpp b/src/script/api/script_storypagelist.cpp
index 90001a77a6..14e7bebe2c 100644
--- a/src/script/api/script_storypagelist.cpp
+++ b/src/script/api/script_storypagelist.cpp
@@ -8,8 +8,8 @@
/** @file script_storypagelist.cpp Implementation of ScriptStoryPageList and friends. */
#include "../../stdafx.h"
-#include "script_storypagelist.hpp"
-#include "script_story_page.hpp"
+#include "script_storypagelist.h"
+#include "script_story_page.h"
#include "../../story_base.h"
#include "../../safeguards.h"
diff --git a/src/script/api/script_storypagelist.hpp b/src/script/api/script_storypagelist.h
similarity index 90%
rename from src/script/api/script_storypagelist.hpp
rename to src/script/api/script_storypagelist.h
index b491907c53..b58500a2b7 100644
--- a/src/script/api/script_storypagelist.hpp
+++ b/src/script/api/script_storypagelist.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 .
*/
-/** @file script_storypagelist.hpp List all story pages. */
+/** @file script_storypagelist.h List all story pages. */
#ifndef SCRIPT_STORYPAGELIST_HPP
#define SCRIPT_STORYPAGELIST_HPP
-#include "script_list.hpp"
-#include "script_company.hpp"
+#include "script_list.h"
+#include "script_company.h"
/**
* Create a list of all story pages.
diff --git a/src/script/api/script_subsidy.cpp b/src/script/api/script_subsidy.cpp
index 14b964878e..05fde2d167 100644
--- a/src/script/api/script_subsidy.cpp
+++ b/src/script/api/script_subsidy.cpp
@@ -8,11 +8,11 @@
/** @file script_subsidy.cpp Implementation of ScriptSubsidy. */
#include "../../stdafx.h"
-#include "script_subsidy.hpp"
-#include "script_date.hpp"
-#include "script_industry.hpp"
-#include "script_town.hpp"
-#include "script_error.hpp"
+#include "script_subsidy.h"
+#include "script_date.h"
+#include "script_industry.h"
+#include "script_town.h"
+#include "script_error.h"
#include "../../subsidy_base.h"
#include "../../station_base.h"
#include "../../subsidy_cmd.h"
diff --git a/src/script/api/script_subsidy.hpp b/src/script/api/script_subsidy.h
similarity index 97%
rename from src/script/api/script_subsidy.hpp
rename to src/script/api/script_subsidy.h
index 5bfcf1c9a2..88db84c866 100644
--- a/src/script/api/script_subsidy.hpp
+++ b/src/script/api/script_subsidy.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 .
*/
-/** @file script_subsidy.hpp Everything to query subsidies. */
+/** @file script_subsidy.h Everything to query subsidies. */
#ifndef SCRIPT_SUBSIDY_HPP
#define SCRIPT_SUBSIDY_HPP
-#include "script_company.hpp"
-#include "script_date.hpp"
+#include "script_company.h"
+#include "script_date.h"
/**
* Class that handles all subsidy related functions.
diff --git a/src/script/api/script_subsidylist.cpp b/src/script/api/script_subsidylist.cpp
index bd2ea96dfc..9d99bd37ba 100644
--- a/src/script/api/script_subsidylist.cpp
+++ b/src/script/api/script_subsidylist.cpp
@@ -8,7 +8,7 @@
/** @file script_subsidylist.cpp Implementation of ScriptSubsidyList. */
#include "../../stdafx.h"
-#include "script_subsidylist.hpp"
+#include "script_subsidylist.h"
#include "../../subsidy_base.h"
#include "../../safeguards.h"
diff --git a/src/script/api/script_subsidylist.hpp b/src/script/api/script_subsidylist.h
similarity index 94%
rename from src/script/api/script_subsidylist.hpp
rename to src/script/api/script_subsidylist.h
index 281a6a5880..6917b2cfc3 100644
--- a/src/script/api/script_subsidylist.hpp
+++ b/src/script/api/script_subsidylist.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 .
*/
-/** @file script_subsidylist.hpp List all the subsidies. */
+/** @file script_subsidylist.h List all the subsidies. */
#ifndef SCRIPT_SUBSIDYLIST_HPP
#define SCRIPT_SUBSIDYLIST_HPP
-#include "script_list.hpp"
+#include "script_list.h"
/**
* Creates a list of all current subsidies.
diff --git a/src/script/api/script_testmode.cpp b/src/script/api/script_testmode.cpp
index a38deff548..fdc4a5eca3 100644
--- a/src/script/api/script_testmode.cpp
+++ b/src/script/api/script_testmode.cpp
@@ -8,9 +8,9 @@
/** @file script_testmode.cpp Implementation of ScriptTestMode. */
#include "../../stdafx.h"
-#include "script_testmode.hpp"
-#include "../script_instance.hpp"
-#include "../script_fatalerror.hpp"
+#include "script_testmode.h"
+#include "../script_instance.h"
+#include "../script_fatalerror.h"
#include "../../safeguards.h"
diff --git a/src/script/api/script_testmode.hpp b/src/script/api/script_testmode.h
similarity index 94%
rename from src/script/api/script_testmode.hpp
rename to src/script/api/script_testmode.h
index abebc0a6ce..6f2f209d8b 100644
--- a/src/script/api/script_testmode.hpp
+++ b/src/script/api/script_testmode.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 .
*/
-/** @file script_testmode.hpp Switch the script instance to Test Mode. */
+/** @file script_testmode.h Switch the script instance to Test Mode. */
#ifndef SCRIPT_TESTMODE_HPP
#define SCRIPT_TESTMODE_HPP
-#include "script_object.hpp"
+#include "script_object.h"
/**
* Class to switch current mode to Test Mode.
diff --git a/src/script/api/script_text.cpp b/src/script/api/script_text.cpp
index d0b2157b66..9c2c5ae490 100644
--- a/src/script/api/script_text.cpp
+++ b/src/script/api/script_text.cpp
@@ -10,10 +10,10 @@
#include "../../stdafx.h"
#include "../../string_func.h"
#include "../../strings_func.h"
-#include "../../game/game_text.hpp"
-#include "script_text.hpp"
-#include "script_log.hpp"
-#include "../script_fatalerror.hpp"
+#include "../../game/game_text.h"
+#include "script_text.h"
+#include "script_log.h"
+#include "../script_fatalerror.h"
#include "../../table/control_codes.h"
#include "table/strings.h"
diff --git a/src/script/api/script_text.hpp b/src/script/api/script_text.h
similarity index 97%
rename from src/script/api/script_text.hpp
rename to src/script/api/script_text.h
index f46490fbae..9110a26b54 100644
--- a/src/script/api/script_text.hpp
+++ b/src/script/api/script_text.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 .
*/
-/** @file script_text.hpp Everything to handle text which can be translated. */
+/** @file script_text.h Everything to handle text which can be translated. */
#ifndef SCRIPT_TEXT_HPP
#define SCRIPT_TEXT_HPP
-#include "script_object.hpp"
-#include "../../core/alloc_type.hpp"
+#include "script_object.h"
+#include "../../core/alloc_type.h"
#include
diff --git a/src/script/api/script_tile.cpp b/src/script/api/script_tile.cpp
index f292bfd647..2d0fdfd93f 100644
--- a/src/script/api/script_tile.cpp
+++ b/src/script/api/script_tile.cpp
@@ -8,9 +8,9 @@
/** @file script_tile.cpp Implementation of ScriptTile. */
#include "../../stdafx.h"
-#include "script_tile.hpp"
-#include "script_map.hpp"
-#include "script_town.hpp"
+#include "script_tile.h"
+#include "script_map.h"
+#include "script_town.h"
#include "../../station_func.h"
#include "../../water_map.h"
#include "../../clear_map.h"
diff --git a/src/script/api/script_tile.hpp b/src/script/api/script_tile.h
similarity index 99%
rename from src/script/api/script_tile.hpp
rename to src/script/api/script_tile.h
index de476ffb69..5aeb8a12eb 100644
--- a/src/script/api/script_tile.hpp
+++ b/src/script/api/script_tile.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 .
*/
-/** @file script_tile.hpp Everything to query and manipulate tiles. */
+/** @file script_tile.h Everything to query and manipulate tiles. */
#ifndef SCRIPT_TILE_HPP
#define SCRIPT_TILE_HPP
-#include "script_error.hpp"
-#include "script_company.hpp"
+#include "script_error.h"
+#include "script_company.h"
#include "../../slope_type.h"
#include "../../transport_type.h"
diff --git a/src/script/api/script_tilelist.cpp b/src/script/api/script_tilelist.cpp
index 6262db3acc..28e4ea35ee 100644
--- a/src/script/api/script_tilelist.cpp
+++ b/src/script/api/script_tilelist.cpp
@@ -8,8 +8,8 @@
/** @file script_tilelist.cpp Implementation of ScriptTileList and friends. */
#include "../../stdafx.h"
-#include "script_tilelist.hpp"
-#include "script_industry.hpp"
+#include "script_tilelist.h"
+#include "script_industry.h"
#include "../../industry.h"
#include "../../station_base.h"
diff --git a/src/script/api/script_tilelist.hpp b/src/script/api/script_tilelist.h
similarity index 97%
rename from src/script/api/script_tilelist.hpp
rename to src/script/api/script_tilelist.h
index ea584b7111..2a02d640bf 100644
--- a/src/script/api/script_tilelist.hpp
+++ b/src/script/api/script_tilelist.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 .
*/
-/** @file script_tilelist.hpp List tiles. */
+/** @file script_tilelist.h List tiles. */
#ifndef SCRIPT_TILELIST_HPP
#define SCRIPT_TILELIST_HPP
-#include "script_station.hpp"
-#include "script_list.hpp"
+#include "script_station.h"
+#include "script_list.h"
/**
* Creates an empty list, in which you can add tiles.
diff --git a/src/script/api/script_town.cpp b/src/script/api/script_town.cpp
index 57e94db7de..5760f497ef 100644
--- a/src/script/api/script_town.cpp
+++ b/src/script/api/script_town.cpp
@@ -8,9 +8,9 @@
/** @file script_town.cpp Implementation of ScriptTown. */
#include "../../stdafx.h"
-#include "script_town.hpp"
-#include "script_map.hpp"
-#include "script_error.hpp"
+#include "script_town.h"
+#include "script_map.h"
+#include "script_error.h"
#include "../../town.h"
#include "../../townname_func.h"
#include "../../string_func.h"
diff --git a/src/script/api/script_town.hpp b/src/script/api/script_town.h
similarity index 99%
rename from src/script/api/script_town.hpp
rename to src/script/api/script_town.h
index 0c13ef8914..e69efa0a8f 100644
--- a/src/script/api/script_town.hpp
+++ b/src/script/api/script_town.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 .
*/
-/** @file script_town.hpp Everything to query towns. */
+/** @file script_town.h Everything to query towns. */
#ifndef SCRIPT_TOWN_HPP
#define SCRIPT_TOWN_HPP
-#include "script_cargo.hpp"
-#include "script_company.hpp"
+#include "script_cargo.h"
+#include "script_company.h"
#include "../../town_type.h"
/**
diff --git a/src/script/api/script_townlist.cpp b/src/script/api/script_townlist.cpp
index ec9a81f3f4..cf83306a00 100644
--- a/src/script/api/script_townlist.cpp
+++ b/src/script/api/script_townlist.cpp
@@ -8,7 +8,7 @@
/** @file script_townlist.cpp Implementation of ScriptTownList and friends. */
#include "../../stdafx.h"
-#include "script_townlist.hpp"
+#include "script_townlist.h"
#include "../../town.h"
#include "../../safeguards.h"
diff --git a/src/script/api/script_townlist.hpp b/src/script/api/script_townlist.h
similarity index 95%
rename from src/script/api/script_townlist.hpp
rename to src/script/api/script_townlist.h
index 8e24d8af0e..68f8a25db3 100644
--- a/src/script/api/script_townlist.hpp
+++ b/src/script/api/script_townlist.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 .
*/
-/** @file script_townlist.hpp List all the towns. */
+/** @file script_townlist.h List all the towns. */
#ifndef SCRIPT_TOWNLIST_HPP
#define SCRIPT_TOWNLIST_HPP
-#include "script_list.hpp"
+#include "script_list.h"
/**
* Creates a list of towns that are currently on the map.
diff --git a/src/script/api/script_tunnel.cpp b/src/script/api/script_tunnel.cpp
index 1ae9f2d78f..3093fc7fa4 100644
--- a/src/script/api/script_tunnel.cpp
+++ b/src/script/api/script_tunnel.cpp
@@ -8,9 +8,9 @@
/** @file script_tunnel.cpp Implementation of ScriptTunnel. */
#include "../../stdafx.h"
-#include "script_tunnel.hpp"
-#include "script_rail.hpp"
-#include "../script_instance.hpp"
+#include "script_tunnel.h"
+#include "script_rail.h"
+#include "../script_instance.h"
#include "../../tunnel_map.h"
#include "../../landscape_cmd.h"
#include "../../road_cmd.h"
diff --git a/src/script/api/script_tunnel.hpp b/src/script/api/script_tunnel.h
similarity index 97%
rename from src/script/api/script_tunnel.hpp
rename to src/script/api/script_tunnel.h
index 5f226370b4..c168442d9d 100644
--- a/src/script/api/script_tunnel.hpp
+++ b/src/script/api/script_tunnel.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 .
*/
-/** @file script_tunnel.hpp Everything to query and build tunnels. */
+/** @file script_tunnel.h Everything to query and build tunnels. */
#ifndef SCRIPT_TUNNEL_HPP
#define SCRIPT_TUNNEL_HPP
-#include "script_vehicle.hpp"
+#include "script_vehicle.h"
/**
* Class that handles all tunnel related functions.
diff --git a/src/script/api/script_types.hpp b/src/script/api/script_types.h
similarity index 98%
rename from src/script/api/script_types.hpp
rename to src/script/api/script_types.h
index d353cc291d..8b41957a6c 100644
--- a/src/script/api/script_types.hpp
+++ b/src/script/api/script_types.h
@@ -6,7 +6,7 @@
*/
/**
- * @file script_types.hpp Defines all the types of the game, like IDs of various objects.
+ * @file script_types.h Defines all the types of the game, like IDs of various objects.
*
* IDs are used to identify certain objects. They are only unique within the object type, so for example a vehicle may have VehicleID 2009,
* while a station has StationID 2009 at the same time. Also IDs are assigned arbitrary, you cannot assume them to be consecutive.
@@ -80,7 +80,7 @@
#ifndef SCRIPT_TYPES_HPP
#define SCRIPT_TYPES_HPP
-#include "../../core/overflowsafe_type.hpp"
+#include "../../core/overflowsafe_type.h"
#include "../../company_type.h"
#include "../../tile_type.h"
#include
diff --git a/src/script/api/script_vehicle.cpp b/src/script/api/script_vehicle.cpp
index 05d02a79bf..fa8ac9a861 100644
--- a/src/script/api/script_vehicle.cpp
+++ b/src/script/api/script_vehicle.cpp
@@ -8,12 +8,12 @@
/** @file script_vehicle.cpp Implementation of ScriptVehicle. */
#include "../../stdafx.h"
-#include "script_engine.hpp"
-#include "script_cargo.hpp"
-#include "script_gamesettings.hpp"
-#include "script_group.hpp"
-#include "script_map.hpp"
-#include "../script_instance.hpp"
+#include "script_engine.h"
+#include "script_cargo.h"
+#include "script_gamesettings.h"
+#include "script_group.h"
+#include "script_map.h"
+#include "../script_instance.h"
#include "../../string_func.h"
#include "../../strings_func.h"
#include "../../command_func.h"
diff --git a/src/script/api/script_vehicle.hpp b/src/script/api/script_vehicle.h
similarity index 99%
rename from src/script/api/script_vehicle.hpp
rename to src/script/api/script_vehicle.h
index bd6d79ebcc..7dd4759075 100644
--- a/src/script/api/script_vehicle.hpp
+++ b/src/script/api/script_vehicle.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 .
*/
-/** @file script_vehicle.hpp Everything to query and build vehicles. */
+/** @file script_vehicle.h Everything to query and build vehicles. */
#ifndef SCRIPT_VEHICLE_HPP
#define SCRIPT_VEHICLE_HPP
-#include "script_road.hpp"
+#include "script_road.h"
/**
* Class that handles all vehicle related functions.
diff --git a/src/script/api/script_vehiclelist.cpp b/src/script/api/script_vehiclelist.cpp
index 73bb4f4d30..0f32907a4d 100644
--- a/src/script/api/script_vehiclelist.cpp
+++ b/src/script/api/script_vehiclelist.cpp
@@ -8,10 +8,10 @@
/** @file script_vehiclelist.cpp Implementation of ScriptVehicleList and friends. */
#include "../../stdafx.h"
-#include "script_vehiclelist.hpp"
-#include "script_group.hpp"
-#include "script_map.hpp"
-#include "script_station.hpp"
+#include "script_vehiclelist.h"
+#include "script_group.h"
+#include "script_map.h"
+#include "script_station.h"
#include "../../depot_map.h"
#include "../../vehicle_base.h"
#include "../../vehiclelist_func.h"
diff --git a/src/script/api/script_vehiclelist.hpp b/src/script/api/script_vehiclelist.h
similarity index 96%
rename from src/script/api/script_vehiclelist.hpp
rename to src/script/api/script_vehiclelist.h
index c629bc48d2..4c9b41fba0 100644
--- a/src/script/api/script_vehiclelist.hpp
+++ b/src/script/api/script_vehiclelist.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 .
*/
-/** @file script_vehiclelist.hpp List all the vehicles (you own). */
+/** @file script_vehiclelist.h List all the vehicles (you own). */
#ifndef SCRIPT_VEHICLELIST_HPP
#define SCRIPT_VEHICLELIST_HPP
-#include "script_list.hpp"
-#include "script_vehicle.hpp"
+#include "script_list.h"
+#include "script_vehicle.h"
/**
* Creates a list of vehicles of which you are the owner.
diff --git a/src/script/api/script_viewport.cpp b/src/script/api/script_viewport.cpp
index b5f8585097..d78911f616 100644
--- a/src/script/api/script_viewport.cpp
+++ b/src/script/api/script_viewport.cpp
@@ -8,11 +8,11 @@
/** @file script_viewport.cpp Implementation of ScriptViewport. */
#include "../../stdafx.h"
-#include "script_error.hpp"
-#include "script_viewport.hpp"
-#include "script_game.hpp"
-#include "script_map.hpp"
-#include "../script_instance.hpp"
+#include "script_error.h"
+#include "script_viewport.h"
+#include "script_game.h"
+#include "script_map.h"
+#include "../script_instance.h"
#include "../../viewport_func.h"
#include "../../viewport_cmd.h"
diff --git a/src/script/api/script_viewport.hpp b/src/script/api/script_viewport.h
similarity index 93%
rename from src/script/api/script_viewport.hpp
rename to src/script/api/script_viewport.h
index 49a8bca333..0d0ef1024c 100644
--- a/src/script/api/script_viewport.hpp
+++ b/src/script/api/script_viewport.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 .
*/
-/** @file script_viewport.hpp Everything to manipulate the user's viewport. */
+/** @file script_viewport.h Everything to manipulate the user's viewport. */
#ifndef SCRIPT_VIEWPORT_HPP
#define SCRIPT_VIEWPORT_HPP
-#include "script_object.hpp"
-#include "script_client.hpp"
-#include "script_company.hpp"
+#include "script_object.h"
+#include "script_client.h"
+#include "script_company.h"
/**
* Class that manipulates the user's viewport.
diff --git a/src/script/api/script_waypoint.cpp b/src/script/api/script_waypoint.cpp
index 84c2a4aeb6..bc5235a837 100644
--- a/src/script/api/script_waypoint.cpp
+++ b/src/script/api/script_waypoint.cpp
@@ -8,9 +8,9 @@
/** @file script_waypoint.cpp Implementation of ScriptWaypoint. */
#include "../../stdafx.h"
-#include "script_waypoint.hpp"
-#include "script_rail.hpp"
-#include "script_marine.hpp"
+#include "script_waypoint.h"
+#include "script_rail.h"
+#include "script_marine.h"
#include "../../waypoint_base.h"
#include "../../safeguards.h"
diff --git a/src/script/api/script_waypoint.hpp b/src/script/api/script_waypoint.h
similarity index 95%
rename from src/script/api/script_waypoint.hpp
rename to src/script/api/script_waypoint.h
index 9dada43966..47a5c1eee9 100644
--- a/src/script/api/script_waypoint.hpp
+++ b/src/script/api/script_waypoint.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 .
*/
-/** @file script_waypoint.hpp Everything to query and build waypoints. */
+/** @file script_waypoint.h Everything to query and build waypoints. */
#ifndef SCRIPT_WAYPOINT_HPP
#define SCRIPT_WAYPOINT_HPP
-#include "script_basestation.hpp"
-#include "script_error.hpp"
+#include "script_basestation.h"
+#include "script_error.h"
#include "../../station_type.h"
/**
diff --git a/src/script/api/script_waypointlist.cpp b/src/script/api/script_waypointlist.cpp
index 2332655c2e..67ac73b072 100644
--- a/src/script/api/script_waypointlist.cpp
+++ b/src/script/api/script_waypointlist.cpp
@@ -8,8 +8,8 @@
/** @file script_waypointlist.cpp Implementation of ScriptWaypointList and friends. */
#include "../../stdafx.h"
-#include "script_waypointlist.hpp"
-#include "script_vehicle.hpp"
+#include "script_waypointlist.h"
+#include "script_vehicle.h"
#include "../../vehicle_base.h"
#include "../../waypoint_base.h"
diff --git a/src/script/api/script_waypointlist.hpp b/src/script/api/script_waypointlist.h
similarity index 91%
rename from src/script/api/script_waypointlist.hpp
rename to src/script/api/script_waypointlist.h
index f05754b1e0..b55f342a75 100644
--- a/src/script/api/script_waypointlist.hpp
+++ b/src/script/api/script_waypointlist.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 .
*/
-/** @file script_waypointlist.hpp List all the waypoints (you own). */
+/** @file script_waypointlist.h List all the waypoints (you own). */
#ifndef SCRIPT_WAYPOINTLIST_HPP
#define SCRIPT_WAYPOINTLIST_HPP
-#include "script_list.hpp"
-#include "script_waypoint.hpp"
+#include "script_list.h"
+#include "script_waypoint.h"
/**
* Creates a list of waypoints of which you are the owner.
diff --git a/src/script/api/script_window.cpp b/src/script/api/script_window.cpp
index 0d20ebf54c..2a5c2eb8a8 100644
--- a/src/script/api/script_window.cpp
+++ b/src/script/api/script_window.cpp
@@ -9,7 +9,7 @@
#include "../../stdafx.h"
#include "script_window.h"
-#include "script_game.hpp"
+#include "script_game.h"
#include "../../window_func.h"
#include "../../window_gui.h"
diff --git a/src/script/api/script_window.h.in b/src/script/api/script_window.h.in
index e91638cee5..65d7122541 100644
--- a/src/script/api/script_window.h.in
+++ b/src/script/api/script_window.h.in
@@ -10,7 +10,7 @@
#ifndef SCRIPT_WINDOW_HPP
#define SCRIPT_WINDOW_HPP
-#include "script_object.hpp"
+#include "script_object.h"
${INCLUDES}
diff --git a/src/script/script_config.cpp b/src/script/script_config.cpp
index d86191b5f7..1297957103 100644
--- a/src/script/script_config.cpp
+++ b/src/script/script_config.cpp
@@ -9,9 +9,9 @@
#include "../stdafx.h"
#include "../settings_type.h"
-#include "../core/random_func.hpp"
-#include "script_info.hpp"
-#include "api/script_object.hpp"
+#include "../core/random_func.h"
+#include "script_info.h"
+#include "api/script_object.h"
#include "../textfile_gui.h"
#include "../string_func.h"
#include
diff --git a/src/script/script_config.hpp b/src/script/script_config.h
similarity index 98%
rename from src/script/script_config.hpp
rename to src/script/script_config.h
index 684555e411..32193288be 100644
--- a/src/script/script_config.hpp
+++ b/src/script/script_config.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 .
*/
-/** @file script_config.hpp ScriptConfig stores the configuration settings of every Script. */
+/** @file script_config.h ScriptConfig stores the configuration settings of every Script. */
#ifndef SCRIPT_CONFIG_HPP
#define SCRIPT_CONFIG_HPP
#include "../company_type.h"
#include "../textfile_gui.h"
-#include "script_instance.hpp"
+#include "script_instance.h"
/** Maximum of 10 digits for MIN / MAX_INT32, 1 for the sign and 1 for '\0'. */
static const int INT32_DIGITS_WITH_SIGN_AND_TERMINATION = 10 + 1 + 1;
diff --git a/src/script/script_fatalerror.hpp b/src/script/script_fatalerror.h
similarity index 94%
rename from src/script/script_fatalerror.hpp
rename to src/script/script_fatalerror.h
index 96c64e0b9d..4a02b54f8a 100644
--- a/src/script/script_fatalerror.hpp
+++ b/src/script/script_fatalerror.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 .
*/
-/** @file script_fatalerror.hpp The definition of Script_FatalError. */
+/** @file script_fatalerror.h The definition of Script_FatalError. */
#ifndef SCRIPT_FATALERROR_HPP
#define SCRIPT_FATALERROR_HPP
diff --git a/src/script/script_gui.cpp b/src/script/script_gui.cpp
index 6808d443c6..a3090fab53 100644
--- a/src/script/script_gui.cpp
+++ b/src/script/script_gui.cpp
@@ -25,17 +25,17 @@
#include "../timer/timer_window.h"
#include "script_gui.h"
-#include "script_log.hpp"
-#include "script_scanner.hpp"
-#include "script_config.hpp"
-#include "../ai/ai.hpp"
-#include "../ai/ai_config.hpp"
-#include "../ai/ai_info.hpp"
-#include "../ai/ai_instance.hpp"
-#include "../game/game.hpp"
-#include "../game/game_config.hpp"
-#include "../game/game_info.hpp"
-#include "../game/game_instance.hpp"
+#include "script_log.h"
+#include "script_scanner.h"
+#include "script_config.h"
+#include "../ai/ai.h"
+#include "../ai/ai_config.h"
+#include "../ai/ai_info.h"
+#include "../ai/ai_instance.h"
+#include "../game/game.h"
+#include "../game/game_config.h"
+#include "../game/game_info.h"
+#include "../game/game_instance.h"
#include "table/strings.h"
#include "../safeguards.h"
diff --git a/src/script/script_gui.h b/src/script/script_gui.h
index 807557ac69..13a0d19364 100644
--- a/src/script/script_gui.h
+++ b/src/script/script_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 .
*/
- /** @file script_gui.hpp %Window for configuring the scripts */
+ /** @file script_gui.h %Window for configuring the scripts */
#ifndef SCRIPT_GUI_HPP
#define SCRIPT_GUI_HPP
diff --git a/src/script/script_info.cpp b/src/script/script_info.cpp
index 5eee02b5c5..195b2fe04d 100644
--- a/src/script/script_info.cpp
+++ b/src/script/script_info.cpp
@@ -10,10 +10,10 @@
#include "../stdafx.h"
#include "../settings_type.h"
-#include "squirrel_helper.hpp"
+#include "squirrel_helper.h"
-#include "script_info.hpp"
-#include "script_scanner.hpp"
+#include "script_info.h"
+#include "script_scanner.h"
#include "../3rdparty/fmt/format.h"
#include "../safeguards.h"
diff --git a/src/script/script_info.hpp b/src/script/script_info.h
similarity index 96%
rename from src/script/script_info.hpp
rename to src/script/script_info.h
index 90a04d13d8..1cde5d801c 100644
--- a/src/script/script_info.hpp
+++ b/src/script/script_info.h
@@ -5,15 +5,15 @@
* 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 .
*/
-/** @file script_info.hpp ScriptInfo keeps track of all information of a script, like Author, Description, ... */
+/** @file script_info.h ScriptInfo keeps track of all information of a script, like Author, Description, ... */
#ifndef SCRIPT_INFO_HPP
#define SCRIPT_INFO_HPP
#include
-#include "../misc/countedptr.hpp"
+#include "../misc/countedptr.h"
-#include "script_config.hpp"
+#include "script_config.h"
/** The maximum number of operations for saving or loading the data of a script. */
static const int MAX_SL_OPS = 100000;
diff --git a/src/script/script_instance.cpp b/src/script/script_instance.cpp
index 1371fbc821..645a046e66 100644
--- a/src/script/script_instance.cpp
+++ b/src/script/script_instance.cpp
@@ -11,24 +11,24 @@
#include "../debug.h"
#include "../saveload/saveload.h"
-#include "../script/squirrel_class.hpp"
-#include "../script/squirrel_std.hpp"
+#include "../script/squirrel_class.h"
+#include "../script/squirrel_std.h"
-#include "script_fatalerror.hpp"
-#include "script_storage.hpp"
-#include "script_info.hpp"
-#include "script_instance.hpp"
+#include "script_fatalerror.h"
+#include "script_storage.h"
+#include "script_info.h"
+#include "script_instance.h"
-#include "api/script_controller.hpp"
-#include "api/script_error.hpp"
-#include "api/script_event.hpp"
-#include "api/script_log.hpp"
+#include "api/script_controller.h"
+#include "api/script_error.h"
+#include "api/script_event.h"
+#include "api/script_log.h"
#include "../company_base.h"
#include "../company_func.h"
#include "../fileio_func.h"
#include "../league_type.h"
-#include "../misc/endian_buffer.hpp"
+#include "../misc/endian_buffer.h"
#include "../safeguards.h"
diff --git a/src/script/script_instance.hpp b/src/script/script_instance.h
similarity index 98%
rename from src/script/script_instance.hpp
rename to src/script/script_instance.h
index 342cb822b6..320af8a7f9 100644
--- a/src/script/script_instance.hpp
+++ b/src/script/script_instance.h
@@ -5,15 +5,15 @@
* 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 .
*/
-/** @file script_instance.hpp The ScriptInstance tracks a script. */
+/** @file script_instance.h The ScriptInstance tracks a script. */
#ifndef SCRIPT_INSTANCE_HPP
#define SCRIPT_INSTANCE_HPP
#include
#include
-#include "script_suspend.hpp"
-#include "script_log_types.hpp"
+#include "script_suspend.h"
+#include "script_log_types.h"
#include "../command_type.h"
#include "../company_type.h"
diff --git a/src/script/script_scanner.cpp b/src/script/script_scanner.cpp
index ff85007ce9..d50a51e23c 100644
--- a/src/script/script_scanner.cpp
+++ b/src/script/script_scanner.cpp
@@ -12,10 +12,10 @@
#include "../string_func.h"
#include "../settings_type.h"
-#include "../script/squirrel.hpp"
-#include "script_scanner.hpp"
-#include "script_info.hpp"
-#include "script_fatalerror.hpp"
+#include "../script/squirrel.h"
+#include "script_scanner.h"
+#include "script_info.h"
+#include "script_fatalerror.h"
#include "../network/network_content.h"
#include "../3rdparty/md5/md5.h"
diff --git a/src/script/script_scanner.hpp b/src/script/script_scanner.h
similarity index 98%
rename from src/script/script_scanner.hpp
rename to src/script/script_scanner.h
index 1f5dca0485..081f73f390 100644
--- a/src/script/script_scanner.hpp
+++ b/src/script/script_scanner.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 .
*/
-/** @file script_scanner.hpp Declarations of the class for the script scanner. */
+/** @file script_scanner.h Declarations of the class for the script scanner. */
#ifndef SCRIPT_SCANNER_HPP
#define SCRIPT_SCANNER_HPP
diff --git a/src/script/script_storage.hpp b/src/script/script_storage.h
similarity index 96%
rename from src/script/script_storage.hpp
rename to src/script/script_storage.h
index 6f856908d5..7732522772 100644
--- a/src/script/script_storage.hpp
+++ b/src/script/script_storage.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 .
*/
-/** @file script_storage.hpp Defines ScriptStorage and includes all files required for it. */
+/** @file script_storage.h Defines ScriptStorage and includes all files required for it. */
#ifndef SCRIPT_STORAGE_HPP
#define SCRIPT_STORAGE_HPP
@@ -17,7 +17,7 @@
#include "../goal_type.h"
#include "../story_type.h"
-#include "script_log_types.hpp"
+#include "script_log_types.h"
#include "table/strings.h"
diff --git a/src/script/script_suspend.hpp b/src/script/script_suspend.h
similarity index 95%
rename from src/script/script_suspend.hpp
rename to src/script/script_suspend.h
index c8a4501f30..596198bb50 100644
--- a/src/script/script_suspend.hpp
+++ b/src/script/script_suspend.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 .
*/
-/** @file script_suspend.hpp The Script_Suspend tracks the suspension of a script. */
+/** @file script_suspend.h The Script_Suspend tracks the suspension of a script. */
#ifndef SCRIPT_SUSPEND_HPP
#define SCRIPT_SUSPEND_HPP
diff --git a/src/script/squirrel.cpp b/src/script/squirrel.cpp
index 2c767b9abb..ad7bf7f1bb 100644
--- a/src/script/squirrel.cpp
+++ b/src/script/squirrel.cpp
@@ -9,15 +9,15 @@
#include "../stdafx.h"
#include "../debug.h"
-#include "squirrel_std.hpp"
+#include "squirrel_std.h"
#include "../fileio_func.h"
#include "../string_func.h"
-#include "script_fatalerror.hpp"
+#include "script_fatalerror.h"
#include "../settings_type.h"
#include
#include <../squirrel/sqpcheader.h>
#include <../squirrel/sqvm.h>
-#include "../core/alloc_func.hpp"
+#include "../core/alloc_func.h"
/**
* In the memory allocator for Squirrel we want to directly use malloc/realloc, so when the OS
diff --git a/src/script/squirrel.hpp b/src/script/squirrel.h
similarity index 99%
rename from src/script/squirrel.hpp
rename to src/script/squirrel.h
index 85b0bd1cf6..957b74f807 100644
--- a/src/script/squirrel.hpp
+++ b/src/script/squirrel.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 .
*/
-/** @file squirrel.hpp defines the Squirrel class */
+/** @file squirrel.h defines the Squirrel class */
#ifndef SQUIRREL_HPP
#define SQUIRREL_HPP
diff --git a/src/script/squirrel_class.hpp b/src/script/squirrel_class.h
similarity index 97%
rename from src/script/squirrel_class.hpp
rename to src/script/squirrel_class.h
index 8794e2441a..54217cc248 100644
--- a/src/script/squirrel_class.hpp
+++ b/src/script/squirrel_class.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 .
*/
-/** @file squirrel_class.hpp Defines templates for converting C++ classes to Squirrel classes */
+/** @file squirrel_class.h Defines templates for converting C++ classes to Squirrel classes */
#ifndef SQUIRREL_CLASS_HPP
#define SQUIRREL_CLASS_HPP
-#include "squirrel_helper.hpp"
+#include "squirrel_helper.h"
/**
* The template to define classes in Squirrel. It takes care of the creation
diff --git a/src/script/squirrel_helper.hpp b/src/script/squirrel_helper.h
similarity index 98%
rename from src/script/squirrel_helper.hpp
rename to src/script/squirrel_helper.h
index 3adf637500..5e6ff1650e 100644
--- a/src/script/squirrel_helper.hpp
+++ b/src/script/squirrel_helper.h
@@ -5,17 +5,17 @@
* 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 .
*/
-/** @file squirrel_helper.hpp declarations and parts of the implementation of the class for convert code */
+/** @file squirrel_helper.h declarations and parts of the implementation of the class for convert code */
#ifndef SQUIRREL_HELPER_HPP
#define SQUIRREL_HELPER_HPP
-#include "squirrel.hpp"
-#include "../core/alloc_func.hpp"
+#include "squirrel.h"
+#include "../core/alloc_func.h"
#include "../economy_type.h"
#include "../string_func.h"
#include "../tile_type.h"
-#include "squirrel_helper_type.hpp"
+#include "squirrel_helper_type.h"
template const char *GetClassName();
diff --git a/src/script/squirrel_helper_type.hpp b/src/script/squirrel_helper_type.h
similarity index 88%
rename from src/script/squirrel_helper_type.hpp
rename to src/script/squirrel_helper_type.h
index 9fa6a0aa6e..39619b4efc 100644
--- a/src/script/squirrel_helper_type.hpp
+++ b/src/script/squirrel_helper_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 .
*/
-/** @file squirrel_helper_type.hpp Helper structs for converting Squirrel data structures to C++. */
+/** @file squirrel_helper_type.h Helper structs for converting Squirrel data structures to C++. */
#ifndef SQUIRREL_HELPER_TYPE_HPP
#define SQUIRREL_HELPER_TYPE_HPP
diff --git a/src/script/squirrel_std.cpp b/src/script/squirrel_std.cpp
index abcac023ec..483a02c3b8 100644
--- a/src/script/squirrel_std.cpp
+++ b/src/script/squirrel_std.cpp
@@ -11,8 +11,8 @@
#include
#include
#include "../debug.h"
-#include "squirrel_std.hpp"
-#include "../core/math_func.hpp"
+#include "squirrel_std.h"
+#include "../core/math_func.h"
#include "../string_func.h"
#include "../safeguards.h"
diff --git a/src/script/squirrel_std.hpp b/src/script/squirrel_std.h
similarity index 95%
rename from src/script/squirrel_std.hpp
rename to src/script/squirrel_std.h
index 5e977045f8..775cb02ea9 100644
--- a/src/script/squirrel_std.hpp
+++ b/src/script/squirrel_std.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 .
*/
-/** @file squirrel_std.hpp defines the Squirrel Standard Function class */
+/** @file squirrel_std.h defines the Squirrel Standard Function class */
#ifndef SQUIRREL_STD_HPP
#define SQUIRREL_STD_HPP
-#include "squirrel.hpp"
+#include "squirrel.h"
#if defined(__APPLE__)
/* Which idiotic system makes 'require' a macro? :s Oh well.... */
diff --git a/src/settings.cpp b/src/settings.cpp
index 0dd0a304b1..9b212446e6 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -39,8 +39,8 @@
#include "gamelog.h"
#include "settings_func.h"
#include "ini_type.h"
-#include "ai/ai_config.hpp"
-#include "game/game_config.hpp"
+#include "ai/ai_config.h"
+#include "game/game_config.h"
#include "newgrf_config.h"
#include "base_media_base.h"
#include "fios.h"
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
index 15519b62f5..469efc5ecf 100644
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -27,9 +27,9 @@
#include "company_base.h"
#include "company_func.h"
#include "viewport_func.h"
-#include "core/geometry_func.hpp"
-#include "ai/ai.hpp"
-#include "blitter/factory.hpp"
+#include "core/geometry_func.h"
+#include "ai/ai.h"
+#include "blitter/factory.h"
#include "language.h"
#include "textfile_gui.h"
#include "stringfilter_type.h"
@@ -37,15 +37,15 @@
#include "fontcache.h"
#include "zoom_func.h"
#include "rev.h"
-#include "video/video_driver.hpp"
-#include "music/music_driver.hpp"
+#include "video/video_driver.h"
+#include "music/music_driver.h"
#include "gui.h"
#include "mixer.h"
#include "newgrf_config.h"
#include "network/core/config.h"
#include "network/network_gui.h"
#include "network/network_survey.h"
-#include "video/video_driver.hpp"
+#include "video/video_driver.h"
#include "safeguards.h"
diff --git a/src/settings_table.cpp b/src/settings_table.cpp
index d4c41b59f7..67b4089807 100644
--- a/src/settings_table.cpp
+++ b/src/settings_table.cpp
@@ -31,14 +31,14 @@
#include "elrail_func.h"
#include "error.h"
#include "town.h"
-#include "video/video_driver.hpp"
-#include "sound/sound_driver.hpp"
-#include "music/music_driver.hpp"
-#include "blitter/factory.hpp"
+#include "video/video_driver.h"
+#include "sound/sound_driver.h"
+#include "music/music_driver.h"
+#include "blitter/factory.h"
#include "base_media_base.h"
-#include "ai/ai_config.hpp"
-#include "ai/ai.hpp"
-#include "game/game_config.hpp"
+#include "ai/ai_config.h"
+#include "ai/ai.h"
+#include "game/game_config.h"
#include "ship.h"
#include "smallmap_gui.h"
#include "roadveh.h"
diff --git a/src/settingsgen/settingsgen.cpp b/src/settingsgen/settingsgen.cpp
index 869ec5bb30..efc8308652 100644
--- a/src/settingsgen/settingsgen.cpp
+++ b/src/settingsgen/settingsgen.cpp
@@ -12,7 +12,7 @@
#include "../strings_type.h"
#include "../misc/getoptdata.h"
#include "../ini_type.h"
-#include "../core/mem_func.hpp"
+#include "../core/mem_func.h"
#include "../error_func.h"
#if !defined(_WIN32) || defined(__CYGWIN__)
diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp
index 2e0186d714..45e016cafb 100644
--- a/src/ship_cmd.cpp
+++ b/src/ship_cmd.cpp
@@ -25,8 +25,8 @@
#include "timer/timer_game_calendar.h"
#include "vehicle_func.h"
#include "sound_func.h"
-#include "ai/ai.hpp"
-#include "game/game.hpp"
+#include "ai/ai.h"
+#include "game/game.h"
#include "engine_base.h"
#include "company_base.h"
#include "tunnelbridge_map.h"
diff --git a/src/signal_type.h b/src/signal_type.h
index 294790fae7..839ac7528b 100644
--- a/src/signal_type.h
+++ b/src/signal_type.h
@@ -10,7 +10,7 @@
#ifndef SIGNAL_TYPE_H
#define SIGNAL_TYPE_H
-#include "core/enum_type.hpp"
+#include "core/enum_type.h"
/** Variant of the signal, i.e. how does the signal look? */
enum SignalVariant : byte {
diff --git a/src/signs.cpp b/src/signs.cpp
index 0f1d7a78f0..21ff2b1d31 100644
--- a/src/signs.cpp
+++ b/src/signs.cpp
@@ -13,7 +13,7 @@
#include "signs_base.h"
#include "signs_func.h"
#include "strings_func.h"
-#include "core/pool_func.hpp"
+#include "core/pool_func.h"
#include "viewport_kdtree.h"
#include "table/strings.h"
diff --git a/src/signs_base.h b/src/signs_base.h
index 718ffac320..c4f96e2680 100644
--- a/src/signs_base.h
+++ b/src/signs_base.h
@@ -12,7 +12,7 @@
#include "signs_type.h"
#include "viewport_type.h"
-#include "core/pool_type.hpp"
+#include "core/pool_type.h"
#include "company_type.h"
typedef Pool SignPool;
diff --git a/src/signs_gui.cpp b/src/signs_gui.cpp
index 848cb8e529..032a54edc7 100644
--- a/src/signs_gui.cpp
+++ b/src/signs_gui.cpp
@@ -22,7 +22,7 @@
#include "sortlist_type.h"
#include "stringfilter_type.h"
#include "string_func.h"
-#include "core/geometry_func.hpp"
+#include "core/geometry_func.h"
#include "hotkeys.h"
#include "transparency.h"
#include "gui.h"
diff --git a/src/slope_func.h b/src/slope_func.h
index 2d78faea3b..3504ae2d4d 100644
--- a/src/slope_func.h
+++ b/src/slope_func.h
@@ -10,7 +10,7 @@
#ifndef SLOPE_FUNC_H
#define SLOPE_FUNC_H
-#include "core/math_func.hpp"
+#include "core/math_func.h"
#include "slope_type.h"
#include "direction_type.h"
#include "tile_type.h"
diff --git a/src/slope_type.h b/src/slope_type.h
index 1870db2272..279cc0aba9 100644
--- a/src/slope_type.h
+++ b/src/slope_type.h
@@ -14,7 +14,7 @@
#ifndef SLOPE_TYPE_H
#define SLOPE_TYPE_H
-#include "core/enum_type.hpp"
+#include "core/enum_type.h"
/**
* Enumeration of tile corners
diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp
index 3df7ab6e14..83ae636b92 100644
--- a/src/smallmap_gui.cpp
+++ b/src/smallmap_gui.cpp
@@ -8,7 +8,7 @@
/** @file smallmap_gui.cpp GUI that shows a small map of the world with metadata like owner or height. */
#include "stdafx.h"
-#include "core/backup_type.hpp"
+#include "core/backup_type.h"
#include "clear_map.h"
#include "industry.h"
#include "station_map.h"
@@ -17,14 +17,14 @@
#include "viewport_func.h"
#include "town.h"
#include "tunnelbridge_map.h"
-#include "core/endian_func.hpp"
+#include "core/endian_func.h"
#include "vehicle_base.h"
#include "sound_func.h"
#include "window_func.h"
#include "company_base.h"
#include "zoom_func.h"
#include "strings_func.h"
-#include "blitter/factory.hpp"
+#include "blitter/factory.h"
#include "linkgraph/linkgraph_gui.h"
#include "widgets/smallmap_widget.h"
#include "timer/timer.h"
diff --git a/src/smallmap_gui.h b/src/smallmap_gui.h
index 8eb6906e31..eec7672952 100644
--- a/src/smallmap_gui.h
+++ b/src/smallmap_gui.h
@@ -10,7 +10,7 @@
#ifndef SMALLMAP_GUI_H
#define SMALLMAP_GUI_H
-#include "core/geometry_type.hpp"
+#include "core/geometry_type.h"
#include "station_type.h"
#include "tile_type.h"
#include "window_type.h"
diff --git a/src/sortlist_type.h b/src/sortlist_type.h
index e0fd01c740..8393c6b1bf 100644
--- a/src/sortlist_type.h
+++ b/src/sortlist_type.h
@@ -10,9 +10,9 @@
#ifndef SORTLIST_TYPE_H
#define SORTLIST_TYPE_H
-#include "core/enum_type.hpp"
-#include "core/bitmath_func.hpp"
-#include "core/mem_func.hpp"
+#include "core/enum_type.h"
+#include "core/bitmath_func.h"
+#include "core/mem_func.h"
#include "timer/timer_game_tick.h"
/** Flags of the sort list. */
diff --git a/src/sound/CMakeLists.txt b/src/sound/CMakeLists.txt
index bff33deda3..de771e6d54 100644
--- a/src/sound/CMakeLists.txt
+++ b/src/sound/CMakeLists.txt
@@ -37,7 +37,7 @@ if(NOT OPTION_DEDICATED)
endif()
add_files(
- sound_driver.hpp
+ sound_driver.h
null_s.cpp
null_s.h
)
diff --git a/src/sound/allegro_s.h b/src/sound/allegro_s.h
index d2ef08366c..891136cce7 100644
--- a/src/sound/allegro_s.h
+++ b/src/sound/allegro_s.h
@@ -10,7 +10,7 @@
#ifndef SOUND_ALLEGRO_H
#define SOUND_ALLEGRO_H
-#include "sound_driver.hpp"
+#include "sound_driver.h"
/** Implementation of the allegro sound driver. */
class SoundDriver_Allegro : public SoundDriver {
diff --git a/src/sound/cocoa_s.cpp b/src/sound/cocoa_s.cpp
index f059384181..b668a144d7 100644
--- a/src/sound/cocoa_s.cpp
+++ b/src/sound/cocoa_s.cpp
@@ -20,7 +20,7 @@
#include "../debug.h"
#include "../driver.h"
#include "../mixer.h"
-#include "../core/endian_type.hpp"
+#include "../core/endian_type.h"
#include "cocoa_s.h"
#define Rect OTTDRect
diff --git a/src/sound/cocoa_s.h b/src/sound/cocoa_s.h
index f1e623ce5a..ae0043b85c 100644
--- a/src/sound/cocoa_s.h
+++ b/src/sound/cocoa_s.h
@@ -10,7 +10,7 @@
#ifndef SOUND_COCOA_H
#define SOUND_COCOA_H
-#include "sound_driver.hpp"
+#include "sound_driver.h"
class SoundDriver_Cocoa : public SoundDriver {
public:
diff --git a/src/sound/null_s.h b/src/sound/null_s.h
index ca699da236..da53894709 100644
--- a/src/sound/null_s.h
+++ b/src/sound/null_s.h
@@ -10,7 +10,7 @@
#ifndef SOUND_NULL_H
#define SOUND_NULL_H
-#include "sound_driver.hpp"
+#include "sound_driver.h"
/** Implementation of the null sound driver. */
class SoundDriver_Null : public SoundDriver {
diff --git a/src/sound/sdl_s.h b/src/sound/sdl_s.h
index fbe7d77d84..9d007f7bad 100644
--- a/src/sound/sdl_s.h
+++ b/src/sound/sdl_s.h
@@ -10,7 +10,7 @@
#ifndef SOUND_SDL_H
#define SOUND_SDL_H
-#include "sound_driver.hpp"
+#include "sound_driver.h"
/** Implementation of the SDL sound driver. */
class SoundDriver_SDL : public SoundDriver {
diff --git a/src/sound/sound_driver.hpp b/src/sound/sound_driver.h
similarity index 96%
rename from src/sound/sound_driver.hpp
rename to src/sound/sound_driver.h
index 300433e5ae..4d15a4b60d 100644
--- a/src/sound/sound_driver.hpp
+++ b/src/sound/sound_driver.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 .
*/
-/** @file sound_driver.hpp Base for all sound drivers. */
+/** @file sound_driver.h Base for all sound drivers. */
#ifndef SOUND_SOUND_DRIVER_HPP
#define SOUND_SOUND_DRIVER_HPP
diff --git a/src/sound/win32_s.cpp b/src/sound/win32_s.cpp
index f50346e88c..40ddcbef8c 100644
--- a/src/sound/win32_s.cpp
+++ b/src/sound/win32_s.cpp
@@ -11,9 +11,9 @@
#include "../openttd.h"
#include "../driver.h"
#include "../mixer.h"
-#include "../core/alloc_func.hpp"
-#include "../core/bitmath_func.hpp"
-#include "../core/math_func.hpp"
+#include "../core/alloc_func.h"
+#include "../core/bitmath_func.h"
+#include "../core/math_func.h"
#include "win32_s.h"
#include
#include
diff --git a/src/sound/win32_s.h b/src/sound/win32_s.h
index 5722b2089d..9a21f9effe 100644
--- a/src/sound/win32_s.h
+++ b/src/sound/win32_s.h
@@ -10,7 +10,7 @@
#ifndef SOUND_WIN32_H
#define SOUND_WIN32_H
-#include "sound_driver.hpp"
+#include "sound_driver.h"
/** Implementation of the sound driver for Windows. */
class SoundDriver_Win32 : public SoundDriver {
diff --git a/src/sound/xaudio2_s.cpp b/src/sound/xaudio2_s.cpp
index b4d08c4900..dfa35701be 100644
--- a/src/sound/xaudio2_s.cpp
+++ b/src/sound/xaudio2_s.cpp
@@ -12,9 +12,9 @@
#include "../driver.h"
#include "../mixer.h"
#include "../debug.h"
-#include "../core/alloc_func.hpp"
-#include "../core/bitmath_func.hpp"
-#include "../core/math_func.hpp"
+#include "../core/alloc_func.h"
+#include "../core/bitmath_func.h"
+#include "../core/math_func.h"
// Windows 8 SDK required for XAudio2
#undef NTDDI_VERSION
diff --git a/src/sound/xaudio2_s.h b/src/sound/xaudio2_s.h
index 621655d8d5..296eb778cc 100644
--- a/src/sound/xaudio2_s.h
+++ b/src/sound/xaudio2_s.h
@@ -10,7 +10,7 @@
#ifndef SOUND_XAUDIO2_H
#define SOUND_XAUDIO2_H
-#include "sound_driver.hpp"
+#include "sound_driver.h"
/** Implementation of the XAudio2 sound driver. */
class SoundDriver_XAudio2 : public SoundDriver {
diff --git a/src/spritecache.cpp b/src/spritecache.cpp
index ae97b53fcc..f0b1d443b1 100644
--- a/src/spritecache.cpp
+++ b/src/spritecache.cpp
@@ -9,16 +9,16 @@
#include "stdafx.h"
#include "random_access_file_type.h"
-#include "spriteloader/grf.hpp"
+#include "spriteloader/grf.h"
#include "gfx_func.h"
#include "error.h"
#include "error_func.h"
#include "zoom_func.h"
#include "settings_type.h"
-#include "blitter/factory.hpp"
-#include "core/math_func.hpp"
-#include "core/mem_func.hpp"
-#include "video/video_driver.hpp"
+#include "blitter/factory.h"
+#include "core/math_func.h"
+#include "core/mem_func.h"
+#include "video/video_driver.h"
#include "spritecache.h"
#include "spritecache_internal.h"
diff --git a/src/spritecache.h b/src/spritecache.h
index 10a9df4149..3205838ec1 100644
--- a/src/spritecache.h
+++ b/src/spritecache.h
@@ -11,7 +11,7 @@
#define SPRITECACHE_H
#include "gfx_type.h"
-#include "spriteloader/spriteloader.hpp"
+#include "spriteloader/spriteloader.h"
/** Data structure describing a sprite. */
struct Sprite {
diff --git a/src/spritecache_internal.h b/src/spritecache_internal.h
index 5acf7b8937..8dd63edb03 100644
--- a/src/spritecache_internal.h
+++ b/src/spritecache_internal.h
@@ -12,9 +12,9 @@
#include "stdafx.h"
-#include "core/math_func.hpp"
+#include "core/math_func.h"
#include "gfx_type.h"
-#include "spriteloader/spriteloader.hpp"
+#include "spriteloader/spriteloader.h"
#include "table/sprites.h"
diff --git a/src/spriteloader/CMakeLists.txt b/src/spriteloader/CMakeLists.txt
index 804bb1a2ee..785db3c791 100644
--- a/src/spriteloader/CMakeLists.txt
+++ b/src/spriteloader/CMakeLists.txt
@@ -1,7 +1,7 @@
add_files(
grf.cpp
- grf.hpp
+ grf.h
sprite_file.cpp
- sprite_file_type.hpp
- spriteloader.hpp
+ sprite_file_type.h
+ spriteloader.h
)
diff --git a/src/spriteloader/grf.cpp b/src/spriteloader/grf.cpp
index f88182935a..773ca2b82d 100644
--- a/src/spriteloader/grf.cpp
+++ b/src/spriteloader/grf.cpp
@@ -14,11 +14,11 @@
#include "../strings_func.h"
#include "table/strings.h"
#include "../error.h"
-#include "../core/math_func.hpp"
-#include "../core/alloc_type.hpp"
-#include "../core/bitmath_func.hpp"
+#include "../core/math_func.h"
+#include "../core/alloc_type.h"
+#include "../core/bitmath_func.h"
#include "../spritecache.h"
-#include "grf.hpp"
+#include "grf.h"
#include "../safeguards.h"
diff --git a/src/spriteloader/grf.hpp b/src/spriteloader/grf.h
similarity index 92%
rename from src/spriteloader/grf.hpp
rename to src/spriteloader/grf.h
index 338714401b..4010b5df07 100644
--- a/src/spriteloader/grf.hpp
+++ b/src/spriteloader/grf.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 .
*/
-/** @file grf.hpp Base for reading sprites from (New)GRFs. */
+/** @file grf.h Base for reading sprites from (New)GRFs. */
#ifndef SPRITELOADER_GRF_HPP
#define SPRITELOADER_GRF_HPP
-#include "spriteloader.hpp"
+#include "spriteloader.h"
/** Sprite loader for graphics coming from a (New)GRF. */
class SpriteLoaderGrf : public SpriteLoader {
diff --git a/src/spriteloader/sprite_file.cpp b/src/spriteloader/sprite_file.cpp
index be7160628b..cdfae02d51 100644
--- a/src/spriteloader/sprite_file.cpp
+++ b/src/spriteloader/sprite_file.cpp
@@ -8,7 +8,7 @@
/** @file sprite_file.cpp Implementation of logic specific to the SpriteFile class. */
#include "../stdafx.h"
-#include "sprite_file_type.hpp"
+#include "sprite_file_type.h"
/** Signature of a container version 2 GRF. */
extern const byte _grf_cont_v2_sig[8] = {'G', 'R', 'F', 0x82, 0x0D, 0x0A, 0x1A, 0x0A};
diff --git a/src/spriteloader/sprite_file_type.hpp b/src/spriteloader/sprite_file_type.h
similarity index 95%
rename from src/spriteloader/sprite_file_type.hpp
rename to src/spriteloader/sprite_file_type.h
index b7492afade..7f7dffb1a0 100644
--- a/src/spriteloader/sprite_file_type.hpp
+++ b/src/spriteloader/sprite_file_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 .
*/
-/** @file sprite_file_type.hpp Random Access File specialised for accessing sprites. */
+/** @file sprite_file_type.h Random Access File specialised for accessing sprites. */
#ifndef SPRITE_FILE_TYPE_HPP
#define SPRITE_FILE_TYPE_HPP
diff --git a/src/spriteloader/spriteloader.hpp b/src/spriteloader/spriteloader.h
similarity index 96%
rename from src/spriteloader/spriteloader.hpp
rename to src/spriteloader/spriteloader.h
index a835fbc5bb..6a07f9c65a 100644
--- a/src/spriteloader/spriteloader.hpp
+++ b/src/spriteloader/spriteloader.h
@@ -5,15 +5,15 @@
* 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 .
*/
-/** @file spriteloader.hpp Base for loading sprites. */
+/** @file spriteloader.h Base for loading sprites. */
#ifndef SPRITELOADER_HPP
#define SPRITELOADER_HPP
-#include "../core/alloc_type.hpp"
-#include "../core/enum_type.hpp"
+#include "../core/alloc_type.h"
+#include "../core/enum_type.h"
#include "../gfx_type.h"
-#include "sprite_file_type.hpp"
+#include "sprite_file_type.h"
struct Sprite;
typedef void *AllocatorProc(size_t size);
diff --git a/src/station.cpp b/src/station.cpp
index 1338077d57..fa95aaac16 100644
--- a/src/station.cpp
+++ b/src/station.cpp
@@ -17,13 +17,13 @@
#include "news_func.h"
#include "aircraft.h"
#include "vehiclelist.h"
-#include "core/pool_func.hpp"
+#include "core/pool_func.h"
#include "station_base.h"
#include "station_kdtree.h"
#include "roadstop_base.h"
#include "industry.h"
#include "town.h"
-#include "core/random_func.hpp"
+#include "core/random_func.h"
#include "linkgraph/linkgraph.h"
#include "linkgraph/linkgraphschedule.h"
diff --git a/src/station_base.h b/src/station_base.h
index 86b43fbf14..174ed651b1 100644
--- a/src/station_base.h
+++ b/src/station_base.h
@@ -10,7 +10,7 @@
#ifndef STATION_BASE_H
#define STATION_BASE_H
-#include "core/random_func.hpp"
+#include "core/random_func.h"
#include "base_station_base.h"
#include "newgrf_airport.h"
#include "cargopacket.h"
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index ea2553bf77..56eb039951 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -44,8 +44,8 @@
#include "waypoint_func.h"
#include "pbs.h"
#include "debug.h"
-#include "core/random_func.hpp"
-#include "core/container_func.hpp"
+#include "core/random_func.h"
+#include "core/container_func.h"
#include "company_base.h"
#include "table/airporttile_ids.h"
#include "newgrf_airporttiles.h"
diff --git a/src/station_gui.cpp b/src/station_gui.cpp
index 2726cc97cd..273c5b17b6 100644
--- a/src/station_gui.cpp
+++ b/src/station_gui.cpp
@@ -26,7 +26,7 @@
#include "tilehighlight_func.h"
#include "company_base.h"
#include "sortlist_type.h"
-#include "core/geometry_func.hpp"
+#include "core/geometry_func.h"
#include "vehiclelist.h"
#include "town.h"
#include "linkgraph/linkgraph.h"
diff --git a/src/station_kdtree.h b/src/station_kdtree.h
index 11dd8b0679..12e41b6efa 100644
--- a/src/station_kdtree.h
+++ b/src/station_kdtree.h
@@ -10,8 +10,8 @@
#ifndef STATION_KDTREE_H
#define STATION_KDTREE_H
-#include "core/kdtree.hpp"
-#include "core/math_func.hpp"
+#include "core/kdtree.h"
+#include "core/math_func.h"
#include "station_base.h"
#include "map_func.h"
diff --git a/src/station_type.h b/src/station_type.h
index 345e900536..1435a36dba 100644
--- a/src/station_type.h
+++ b/src/station_type.h
@@ -10,7 +10,7 @@
#ifndef STATION_TYPE_H
#define STATION_TYPE_H
-#include "core/smallstack_type.hpp"
+#include "core/smallstack_type.h"
#include "tilearea_type.h"
typedef uint16_t StationID;
diff --git a/src/statusbar_gui.cpp b/src/statusbar_gui.cpp
index 856b4cf077..fe22340ba8 100644
--- a/src/statusbar_gui.cpp
+++ b/src/statusbar_gui.cpp
@@ -8,7 +8,7 @@
/** @file statusbar_gui.cpp The GUI for the bottom status bar. */
#include "stdafx.h"
-#include "core/backup_type.hpp"
+#include "core/backup_type.h"
#include "gfx_func.h"
#include "news_func.h"
#include "company_func.h"
@@ -23,7 +23,7 @@
#include "window_func.h"
#include "statusbar_gui.h"
#include "toolbar_gui.h"
-#include "core/geometry_func.hpp"
+#include "core/geometry_func.h"
#include "zoom_func.h"
#include "timer/timer.h"
#include "timer/timer_game_calendar.h"
diff --git a/src/story.cpp b/src/story.cpp
index ad732f9d37..b54b847808 100644
--- a/src/story.cpp
+++ b/src/story.cpp
@@ -9,7 +9,7 @@
#include "stdafx.h"
#include "story_base.h"
-#include "core/pool_func.hpp"
+#include "core/pool_func.h"
#include "command_func.h"
#include "company_base.h"
#include "company_func.h"
@@ -21,9 +21,9 @@
#include "window_func.h"
#include "gui.h"
#include "vehicle_base.h"
-#include "game/game.hpp"
-#include "script/api/script_story_page.hpp"
-#include "script/api/script_event_types.hpp"
+#include "game/game.h"
+#include "script/api/script_story_page.h"
+#include "script/api/script_event_types.h"
#include "story_cmd.h"
#include "safeguards.h"
diff --git a/src/story_base.h b/src/story_base.h
index f7da7c9930..5ec2569b67 100644
--- a/src/story_base.h
+++ b/src/story_base.h
@@ -15,7 +15,7 @@
#include "timer/timer_game_calendar.h"
#include "gfx_type.h"
#include "vehicle_type.h"
-#include "core/pool_type.hpp"
+#include "core/pool_type.h"
typedef Pool StoryPageElementPool;
typedef Pool StoryPagePool;
diff --git a/src/story_gui.cpp b/src/story_gui.cpp
index c986042cb7..6da73c2180 100644
--- a/src/story_gui.cpp
+++ b/src/story_gui.cpp
@@ -12,7 +12,7 @@
#include "strings_func.h"
#include "gui.h"
#include "story_base.h"
-#include "core/geometry_func.hpp"
+#include "core/geometry_func.h"
#include "company_func.h"
#include "command_func.h"
#include "widgets/dropdown_type.h"
diff --git a/src/story_type.h b/src/story_type.h
index 5df99c34c7..f791d94ec3 100644
--- a/src/story_type.h
+++ b/src/story_type.h
@@ -10,7 +10,7 @@
#ifndef STORY_TYPE_H
#define STORY_TYPE_H
-#include "core/enum_type.hpp"
+#include "core/enum_type.h"
typedef uint16_t StoryPageElementID; ///< ID of a story page element
typedef uint16_t StoryPageID; ///< ID of a story page
diff --git a/src/strgen/strgen.cpp b/src/strgen/strgen.cpp
index 49ca24087e..cfe8e42647 100644
--- a/src/strgen/strgen.cpp
+++ b/src/strgen/strgen.cpp
@@ -8,8 +8,8 @@
/** @file strgen.cpp Tool to create computer readable (stand-alone) translation files. */
#include "../stdafx.h"
-#include "../core/endian_func.hpp"
-#include "../core/mem_func.hpp"
+#include "../core/endian_func.h"
+#include "../core/mem_func.h"
#include "../error_func.h"
#include "../string_func.h"
#include "../strings_type.h"
diff --git a/src/strgen/strgen_base.cpp b/src/strgen/strgen_base.cpp
index 8edcfb3d52..21059419c4 100644
--- a/src/strgen/strgen_base.cpp
+++ b/src/strgen/strgen_base.cpp
@@ -8,9 +8,9 @@
/** @file strgen_base.cpp Tool to create computer readable (stand-alone) translation files. */
#include "../stdafx.h"
-#include "../core/alloc_func.hpp"
-#include "../core/endian_func.hpp"
-#include "../core/mem_func.hpp"
+#include "../core/alloc_func.h"
+#include "../core/endian_func.h"
+#include "../core/mem_func.h"
#include "../error_func.h"
#include "../string_func.h"
#include "../table/control_codes.h"
diff --git a/src/string.cpp b/src/string.cpp
index 3bc3e223f1..08c7fcfdba 100644
--- a/src/string.cpp
+++ b/src/string.cpp
@@ -9,8 +9,8 @@
#include "stdafx.h"
#include "debug.h"
-#include "core/alloc_func.hpp"
-#include "core/math_func.hpp"
+#include "core/alloc_func.h"
+#include "core/math_func.h"
#include "error_func.h"
#include "string_func.h"
#include "string_base.h"
diff --git a/src/string_func.h b/src/string_func.h
index 470a8eca3d..a595ca8312 100644
--- a/src/string_func.h
+++ b/src/string_func.h
@@ -14,7 +14,7 @@
#include
-#include "core/bitmath_func.hpp"
+#include "core/bitmath_func.h"
#include "string_type.h"
char *strecpy(char *dst, const char *src, const char *last) NOACCESS(3);
diff --git a/src/string_type.h b/src/string_type.h
index df330fc1fc..b05270907f 100644
--- a/src/string_type.h
+++ b/src/string_type.h
@@ -10,7 +10,7 @@
#ifndef STRING_TYPE_H
#define STRING_TYPE_H
-#include "core/enum_type.hpp"
+#include "core/enum_type.h"
/** A non-breaking space. */
#define NBSP "\u00a0"
diff --git a/src/stringfilter.cpp b/src/stringfilter.cpp
index 16800c2440..f075d17ae4 100644
--- a/src/stringfilter.cpp
+++ b/src/stringfilter.cpp
@@ -8,7 +8,7 @@
/** @file stringfilter.cpp Searching and filtering using a stringterm. */
#include "stdafx.h"
-#include "core/alloc_func.hpp"
+#include "core/alloc_func.h"
#include "string_func.h"
#include "strings_func.h"
#include "stringfilter_type.h"
diff --git a/src/strings.cpp b/src/strings.cpp
index ba12476434..6037ffb127 100644
--- a/src/strings.cpp
+++ b/src/strings.cpp
@@ -22,7 +22,7 @@
#include "error_func.h"
#include "strings_func.h"
#include "rev.h"
-#include "core/endian_func.hpp"
+#include "core/endian_func.h"
#include "timer/timer_game_calendar.h"
#include "vehicle_base.h"
#include "engine_base.h"
@@ -33,10 +33,10 @@
#include "smallmap_gui.h"
#include "window_func.h"
#include "debug.h"
-#include "game/game_text.hpp"
+#include "game/game_text.h"
#include "network/network_content_gui.h"
#include "newgrf_engine.h"
-#include "core/backup_type.hpp"
+#include "core/backup_type.h"
#include
#include
diff --git a/src/strings_func.h b/src/strings_func.h
index 21a77705d8..d6e2b0c15b 100644
--- a/src/strings_func.h
+++ b/src/strings_func.h
@@ -13,8 +13,8 @@
#include "strings_type.h"
#include "string_type.h"
#include "gfx_type.h"
-#include "core/bitmath_func.hpp"
-#include "core/strong_typedef_type.hpp"
+#include "core/bitmath_func.h"
+#include "core/strong_typedef_type.h"
#include "vehicle_type.h"
/**
diff --git a/src/subsidy.cpp b/src/subsidy.cpp
index 620a5c30be..c3c2634555 100644
--- a/src/subsidy.cpp
+++ b/src/subsidy.cpp
@@ -12,16 +12,16 @@
#include "industry.h"
#include "town.h"
#include "news_func.h"
-#include "ai/ai.hpp"
+#include "ai/ai.h"
#include "station_base.h"
#include "strings_func.h"
#include "window_func.h"
#include "subsidy_base.h"
#include "subsidy_func.h"
-#include "core/pool_func.hpp"
-#include "core/random_func.hpp"
-#include "core/container_func.hpp"
-#include "game/game.hpp"
+#include "core/pool_func.h"
+#include "core/random_func.h"
+#include "core/container_func.h"
+#include "game/game.h"
#include "command_func.h"
#include "string_func.h"
#include "tile_cmd.h"
diff --git a/src/subsidy_base.h b/src/subsidy_base.h
index 77f8730f4e..9e47d4d4e1 100644
--- a/src/subsidy_base.h
+++ b/src/subsidy_base.h
@@ -13,7 +13,7 @@
#include "cargo_type.h"
#include "company_type.h"
#include "subsidy_type.h"
-#include "core/pool_type.hpp"
+#include "core/pool_type.h"
typedef Pool SubsidyPool;
extern SubsidyPool _subsidy_pool;
diff --git a/src/subsidy_func.h b/src/subsidy_func.h
index 89bf0f1fe2..9a600f7669 100644
--- a/src/subsidy_func.h
+++ b/src/subsidy_func.h
@@ -10,7 +10,7 @@
#ifndef SUBSIDY_FUNC_H
#define SUBSIDY_FUNC_H
-#include "core/geometry_type.hpp"
+#include "core/geometry_type.h"
#include "station_type.h"
#include "company_type.h"
#include "cargo_type.h"
diff --git a/src/subsidy_gui.cpp b/src/subsidy_gui.cpp
index bd31e0f611..6f01d936b2 100644
--- a/src/subsidy_gui.cpp
+++ b/src/subsidy_gui.cpp
@@ -17,7 +17,7 @@
#include "gui.h"
#include "subsidy_func.h"
#include "subsidy_base.h"
-#include "core/geometry_func.hpp"
+#include "core/geometry_func.h"
#include "widgets/subsidy_widget.h"
diff --git a/src/subsidy_type.h b/src/subsidy_type.h
index cc5435ad87..9e248dd9fa 100644
--- a/src/subsidy_type.h
+++ b/src/subsidy_type.h
@@ -10,7 +10,7 @@
#ifndef SUBSIDY_TYPE_H
#define SUBSIDY_TYPE_H
-#include "core/enum_type.hpp"
+#include "core/enum_type.h"
/** What part of a subsidy is something? */
enum PartOfSubsidy : byte {
diff --git a/src/survey.cpp b/src/survey.cpp
index 7dc2d238f8..273d5fc178 100644
--- a/src/survey.cpp
+++ b/src/survey.cpp
@@ -21,16 +21,16 @@
#include "fontcache.h"
#include "language.h"
-#include "ai/ai_info.hpp"
-#include "game/game.hpp"
-#include "game/game_info.hpp"
+#include "ai/ai_info.h"
+#include "game/game.h"
+#include "game/game_info.h"
-#include "music/music_driver.hpp"
-#include "sound/sound_driver.hpp"
-#include "video/video_driver.hpp"
+#include "music/music_driver.h"
+#include "sound/sound_driver.h"
+#include "video/video_driver.h"
#include "base_media_base.h"
-#include "blitter/factory.hpp"
+#include "blitter/factory.h"
#ifdef WITH_ALLEGRO
# include
diff --git a/src/table/palettes.h b/src/table/palettes.h
index e5d1684b3f..e68ed6e4c8 100644
--- a/src/table/palettes.h
+++ b/src/table/palettes.h
@@ -7,7 +7,7 @@
/** @file palettes.h The colour translation of the GRF palettes. */
-#include "../core/endian_type.hpp"
+#include "../core/endian_type.h"
#define M(r, g, b) Colour(r, g, b)
diff --git a/src/table/strgen_tables.h b/src/table/strgen_tables.h
index 60fcf80060..505a1400ee 100644
--- a/src/table/strgen_tables.h
+++ b/src/table/strgen_tables.h
@@ -7,7 +7,7 @@
/** @file table/strgen_tables.h Tables of commands for strgen */
-#include "../core/enum_type.hpp"
+#include "../core/enum_type.h"
enum CmdFlags {
C_NONE = 0x0, ///< Nothing special about this command
diff --git a/src/table/townname.h b/src/table/townname.h
index 638a838302..b69b4d6145 100644
--- a/src/table/townname.h
+++ b/src/table/townname.h
@@ -7,7 +7,7 @@
/** @file table/townname.h Namepart tables for the town name generator */
-#include "../core/enum_type.hpp"
+#include "../core/enum_type.h"
static const char * const _name_original_english_1[] = {
"Great ",
diff --git a/src/terraform_cmd.cpp b/src/terraform_cmd.cpp
index b7b2da67e9..3da8f5334e 100644
--- a/src/terraform_cmd.cpp
+++ b/src/terraform_cmd.cpp
@@ -16,7 +16,7 @@
#include "object_base.h"
#include "company_base.h"
#include "company_func.h"
-#include "core/backup_type.hpp"
+#include "core/backup_type.h"
#include "terraform_cmd.h"
#include "landscape_cmd.h"
diff --git a/src/terraform_gui.cpp b/src/terraform_gui.cpp
index e589c4f20e..8b022ba288 100644
--- a/src/terraform_gui.cpp
+++ b/src/terraform_gui.cpp
@@ -8,7 +8,7 @@
/** @file terraform_gui.cpp GUI related to terraforming the map. */
#include "stdafx.h"
-#include "core/backup_type.hpp"
+#include "core/backup_type.h"
#include "clear_map.h"
#include "company_func.h"
#include "company_base.h"
diff --git a/src/tests/math_func.cpp b/src/tests/math_func.cpp
index 1f53d005b7..9247423497 100644
--- a/src/tests/math_func.cpp
+++ b/src/tests/math_func.cpp
@@ -11,7 +11,7 @@
#include "../3rdparty/catch2/catch.hpp"
-#include "../core/math_func.hpp"
+#include "../core/math_func.h"
TEST_CASE("DivideApproxTest - Negative")
{
diff --git a/src/tests/mock_spritecache.cpp b/src/tests/mock_spritecache.cpp
index 5a5910cfdd..f78a43ce75 100644
--- a/src/tests/mock_spritecache.cpp
+++ b/src/tests/mock_spritecache.cpp
@@ -9,8 +9,8 @@
#include "../stdafx.h"
-#include "../blitter/factory.hpp"
-#include "../core/math_func.hpp"
+#include "../blitter/factory.h"
+#include "../core/math_func.h"
#include "../spritecache.h"
#include "../spritecache_internal.h"
#include "../table/sprites.h"
diff --git a/src/tests/test_script_admin.cpp b/src/tests/test_script_admin.cpp
index c286e6293a..bf58067a55 100644
--- a/src/tests/test_script_admin.cpp
+++ b/src/tests/test_script_admin.cpp
@@ -11,11 +11,11 @@
#include "../3rdparty/catch2/catch.hpp"
-#include "../game/game_instance.hpp"
-#include "../script/api/script_admin.hpp"
-#include "../script/api/script_event_types.hpp"
-#include "../script/script_instance.hpp"
-#include "../script/squirrel.hpp"
+#include "../game/game_instance.h"
+#include "../script/api/script_admin.h"
+#include "../script/api/script_event_types.h"
+#include "../script/script_instance.h"
+#include "../script/squirrel.h"
#include "../3rdparty/fmt/format.h"
#include "../3rdparty/nlohmann/json.hpp"
diff --git a/src/textbuf.cpp b/src/textbuf.cpp
index 2cffc81aeb..e8ffea37bf 100644
--- a/src/textbuf.cpp
+++ b/src/textbuf.cpp
@@ -15,7 +15,7 @@
#include "gfx_type.h"
#include "gfx_func.h"
#include "window_func.h"
-#include "core/alloc_func.hpp"
+#include "core/alloc_func.h"
#include "safeguards.h"
diff --git a/src/texteff.cpp b/src/texteff.cpp
index 01dca6087c..5a6347e36b 100644
--- a/src/texteff.cpp
+++ b/src/texteff.cpp
@@ -8,7 +8,7 @@
/** @file texteff.cpp Handling of text effects. */
#include "stdafx.h"
-#include "texteff.hpp"
+#include "texteff.h"
#include "transparency.h"
#include "strings_func.h"
#include "viewport_func.h"
diff --git a/src/texteff.hpp b/src/texteff.h
similarity index 96%
rename from src/texteff.hpp
rename to src/texteff.h
index dad9b5888d..bc6a5e6c95 100644
--- a/src/texteff.hpp
+++ b/src/texteff.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 .
*/
-/** @file texteff.hpp Functions related to text effects. */
+/** @file texteff.h Functions related to text effects. */
#ifndef TEXTEFF_HPP
#define TEXTEFF_HPP
diff --git a/src/textfile_gui.cpp b/src/textfile_gui.cpp
index 1eff6f5fb6..3e835941e9 100644
--- a/src/textfile_gui.cpp
+++ b/src/textfile_gui.cpp
@@ -8,7 +8,7 @@
/** @file textfile_gui.cpp Implementation of textfile window. */
#include "stdafx.h"
-#include "core/backup_type.hpp"
+#include "core/backup_type.h"
#include "fileio_func.h"
#include "fontcache.h"
#include "gfx_type.h"
diff --git a/src/tgp.cpp b/src/tgp.cpp
index 5a66c69de8..b5f8576f2f 100644
--- a/src/tgp.cpp
+++ b/src/tgp.cpp
@@ -11,7 +11,7 @@
#include "clear_map.h"
#include "void_map.h"
#include "genworld.h"
-#include "core/random_func.hpp"
+#include "core/random_func.h"
#include "landscape_type.h"
#include "safeguards.h"
diff --git a/src/tile_map.h b/src/tile_map.h
index 6ec6609e6b..c7fe484dfb 100644
--- a/src/tile_map.h
+++ b/src/tile_map.h
@@ -12,7 +12,7 @@
#include "slope_type.h"
#include "map_func.h"
-#include "core/bitmath_func.hpp"
+#include "core/bitmath_func.h"
#include "settings_type.h"
/**
diff --git a/src/tile_type.h b/src/tile_type.h
index 261fe58fc2..7985f0c1c8 100644
--- a/src/tile_type.h
+++ b/src/tile_type.h
@@ -10,7 +10,7 @@
#ifndef TILE_TYPE_H
#define TILE_TYPE_H
-#include "core/strong_typedef_type.hpp"
+#include "core/strong_typedef_type.h"
static const uint TILE_SIZE = 16; ///< Tile size in world coordinates.
static const uint TILE_UNIT_MASK = TILE_SIZE - 1; ///< For masking in/out the inner-tile world coordinate units.
diff --git a/src/tilehighlight_type.h b/src/tilehighlight_type.h
index 929d49c4e4..e7577868ec 100644
--- a/src/tilehighlight_type.h
+++ b/src/tilehighlight_type.h
@@ -10,7 +10,7 @@
#ifndef TILEHIGHLIGHT_TYPE_H
#define TILEHIGHLIGHT_TYPE_H
-#include "core/geometry_type.hpp"
+#include "core/geometry_type.h"
#include "window_type.h"
#include "tile_type.h"
#include "viewport_type.h"
diff --git a/src/tilematrix_type.hpp b/src/tilematrix_type.h
similarity index 97%
rename from src/tilematrix_type.hpp
rename to src/tilematrix_type.h
index 006267b5bd..197b85d88a 100644
--- a/src/tilematrix_type.hpp
+++ b/src/tilematrix_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 .
*/
-/** @file tilematrix_type.hpp Template for storing a value per area of the map. */
+/** @file tilematrix_type.h Template for storing a value per area of the map. */
#ifndef TILEMATRIX_TYPE_HPP
#define TILEMATRIX_TYPE_HPP
-#include "core/alloc_func.hpp"
+#include "core/alloc_func.h"
#include "tilearea_type.h"
/**
diff --git a/src/timer/timer_game_calendar.h b/src/timer/timer_game_calendar.h
index ab29063f54..134ce5069b 100644
--- a/src/timer/timer_game_calendar.h
+++ b/src/timer/timer_game_calendar.h
@@ -11,7 +11,7 @@
#define TIMER_GAME_CALENDAR_H
#include "../stdafx.h"
-#include "../core/strong_typedef_type.hpp"
+#include "../core/strong_typedef_type.h"
/**
* Timer that is increased every 27ms, and counts towards ticks / days / months / years.
diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
index dab9ff0dc8..47e8a92137 100644
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -31,8 +31,8 @@
#include "fios.h"
#include "console_gui.h"
#include "news_gui.h"
-#include "ai/ai_gui.hpp"
-#include "game/game_gui.hpp"
+#include "ai/ai_gui.h"
+#include "game/game_gui.h"
#include "script/script_gui.h"
#include "tilehighlight_func.h"
#include "smallmap_gui.h"
@@ -43,7 +43,7 @@
#include "hotkeys.h"
#include "engine_base.h"
#include "highscore.h"
-#include "game/game.hpp"
+#include "game/game.h"
#include "goal_base.h"
#include "story_base.h"
#include "toolbar_gui.h"
diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp
index 8a40d3d457..6909565618 100644
--- a/src/town_cmd.cpp
+++ b/src/town_cmd.cpp
@@ -36,17 +36,17 @@
#include "cheat_type.h"
#include "animated_tile_func.h"
#include "subsidy_func.h"
-#include "core/pool_func.hpp"
+#include "core/pool_func.h"
#include "town.h"
#include "town_kdtree.h"
#include "townname_func.h"
-#include "core/random_func.hpp"
-#include "core/backup_type.hpp"
+#include "core/random_func.h"
+#include "core/backup_type.h"
#include "depot_base.h"
#include "object_map.h"
#include "object_base.h"
-#include "ai/ai.hpp"
-#include "game/game.hpp"
+#include "ai/ai.h"
+#include "game/game.h"
#include "town_cmd.h"
#include "landscape_cmd.h"
#include "road_cmd.h"
diff --git a/src/town_gui.cpp b/src/town_gui.cpp
index 8a9fb46433..4dc3ee7c4a 100644
--- a/src/town_gui.cpp
+++ b/src/town_gui.cpp
@@ -27,8 +27,8 @@
#include "querystring_gui.h"
#include "window_func.h"
#include "townname_func.h"
-#include "core/backup_type.hpp"
-#include "core/geometry_func.hpp"
+#include "core/backup_type.h"
+#include "core/geometry_func.h"
#include "genworld.h"
#include "stringfilter_type.h"
#include "widgets/dropdown_func.h"
diff --git a/src/town_kdtree.h b/src/town_kdtree.h
index 74898bc23b..e2403bc728 100644
--- a/src/town_kdtree.h
+++ b/src/town_kdtree.h
@@ -10,7 +10,7 @@
#ifndef TOWN_KDTREE_H
#define TOWN_KDTREE_H
-#include "core/kdtree.hpp"
+#include "core/kdtree.h"
#include "town.h"
inline uint16_t Kdtree_TownXYFunc(TownID tid, int dim) { return (dim == 0) ? TileX(Town::Get(tid)->xy) : TileY(Town::Get(tid)->xy); }
diff --git a/src/town_type.h b/src/town_type.h
index db2f9a2256..6dbe15b47a 100644
--- a/src/town_type.h
+++ b/src/town_type.h
@@ -10,7 +10,7 @@
#ifndef TOWN_TYPE_H
#define TOWN_TYPE_H
-#include "core/enum_type.hpp"
+#include "core/enum_type.h"
typedef uint16_t TownID;
struct Town;
diff --git a/src/townname.cpp b/src/townname.cpp
index d518b66605..cea0d05250 100644
--- a/src/townname.cpp
+++ b/src/townname.cpp
@@ -12,7 +12,7 @@
#include "townname_type.h"
#include "town.h"
#include "strings_func.h"
-#include "core/random_func.hpp"
+#include "core/random_func.h"
#include "genworld.h"
#include "gfx_layout.h"
#include "strings_internal.h"
diff --git a/src/townname_func.h b/src/townname_func.h
index b3c0a601b5..556f2a7f8d 100644
--- a/src/townname_func.h
+++ b/src/townname_func.h
@@ -10,7 +10,7 @@
#ifndef TOWNNAME_FUNC_H
#define TOWNNAME_FUNC_H
-#include "core/random_func.hpp"
+#include "core/random_func.h"
#include "townname_type.h"
std::string GetTownName(const TownNameParams *par, uint32_t townnameparts);
diff --git a/src/track_func.h b/src/track_func.h
index bc325d8928..87554c28a6 100644
--- a/src/track_func.h
+++ b/src/track_func.h
@@ -10,7 +10,7 @@
#ifndef TRACK_FUNC_H
#define TRACK_FUNC_H
-#include "core/bitmath_func.hpp"
+#include "core/bitmath_func.h"
#include "track_type.h"
#include "direction_func.h"
#include "slope_func.h"
diff --git a/src/track_type.h b/src/track_type.h
index b93fe97d60..59d478106a 100644
--- a/src/track_type.h
+++ b/src/track_type.h
@@ -10,7 +10,7 @@
#ifndef TRACK_TYPE_H
#define TRACK_TYPE_H
-#include "core/enum_type.hpp"
+#include "core/enum_type.h"
/**
* These are used to specify a single track.
diff --git a/src/train.h b/src/train.h
index 460a1cd365..df6fc168f2 100644
--- a/src/train.h
+++ b/src/train.h
@@ -10,14 +10,14 @@
#ifndef TRAIN_H
#define TRAIN_H
-#include "core/enum_type.hpp"
+#include "core/enum_type.h"
#include "newgrf_engine.h"
#include "cargotype.h"
#include "rail.h"
#include "engine_base.h"
#include "rail_map.h"
-#include "ground_vehicle.hpp"
+#include "ground_vehicle.h"
struct Train;
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index df7bd37192..5b7a9d2950 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -22,13 +22,13 @@
#include "viewport_func.h"
#include "vehicle_func.h"
#include "sound_func.h"
-#include "ai/ai.hpp"
-#include "game/game.hpp"
+#include "ai/ai.h"
+#include "game/game.h"
#include "newgrf_station.h"
#include "effectvehicle_func.h"
#include "network/network.h"
#include "spritecache.h"
-#include "core/random_func.hpp"
+#include "core/random_func.h"
#include "company_base.h"
#include "newgrf.h"
#include "order_backup.h"
diff --git a/src/transparency.h b/src/transparency.h
index 2d1816ea13..6d105165e0 100644
--- a/src/transparency.h
+++ b/src/transparency.h
@@ -12,7 +12,7 @@
#include "gfx_func.h"
#include "openttd.h"
-#include "core/bitmath_func.hpp"
+#include "core/bitmath_func.h"
/**
* Transparency option bits: which position in _transparency_opt stands for which transparency.
diff --git a/src/transport_type.h b/src/transport_type.h
index 5ad7202020..012068ca97 100644
--- a/src/transport_type.h
+++ b/src/transport_type.h
@@ -10,7 +10,7 @@
#ifndef TRANSPORT_TYPE_H
#define TRANSPORT_TYPE_H
-#include "core/enum_type.hpp"
+#include "core/enum_type.h"
/** Type for the company global vehicle unit number. */
typedef uint16_t UnitID;
diff --git a/src/tree_cmd.cpp b/src/tree_cmd.cpp
index 99406f81fb..a1e18beb1e 100644
--- a/src/tree_cmd.cpp
+++ b/src/tree_cmd.cpp
@@ -20,7 +20,7 @@
#include "sound_func.h"
#include "water.h"
#include "company_base.h"
-#include "core/random_func.hpp"
+#include "core/random_func.h"
#include "newgrf_generic.h"
#include "timer/timer_game_tick.h"
#include "tree_cmd.h"
diff --git a/src/tree_gui.cpp b/src/tree_gui.cpp
index 4a91853289..9a51326373 100644
--- a/src/tree_gui.cpp
+++ b/src/tree_gui.cpp
@@ -14,7 +14,7 @@
#include "company_func.h"
#include "company_base.h"
#include "command_func.h"
-#include "core/random_func.hpp"
+#include "core/random_func.h"
#include "sound_func.h"
#include "strings_func.h"
#include "zoom_func.h"
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index a383de7a44..ba671e4ec2 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -29,16 +29,16 @@
#include "autoreplace_func.h"
#include "autoreplace_gui.h"
#include "station_base.h"
-#include "ai/ai.hpp"
+#include "ai/ai.h"
#include "depot_func.h"
#include "network/network.h"
-#include "core/pool_func.hpp"
+#include "core/pool_func.h"
#include "economy_base.h"
#include "articulated_vehicles.h"
#include "roadstop_base.h"
-#include "core/random_func.hpp"
-#include "core/backup_type.hpp"
-#include "core/container_func.hpp"
+#include "core/random_func.h"
+#include "core/backup_type.h"
+#include "core/container_func.h"
#include "order_backup.h"
#include "sound_func.h"
#include "effectvehicle_func.h"
diff --git a/src/vehicle_base.h b/src/vehicle_base.h
index b1ddea8a61..173dcd74e3 100644
--- a/src/vehicle_base.h
+++ b/src/vehicle_base.h
@@ -14,7 +14,7 @@
#include "command_type.h"
#include "order_base.h"
#include "cargopacket.h"
-#include "texteff.hpp"
+#include "texteff.h"
#include "engine_type.h"
#include "order_func.h"
#include "transport_type.h"
@@ -23,7 +23,7 @@
#include "network/network.h"
#include "saveload/saveload.h"
#include "timer/timer_game_calendar.h"
-#include "core/mem_func.hpp"
+#include "core/mem_func.h"
const uint TILE_AXIAL_DISTANCE = 192; // Logical length of the tile in any DiagDirection used in vehicle movement.
const uint TILE_CORNER_DISTANCE = 128; // Logical length of the tile corner crossing in any non-diagonal direction used in vehicle movement.
diff --git a/src/vehicle_cmd.cpp b/src/vehicle_cmd.cpp
index 67cdd4bcb7..d1ab00d436 100644
--- a/src/vehicle_cmd.cpp
+++ b/src/vehicle_cmd.cpp
@@ -28,7 +28,7 @@
#include "ship.h"
#include "newgrf.h"
#include "company_base.h"
-#include "core/random_func.hpp"
+#include "core/random_func.h"
#include "vehicle_cmd.h"
#include "aircraft_cmd.h"
#include "autoreplace_cmd.h"
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index eb6484651a..f4d9c160b5 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -30,8 +30,8 @@
#include "timetable.h"
#include "articulated_vehicles.h"
#include "spritecache.h"
-#include "core/geometry_func.hpp"
-#include "core/container_func.hpp"
+#include "core/geometry_func.h"
+#include "core/container_func.h"
#include "company_base.h"
#include "engine_func.h"
#include "station_base.h"
diff --git a/src/vehicle_type.h b/src/vehicle_type.h
index e61223ba3a..0e79bca6b3 100644
--- a/src/vehicle_type.h
+++ b/src/vehicle_type.h
@@ -10,7 +10,7 @@
#ifndef VEHICLE_TYPE_H
#define VEHICLE_TYPE_H
-#include "core/enum_type.hpp"
+#include "core/enum_type.h"
/** The type all our vehicle IDs have. */
typedef uint32_t VehicleID;
diff --git a/src/video/CMakeLists.txt b/src/video/CMakeLists.txt
index 3b74e10460..e860d527f7 100644
--- a/src/video/CMakeLists.txt
+++ b/src/video/CMakeLists.txt
@@ -46,5 +46,5 @@ add_files(
null_v.cpp
null_v.h
video_driver.cpp
- video_driver.hpp
+ video_driver.h
)
diff --git a/src/video/allegro_v.cpp b/src/video/allegro_v.cpp
index a2ac32c117..37ebb2846a 100644
--- a/src/video/allegro_v.cpp
+++ b/src/video/allegro_v.cpp
@@ -18,9 +18,9 @@
#include "../openttd.h"
#include "../error_func.h"
#include "../gfx_func.h"
-#include "../blitter/factory.hpp"
-#include "../core/random_func.hpp"
-#include "../core/math_func.hpp"
+#include "../blitter/factory.h"
+#include "../core/random_func.h"
+#include "../core/math_func.h"
#include "../framerate_type.h"
#include "../progress.h"
#include "../thread.h"
diff --git a/src/video/allegro_v.h b/src/video/allegro_v.h
index d1576fea9e..d7135e2ac9 100644
--- a/src/video/allegro_v.h
+++ b/src/video/allegro_v.h
@@ -10,7 +10,7 @@
#ifndef VIDEO_ALLEGRO_H
#define VIDEO_ALLEGRO_H
-#include "video_driver.hpp"
+#include "video_driver.h"
/** The allegro video driver. */
class VideoDriver_Allegro : public VideoDriver {
diff --git a/src/video/cocoa/cocoa_ogl.mm b/src/video/cocoa/cocoa_ogl.mm
index a5fe9badeb..eabe3613df 100644
--- a/src/video/cocoa/cocoa_ogl.mm
+++ b/src/video/cocoa/cocoa_ogl.mm
@@ -23,12 +23,12 @@
#include "../../openttd.h"
#include "../../debug.h"
-#include "../../core/geometry_func.hpp"
-#include "../../core/math_func.hpp"
-#include "../../core/mem_func.hpp"
+#include "../../core/geometry_func.h"
+#include "../../core/math_func.h"
+#include "../../core/mem_func.h"
#include "cocoa_ogl.h"
#include "cocoa_wnd.h"
-#include "../../blitter/factory.hpp"
+#include "../../blitter/factory.h"
#include "../../gfx_func.h"
#include "../../framerate_type.h"
#include "../opengl.h"
diff --git a/src/video/cocoa/cocoa_v.h b/src/video/cocoa/cocoa_v.h
index 2244f99204..9921f112d9 100644
--- a/src/video/cocoa/cocoa_v.h
+++ b/src/video/cocoa/cocoa_v.h
@@ -10,8 +10,8 @@
#ifndef VIDEO_COCOA_H
#define VIDEO_COCOA_H
-#include "../video_driver.hpp"
-#include "../../core/geometry_type.hpp"
+#include "../video_driver.h"
+#include "../../core/geometry_type.h"
extern bool _cocoa_video_started;
diff --git a/src/video/cocoa/cocoa_v.mm b/src/video/cocoa/cocoa_v.mm
index 23979b4ef4..0dc585cefb 100644
--- a/src/video/cocoa/cocoa_v.mm
+++ b/src/video/cocoa/cocoa_v.mm
@@ -28,15 +28,15 @@
#include "../../openttd.h"
#include "../../debug.h"
#include "../../error_func.h"
-#include "../../core/geometry_func.hpp"
-#include "../../core/math_func.hpp"
+#include "../../core/geometry_func.h"
+#include "../../core/math_func.h"
#include "cocoa_v.h"
#include "cocoa_wnd.h"
-#include "../../blitter/factory.hpp"
+#include "../../blitter/factory.h"
#include "../../framerate_type.h"
#include "../../gfx_func.h"
#include "../../thread.h"
-#include "../../core/random_func.hpp"
+#include "../../core/random_func.h"
#include "../../progress.h"
#include "../../settings_type.h"
#include "../../window_func.h"
diff --git a/src/video/dedicated_v.cpp b/src/video/dedicated_v.cpp
index f891be2402..f2da56d355 100644
--- a/src/video/dedicated_v.cpp
+++ b/src/video/dedicated_v.cpp
@@ -17,9 +17,9 @@
#include "../genworld.h"
#include "../fileio_type.h"
#include "../fios.h"
-#include "../blitter/factory.hpp"
+#include "../blitter/factory.h"
#include "../company_func.h"
-#include "../core/random_func.hpp"
+#include "../core/random_func.h"
#include "../saveload/saveload.h"
#include "../thread.h"
#include "../window_func.h"
diff --git a/src/video/dedicated_v.h b/src/video/dedicated_v.h
index 54e2dd402b..5dd703e0bc 100644
--- a/src/video/dedicated_v.h
+++ b/src/video/dedicated_v.h
@@ -10,7 +10,7 @@
#ifndef VIDEO_DEDICATED_H
#define VIDEO_DEDICATED_H
-#include "video_driver.hpp"
+#include "video_driver.h"
/** The dedicated server video driver. */
class VideoDriver_Dedicated : public VideoDriver {
diff --git a/src/video/null_v.cpp b/src/video/null_v.cpp
index f0551e8898..a5dd78b2e7 100644
--- a/src/video/null_v.cpp
+++ b/src/video/null_v.cpp
@@ -9,7 +9,7 @@
#include "../stdafx.h"
#include "../gfx_func.h"
-#include "../blitter/factory.hpp"
+#include "../blitter/factory.h"
#include "../saveload/saveload.h"
#include "../window_func.h"
#include "null_v.h"
diff --git a/src/video/null_v.h b/src/video/null_v.h
index ee83de7e65..26ae2ab0d5 100644
--- a/src/video/null_v.h
+++ b/src/video/null_v.h
@@ -10,7 +10,7 @@
#ifndef VIDEO_NULL_H
#define VIDEO_NULL_H
-#include "video_driver.hpp"
+#include "video_driver.h"
/** The null video driver. */
class VideoDriver_Null : public VideoDriver {
diff --git a/src/video/opengl.cpp b/src/video/opengl.cpp
index 641ebaca54..f989b629d0 100644
--- a/src/video/opengl.cpp
+++ b/src/video/opengl.cpp
@@ -28,13 +28,13 @@
#include "../3rdparty/opengl/glext.h"
#include "opengl.h"
-#include "../core/geometry_func.hpp"
-#include "../core/mem_func.hpp"
-#include "../core/math_func.hpp"
-#include "../core/mem_func.hpp"
+#include "../core/geometry_func.h"
+#include "../core/mem_func.h"
+#include "../core/math_func.h"
+#include "../core/mem_func.h"
#include "../gfx_func.h"
#include "../debug.h"
-#include "../blitter/factory.hpp"
+#include "../blitter/factory.h"
#include "../zoom_func.h"
#include "../table/opengl_shader.h"
diff --git a/src/video/opengl.h b/src/video/opengl.h
index 7c5c0f70be..7cd7361e93 100644
--- a/src/video/opengl.h
+++ b/src/video/opengl.h
@@ -10,11 +10,11 @@
#ifndef VIDEO_OPENGL_H
#define VIDEO_OPENGL_H
-#include "../core/alloc_type.hpp"
-#include "../core/geometry_type.hpp"
+#include "../core/alloc_type.h"
+#include "../core/geometry_type.h"
#include "../gfx_type.h"
-#include "../spriteloader/spriteloader.hpp"
-#include "../misc/lrucache.hpp"
+#include "../spriteloader/spriteloader.h"
+#include "../misc/lrucache.h"
typedef void (*OGLProc)();
typedef OGLProc (*GetOGLProcAddressProc)(const char *proc);
diff --git a/src/video/sdl2_default_v.cpp b/src/video/sdl2_default_v.cpp
index 221b0f2776..139fdfa5e6 100644
--- a/src/video/sdl2_default_v.cpp
+++ b/src/video/sdl2_default_v.cpp
@@ -12,14 +12,14 @@
#include "../error_func.h"
#include "../gfx_func.h"
#include "../rev.h"
-#include "../blitter/factory.hpp"
+#include "../blitter/factory.h"
#include "../network/network.h"
#include "../thread.h"
#include "../progress.h"
-#include "../core/random_func.hpp"
-#include "../core/math_func.hpp"
-#include "../core/mem_func.hpp"
-#include "../core/geometry_func.hpp"
+#include "../core/random_func.h"
+#include "../core/math_func.h"
+#include "../core/mem_func.h"
+#include "../core/geometry_func.h"
#include "../fileio_func.h"
#include "../framerate_type.h"
#include "../window_func.h"
diff --git a/src/video/sdl2_opengl_v.cpp b/src/video/sdl2_opengl_v.cpp
index ac5ceb0361..45072f4204 100644
--- a/src/video/sdl2_opengl_v.cpp
+++ b/src/video/sdl2_opengl_v.cpp
@@ -15,14 +15,14 @@
#include "../openttd.h"
#include "../gfx_func.h"
#include "../rev.h"
-#include "../blitter/factory.hpp"
+#include "../blitter/factory.h"
#include "../network/network.h"
#include "../thread.h"
#include "../progress.h"
-#include "../core/random_func.hpp"
-#include "../core/math_func.hpp"
-#include "../core/mem_func.hpp"
-#include "../core/geometry_func.hpp"
+#include "../core/random_func.h"
+#include "../core/math_func.h"
+#include "../core/mem_func.h"
+#include "../core/geometry_func.h"
#include "../fileio_func.h"
#include "../framerate_type.h"
#include "../window_func.h"
diff --git a/src/video/sdl2_v.cpp b/src/video/sdl2_v.cpp
index 2bb381f5ec..abbc2bdd24 100644
--- a/src/video/sdl2_v.cpp
+++ b/src/video/sdl2_v.cpp
@@ -10,13 +10,13 @@
#include "../stdafx.h"
#include "../openttd.h"
#include "../gfx_func.h"
-#include "../blitter/factory.hpp"
+#include "../blitter/factory.h"
#include "../thread.h"
#include "../progress.h"
-#include "../core/random_func.hpp"
-#include "../core/math_func.hpp"
-#include "../core/mem_func.hpp"
-#include "../core/geometry_func.hpp"
+#include "../core/random_func.h"
+#include "../core/math_func.h"
+#include "../core/mem_func.h"
+#include "../core/geometry_func.h"
#include "../fileio_func.h"
#include "../framerate_type.h"
#include "../window_func.h"
diff --git a/src/video/sdl2_v.h b/src/video/sdl2_v.h
index 9b70eafd9c..72e6d9678a 100644
--- a/src/video/sdl2_v.h
+++ b/src/video/sdl2_v.h
@@ -12,7 +12,7 @@
#include
-#include "video_driver.hpp"
+#include "video_driver.h"
/** The SDL video driver. */
class VideoDriver_SDL_Base : public VideoDriver {
diff --git a/src/video/sdl_v.cpp b/src/video/sdl_v.cpp
index 54819eb9e3..bd1ae40bdd 100644
--- a/src/video/sdl_v.cpp
+++ b/src/video/sdl_v.cpp
@@ -13,11 +13,11 @@
#include "../openttd.h"
#include "../error_func.h"
#include "../gfx_func.h"
-#include "../blitter/factory.hpp"
+#include "../blitter/factory.h"
#include "../thread.h"
#include "../progress.h"
-#include "../core/random_func.hpp"
-#include "../core/math_func.hpp"
+#include "../core/random_func.h"
+#include "../core/math_func.h"
#include "../fileio_func.h"
#include "../framerate_type.h"
#include "../window_func.h"
diff --git a/src/video/sdl_v.h b/src/video/sdl_v.h
index 2b37cbdb6a..123bc8df97 100644
--- a/src/video/sdl_v.h
+++ b/src/video/sdl_v.h
@@ -10,7 +10,7 @@
#ifndef VIDEO_SDL_H
#define VIDEO_SDL_H
-#include "video_driver.hpp"
+#include "video_driver.h"
/** The SDL video driver. */
class VideoDriver_SDL : public VideoDriver {
diff --git a/src/video/video_driver.cpp b/src/video/video_driver.cpp
index cd4b6cd1ae..f7344fb044 100644
--- a/src/video/video_driver.cpp
+++ b/src/video/video_driver.cpp
@@ -8,9 +8,9 @@
/** @file video_driver.cpp Common code between video driver implementations. */
#include "../stdafx.h"
-#include "../core/random_func.hpp"
+#include "../core/random_func.h"
#include "../network/network.h"
-#include "../blitter/factory.hpp"
+#include "../blitter/factory.h"
#include "../debug.h"
#include "../driver.h"
#include "../fontcache.h"
@@ -20,7 +20,7 @@
#include "../rev.h"
#include "../thread.h"
#include "../window_func.h"
-#include "video_driver.hpp"
+#include "video_driver.h"
bool _video_hw_accel; ///< Whether to consider hardware accelerated video drivers.
bool _video_vsync; ///< Whether we should use vsync (only if _video_hw_accel is enabled).
diff --git a/src/video/video_driver.hpp b/src/video/video_driver.h
similarity index 98%
rename from src/video/video_driver.hpp
rename to src/video/video_driver.h
index 24b6232e29..c58546f9d9 100644
--- a/src/video/video_driver.hpp
+++ b/src/video/video_driver.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 .
*/
-/** @file video_driver.hpp Base of all video drivers. */
+/** @file video_driver.h Base of all video drivers. */
#ifndef VIDEO_VIDEO_DRIVER_HPP
#define VIDEO_VIDEO_DRIVER_HPP
#include "../driver.h"
-#include "../core/geometry_type.hpp"
-#include "../core/math_func.hpp"
+#include "../core/geometry_type.h"
+#include "../core/math_func.h"
#include "../gfx_func.h"
#include "../settings_type.h"
#include "../zoom_type.h"
diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp
index a2710186a2..b0e6d14b4c 100644
--- a/src/video/win32_v.cpp
+++ b/src/video/win32_v.cpp
@@ -12,11 +12,11 @@
#include "../error_func.h"
#include "../gfx_func.h"
#include "../os/windows/win32.h"
-#include "../blitter/factory.hpp"
-#include "../core/geometry_func.hpp"
-#include "../core/math_func.hpp"
-#include "../core/random_func.hpp"
-#include "../texteff.hpp"
+#include "../blitter/factory.h"
+#include "../core/geometry_func.h"
+#include "../core/math_func.h"
+#include "../core/random_func.h"
+#include "../texteff.h"
#include "../thread.h"
#include "../progress.h"
#include "../window_gui.h"
diff --git a/src/video/win32_v.h b/src/video/win32_v.h
index 272ee607a9..68f14210c2 100644
--- a/src/video/win32_v.h
+++ b/src/video/win32_v.h
@@ -10,7 +10,7 @@
#ifndef VIDEO_WIN32_H
#define VIDEO_WIN32_H
-#include "video_driver.hpp"
+#include "video_driver.h"
#include
#include
#include
diff --git a/src/viewport.cpp b/src/viewport.cpp
index 7179846b44..24127ac6c7 100644
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -61,7 +61,7 @@
*/
#include "stdafx.h"
-#include "core/backup_type.hpp"
+#include "core/backup_type.h"
#include "landscape.h"
#include "viewport_func.h"
#include "station_base.h"
@@ -71,7 +71,7 @@
#include "signs_func.h"
#include "vehicle_base.h"
#include "vehicle_gui.h"
-#include "blitter/factory.hpp"
+#include "blitter/factory.h"
#include "strings_func.h"
#include "zoom_func.h"
#include "vehicle_func.h"
diff --git a/src/viewport_kdtree.h b/src/viewport_kdtree.h
index 3c2f49c2e4..c4ebc75054 100644
--- a/src/viewport_kdtree.h
+++ b/src/viewport_kdtree.h
@@ -10,7 +10,7 @@
#ifndef VIEWPORT_KDTREE_H
#define VIEWPORT_KDTREE_H
-#include "core/kdtree.hpp"
+#include "core/kdtree.h"
#include "viewport_type.h"
#include "station_base.h"
#include "town_type.h"
diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp
index aec29645a3..8b869ad92f 100644
--- a/src/water_cmd.cpp
+++ b/src/water_cmd.cpp
@@ -28,10 +28,10 @@
#include "effectvehicle_func.h"
#include "tunnelbridge_map.h"
#include "station_base.h"
-#include "ai/ai.hpp"
-#include "game/game.hpp"
-#include "core/random_func.hpp"
-#include "core/backup_type.hpp"
+#include "ai/ai.h"
+#include "game/game.h"
+#include "core/random_func.h"
+#include "core/backup_type.h"
#include "timer/timer_game_calendar.h"
#include "company_base.h"
#include "company_gui.h"
diff --git a/src/widget.cpp b/src/widget.cpp
index 65d105292b..a7102dea02 100644
--- a/src/widget.cpp
+++ b/src/widget.cpp
@@ -8,14 +8,14 @@
/** @file widget.cpp Handling of the default/simple widgets. */
#include "stdafx.h"
-#include "core/backup_type.hpp"
+#include "core/backup_type.h"
#include "company_func.h"
#include "window_gui.h"
#include "viewport_func.h"
#include "zoom_func.h"
#include "strings_func.h"
#include "transparency.h"
-#include "core/geometry_func.hpp"
+#include "core/geometry_func.h"
#include "settings_type.h"
#include "querystring_gui.h"
diff --git a/src/widget_type.h b/src/widget_type.h
index 4b46e8974f..b63f2ebe6a 100644
--- a/src/widget_type.h
+++ b/src/widget_type.h
@@ -10,9 +10,9 @@
#ifndef WIDGET_TYPE_H
#define WIDGET_TYPE_H
-#include "core/alloc_type.hpp"
-#include "core/bitmath_func.hpp"
-#include "core/math_func.hpp"
+#include "core/alloc_type.h"
+#include "core/bitmath_func.h"
+#include "core/math_func.h"
#include "strings_type.h"
#include "gfx_type.h"
#include "window_type.h"
diff --git a/src/window.cpp b/src/window.cpp
index 0c22944151..f526f303ce 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -14,7 +14,7 @@
#include "console_gui.h"
#include "viewport_func.h"
#include "progress.h"
-#include "blitter/factory.hpp"
+#include "blitter/factory.h"
#include "zoom_func.h"
#include "vehicle_base.h"
#include "depot_func.h"
@@ -31,8 +31,8 @@
#include "toolbar_gui.h"
#include "statusbar_gui.h"
#include "error.h"
-#include "game/game.hpp"
-#include "video/video_driver.hpp"
+#include "game/game.h"
+#include "video/video_driver.h"
#include "framerate_type.h"
#include "network/network_func.h"
#include "news_func.h"
diff --git a/src/window_func.h b/src/window_func.h
index da798aa4e9..67d10856f4 100644
--- a/src/window_func.h
+++ b/src/window_func.h
@@ -12,8 +12,8 @@
#include "window_type.h"
#include "company_type.h"
-#include "core/geometry_type.hpp"
-#include "core/strong_typedef_type.hpp"
+#include "core/geometry_type.h"
+#include "core/strong_typedef_type.h"
Window *FindWindowById(WindowClass cls, WindowNumber number);
Window *FindWindowByClass(WindowClass cls);
diff --git a/src/zoom_type.h b/src/zoom_type.h
index 38fd8bc112..f2eea01f8b 100644
--- a/src/zoom_type.h
+++ b/src/zoom_type.h
@@ -10,7 +10,7 @@
#ifndef ZOOM_TYPE_H
#define ZOOM_TYPE_H
-#include "core/enum_type.hpp"
+#include "core/enum_type.h"
static uint const ZOOM_LVL_SHIFT = 2;
static uint const ZOOM_LVL_BASE = 1 << ZOOM_LVL_SHIFT;