diff --git a/LEGO1/bike.cpp b/LEGO1/bike.cpp
index 86fa28f4..217e8c64 100644
--- a/LEGO1/bike.cpp
+++ b/LEGO1/bike.cpp
@@ -1,7 +1,5 @@
 #include "bike.h"
 
-#include "decomp.h"
-
 DECOMP_SIZE_ASSERT(Bike, 0x164);
 
 // OFFSET: LEGO1 0x10076670
diff --git a/LEGO1/bike.h b/LEGO1/bike.h
index 8d2de0f1..af8711a5 100644
--- a/LEGO1/bike.h
+++ b/LEGO1/bike.h
@@ -1,6 +1,7 @@
 #ifndef BIKE_H
 #define BIKE_H
 
+#include "decomp.h"
 #include "islepathactor.h"
 
 // VTABLE 0x100d9808
@@ -22,7 +23,9 @@ class Bike : public IslePathActor
   {
     return !strcmp(name, Bike::ClassName()) || IslePathActor::IsA(name);
   }
-
+private:
+  // TODO: Bike fields
+  undefined m_unk160[4];
 };
 
 
diff --git a/LEGO1/jetski.cpp b/LEGO1/jetski.cpp
index b00fd68c..20993cf3 100644
--- a/LEGO1/jetski.cpp
+++ b/LEGO1/jetski.cpp
@@ -1,7 +1,5 @@
 #include "jetski.h"
 
-#include "decomp.h"
-
 DECOMP_SIZE_ASSERT(Jetski, 0x164);
 
 // OFFSET: LEGO1 0x1007e3b0
diff --git a/LEGO1/jetski.h b/LEGO1/jetski.h
index 7cabea4d..d5de5a76 100644
--- a/LEGO1/jetski.h
+++ b/LEGO1/jetski.h
@@ -1,6 +1,7 @@
 #ifndef JETSKI_H
 #define JETSKI_H
 
+#include "decomp.h"
 #include "islepathactor.h"
 
 // VTABLE 0x100d9ec8
@@ -22,7 +23,9 @@ class Jetski : public IslePathActor
   {
     return !strcmp(name, Jetski::ClassName()) || IslePathActor::IsA(name);
   }
-
+private:
+  // TODO: Jetski fields
+  undefined m_unk160[4];
 };
 
 
diff --git a/LEGO1/racecar.cpp b/LEGO1/racecar.cpp
index be428b24..4e4a4a21 100644
--- a/LEGO1/racecar.cpp
+++ b/LEGO1/racecar.cpp
@@ -1,7 +1,5 @@
 #include "racecar.h"
 
-#include "decomp.h"
-
 DECOMP_SIZE_ASSERT(RaceCar, 0x164);
 
 // OFFSET: LEGO1 0x10028200
diff --git a/LEGO1/racecar.h b/LEGO1/racecar.h
index 9b870eb7..f10d9b62 100644
--- a/LEGO1/racecar.h
+++ b/LEGO1/racecar.h
@@ -1,6 +1,7 @@
 #ifndef RACECAR_H
 #define RACECAR_H
 
+#include "decomp.h"
 #include "islepathactor.h"
 
 // VTABLE 0x100d6918
@@ -23,7 +24,9 @@ class RaceCar : public IslePathActor
   {
     return !strcmp(name, RaceCar::ClassName()) || IslePathActor::IsA(name);
   }
-
+private:
+  // TODO: RaceCar fields
+  undefined m_unk160[4];
 };
 
 #endif // RACECAR_H
diff --git a/LEGO1/towtrack.cpp b/LEGO1/towtrack.cpp
index 57677737..3b7a9264 100644
--- a/LEGO1/towtrack.cpp
+++ b/LEGO1/towtrack.cpp
@@ -1,7 +1,5 @@
 #include "towtrack.h"
 
-#include "decomp.h"
-
 DECOMP_SIZE_ASSERT(TowTrack, 0x180);
 
 // OFFSET: LEGO1 0x1004c720
diff --git a/LEGO1/towtrack.h b/LEGO1/towtrack.h
index 260b74cd..8a22efe6 100644
--- a/LEGO1/towtrack.h
+++ b/LEGO1/towtrack.h
@@ -26,7 +26,7 @@ class TowTrack : public IslePathActor
 
 private:
   // TODO: TowTrack field types
-  undefined m_unk160[0x4];
+  undefined m_unk154[0x8];
   MxS32 m_unk164;
   MxS16 m_unk168;
   MxS16 m_unk16a;