diff --git a/src/ride_data.c b/src/ride_data.c
index a25a244c7b..aefda2a666 100644
--- a/src/ride_data.c
+++ b/src/ride_data.c
@@ -9,8 +9,8 @@
  */
 
 #include <stdbool.h>
-#include "ride_data.h"
 #include "rct2.h"
+#include "ride_data.h"
 
 const bool hasRunningTrack[0x60] = {
 	true,	// 0 Spiral Roller coaster
diff --git a/src/ride_data.h b/src/ride_data.h
index a3f35a171a..d107ad6aac 100644
--- a/src/ride_data.h
+++ b/src/ride_data.h
@@ -18,13 +18,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
+#ifndef _RIDE_DATA_H_
+#define _RIDE_DATA_H_
+
 #include <stdbool.h>
 #include "rct2.h"
 
-extern const uint8 hasRunningTrack[0x60];
+extern const bool hasRunningTrack[0x60];
 extern const uint8 initialUpkeepCosts[0x60];
 extern const uint8 costPerTrackPiece[0x60];
 
 extern const uint8 rideUnknownData1[0x60];
 extern const bool rideUnknownData2[0x60];
 extern const uint8 rideUnknownData3[0x60];
+
+#endif
\ No newline at end of file
diff --git a/src/ride_ratings.c b/src/ride_ratings.c
index 48dafad27a..915c78a3e2 100644
--- a/src/ride_ratings.c
+++ b/src/ride_ratings.c
@@ -18,10 +18,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include "ride.h"
-#include "ride_ratings.h"
-#include "ride_data.h"
 #include "addresses.h"
+#include "ride.h"
+#include "ride_data.h"
+#include "ride_ratings.h"
 
 /**
  * rct2: 0x0065C4D4
@@ -36,9 +36,9 @@ void crooked_house_excitement(rct_ride *ride)
 	ride->var_198 = 5;
 	sub_655FD6(ride);
 
-	sint16 excitement = 215;
-	sint16 intensity = 62;
-	sint16 nausea = 34;
+	ride_rating excitement	= RIDE_RATING(2,15);
+	ride_rating intensity	= RIDE_RATING(0,62);
+	ride_rating nausea		= RIDE_RATING(0,34);
 
 	// NB this should get marked out by the compiler, if it's smart.
 	excitement = apply_intensity_penalty(excitement, intensity);
@@ -95,7 +95,7 @@ uint16 compute_upkeep(rct_ride *ride)
 		cuml = cuml * 20;
 	}
 	cuml = cuml >> 0x0A;
-	upkeep += cuml;
+	upkeep += (uint16)cuml;
 
 	if (ride->lifecycle_flags & RIDE_LIFECYCLE_ON_RIDE_PHOTO) {
 		// The original code read from a table starting at 0x0097E3AE and
@@ -167,8 +167,8 @@ uint16 compute_upkeep(rct_ride *ride)
  * - bp: nausea
  * - edi: ride ptr
  */
-rating_tuple per_ride_rating_adjustments(rct_ride *ride, sint16 excitement, 
-		sint16 intensity, sint16 nausea)
+rating_tuple per_ride_rating_adjustments(rct_ride *ride, ride_rating excitement, 
+		ride_rating intensity, ride_rating nausea)
 {
 	// NB: The table here is allocated dynamically. Reading the exe will tell
 	// you nothing
@@ -206,7 +206,7 @@ rating_tuple per_ride_rating_adjustments(rct_ride *ride, sint16 excitement,
 			nausea += ax;
 		}
 	}
-	rating_tuple tup = {excitement, intensity, nausea};
+	rating_tuple tup = { excitement, intensity, nausea };
 	return tup;
 }
 
@@ -220,7 +220,7 @@ rating_tuple per_ride_rating_adjustments(rct_ride *ride, sint16 excitement,
  *
  * returns: the excitement level, with intensity penalties applied
  */
-sint16 apply_intensity_penalty(sint16 excitement, sint16 intensity)
+ride_rating apply_intensity_penalty(ride_rating excitement, ride_rating intensity)
 {
     // intensity penalty
     if (intensity >= 1000) {
diff --git a/src/ride_ratings.h b/src/ride_ratings.h
index 2b9316b581..28ad8bc451 100644
--- a/src/ride_ratings.h
+++ b/src/ride_ratings.h
@@ -18,16 +18,27 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
+#ifndef _RIDE_RATINGS_H_
+#define _RIDE_RATINGS_H_
+
+#include "rct2.h"
+
+typedef fixed16_2dp ride_rating;
+
+#define RIDE_RATING(whole, fraction)	FIXED_2DP(whole, fraction)
+
 // Used for return values, for functions that modify all three.
 typedef struct {
-	sint16 excitement;
-	sint16 intensity;
-	sint16 nausea;
+	ride_rating excitement;
+	ride_rating intensity;
+	ride_rating nausea;
 } rating_tuple;
 
 void crooked_house_excitement(rct_ride *ride);
 void sub_655FD6(rct_ride *ride);
-sint16 apply_intensity_penalty(sint16 excitement, sint16 intensity);
-rating_tuple per_ride_rating_adjustments(rct_ride *ride, sint16 excitement,
-	sint16 intensity, sint16 nausea);
+ride_rating apply_intensity_penalty(ride_rating excitement, ride_rating intensity);
+rating_tuple per_ride_rating_adjustments(rct_ride *ride, ride_rating excitement,
+	ride_rating intensity, ride_rating nausea);
 uint16 compute_upkeep(rct_ride *ride);
+
+#endif
\ No newline at end of file