diff --git a/src/script/api/script_airport.hpp b/src/script/api/script_airport.hpp
index cb3fc3c227..aa469bc5f0 100644
--- a/src/script/api/script_airport.hpp
+++ b/src/script/api/script_airport.hpp
@@ -12,6 +12,7 @@
 
 #include "script_object.hpp"
 #include "../../airport.h"
+#include "../../station_type.h"
 
 /**
  * Class that handles all airport related functions.
diff --git a/src/script/api/script_bridge.hpp b/src/script/api/script_bridge.hpp
index 1e8605c01d..b2ec03c0e7 100644
--- a/src/script/api/script_bridge.hpp
+++ b/src/script/api/script_bridge.hpp
@@ -11,6 +11,7 @@
 #define SCRIPT_BRIDGE_HPP
 
 #include "script_vehicle.hpp"
+#include "../../bridge.h"
 
 /**
  * Class that handles all bridge related functions.
diff --git a/src/script/api/script_cargolist.hpp b/src/script/api/script_cargolist.hpp
index 11223debc1..b170643e3c 100644
--- a/src/script/api/script_cargolist.hpp
+++ b/src/script/api/script_cargolist.hpp
@@ -11,6 +11,8 @@
 #define SCRIPT_CARGOLIST_HPP
 
 #include "script_list.hpp"
+#include "../../industry_type.h"
+#include "../../station_type.h"
 
 /**
  * Creates a list of cargoes that can be produced in the current game.
diff --git a/src/script/api/script_controller.hpp b/src/script/api/script_controller.hpp
index aed7596f03..c750613b12 100644
--- a/src/script/api/script_controller.hpp
+++ b/src/script/api/script_controller.hpp
@@ -11,6 +11,7 @@
 #define SCRIPT_CONTROLLER_HPP
 
 #include "script_types.hpp"
+#include "../../company_type.h"
 
 /**
  * The Controller, the class each Script should extend. It creates the Script,
diff --git a/src/script/api/script_event_types.hpp b/src/script/api/script_event_types.hpp
index c55cd32d9b..88a6573c9d 100644
--- a/src/script/api/script_event_types.hpp
+++ b/src/script/api/script_event_types.hpp
@@ -13,6 +13,12 @@
 #include "script_event.hpp"
 #include "script_goal.hpp"
 #include "script_window.hpp"
+#include "../../engine_type.h"
+#include "../../industry_type.h"
+#include "../../station_type.h"
+#include "../../story_type.h"
+#include "../../subsidy_type.h"
+#include "../../vehicle_type.h"
 
 /**
  * Event Vehicle Crash, indicating a vehicle of yours is crashed.
diff --git a/src/script/api/script_industrytype.hpp b/src/script/api/script_industrytype.hpp
index 8e81c68c80..50bdb8ec60 100644
--- a/src/script/api/script_industrytype.hpp
+++ b/src/script/api/script_industrytype.hpp
@@ -11,6 +11,7 @@
 #define SCRIPT_INDUSTRYTYPE_HPP
 
 #include "script_list.hpp"
+#include "../../industry_type.h"
 
 /**
  * Class that handles all industry-type related functions.
diff --git a/src/script/api/script_marine.hpp b/src/script/api/script_marine.hpp
index 7337c8df12..380976322e 100644
--- a/src/script/api/script_marine.hpp
+++ b/src/script/api/script_marine.hpp
@@ -11,6 +11,7 @@
 #define SCRIPT_MARINE_HPP
 
 #include "script_error.hpp"
+#include "../../station_type.h"
 
 /**
  * Class that handles all marine related functions.
diff --git a/src/script/api/script_rail.hpp b/src/script/api/script_rail.hpp
index 471946906c..b28bf0d509 100644
--- a/src/script/api/script_rail.hpp
+++ b/src/script/api/script_rail.hpp
@@ -11,7 +11,9 @@
 #define SCRIPT_RAIL_HPP
 
 #include "script_tile.hpp"
+#include "../../industry_type.h"
 #include "../../signal_type.h"
+#include "../../station_type.h"
 #include "../../track_type.h"
 
 /**
diff --git a/src/script/api/script_sign.hpp b/src/script/api/script_sign.hpp
index 3e9d0c8ff8..d06898d656 100644
--- a/src/script/api/script_sign.hpp
+++ b/src/script/api/script_sign.hpp
@@ -12,6 +12,7 @@
 
 #include "script_company.hpp"
 #include "script_error.hpp"
+#include "../../signs_type.h"
 
 /**
  * Class that handles all sign related functions.
diff --git a/src/script/api/script_subsidy.hpp b/src/script/api/script_subsidy.hpp
index 0fa4eac274..6483f01d82 100644
--- a/src/script/api/script_subsidy.hpp
+++ b/src/script/api/script_subsidy.hpp
@@ -12,6 +12,7 @@
 
 #include "script_company.hpp"
 #include "script_date.hpp"
+#include "../../subsidy_type.h"
 
 /**
  * Class that handles all subsidy related functions.
diff --git a/src/script/api/script_tilelist.hpp b/src/script/api/script_tilelist.hpp
index 67779bb2d2..2a693f492d 100644
--- a/src/script/api/script_tilelist.hpp
+++ b/src/script/api/script_tilelist.hpp
@@ -12,6 +12,7 @@
 
 #include "script_station.hpp"
 #include "script_list.hpp"
+#include "../../industry_type.h"
 
 /**
  * Creates an empty list, in which you can add tiles.
diff --git a/src/script/api/script_types.hpp b/src/script/api/script_types.hpp
index f6ff767bfc..972826f9cc 100644
--- a/src/script/api/script_types.hpp
+++ b/src/script/api/script_types.hpp
@@ -104,11 +104,9 @@
 #ifndef SCRIPT_TYPES_HPP
 #define SCRIPT_TYPES_HPP
 
-#include "../../core/overflowsafe_type.hpp"
-#include "../../company_type.h"
-#include "../../tile_type.h"
 #include <squirrel.h>
 
+#ifdef DOXYGEN_API
 /* Define all types here, so they are added to the API docs. */
 typedef uint BridgeType;       ///< The ID of a bridge type.
 typedef uint8_t CargoType;     ///< The ID of a cargo type.
@@ -117,11 +115,7 @@ typedef uint16_t GoalID;       ///< The ID of a goal.
 typedef uint16_t GroupID;      ///< The ID of a group.
 typedef uint16_t IndustryID;   ///< The ID of an industry.
 typedef uint8_t IndustryType;  ///< The ID of an industry-type.
-#ifdef DOXYGEN_API
 typedef int64_t Money;         ///< Money, stored in a 32bit/64bit safe way. For scripts money is always in pounds.
-#else
-typedef OverflowSafeInt64 Money;
-#endif /* DOXYGEN_API */
 typedef uint16_t ObjectType;   ///< The ID of an object-type.
 typedef uint16_t SignID;       ///< The ID of a sign.
 typedef uint16_t StationID;    ///< The ID of a station.
@@ -129,11 +123,10 @@ typedef uint32_t StringID;     ///< The ID of a string.
 typedef uint16_t SubsidyID;    ///< The ID of a subsidy.
 typedef uint16_t StoryPageID;  ///< The ID of a story page.
 typedef uint16_t StoryPageElementID; ///< The ID of a story page element.
-#ifdef DOXYGEN_API
 typedef uint32_t TileIndex;    ///< The ID of a map location.
-#endif /* DOXYGEN_API */
 typedef uint16_t TownID;       ///< The ID of a town.
 typedef uint32_t VehicleID;    ///< The ID of a vehicle.
+#endif /* DOXYGEN_API */
 
 /**
  * The types of errors inside the script framework.
diff --git a/src/script/api/script_vehicle.hpp b/src/script/api/script_vehicle.hpp
index 042e6caeb9..bc687929ec 100644
--- a/src/script/api/script_vehicle.hpp
+++ b/src/script/api/script_vehicle.hpp
@@ -11,6 +11,8 @@
 #define SCRIPT_VEHICLE_HPP
 
 #include "script_road.hpp"
+#include "../../engine_type.h"
+#include "../../group_type.h"
 
 /**
  * Class that handles all vehicle related functions.