diff --git a/Classes/Objlist/objlist.h b/Classes/Objlist/objlist.h
index a87c3b4..5493e4b 100644
--- a/Classes/Objlist/objlist.h
+++ b/Classes/Objlist/objlist.h
@@ -1,12 +1,11 @@
 //
 // Created by neo on 2019-08-15.
 //
+#include "../../pinball.h"
 
 #ifndef PINBALL_OBJLIST_CLASS_H
 #define PINBALL_OBJLIST_CLASS_H
 
-#include "../../pinball.h"
-
 /* 123 */
 struct objlist_class;
 objlist_class* __thiscall objlist_class::objlist_class(objlist_class* this, int a2, int a3);
diff --git a/Classes/TBall/TBall.h b/Classes/TBall/TBall.h
index f3c166c..22f5b93 100644
--- a/Classes/TBall/TBall.h
+++ b/Classes/TBall/TBall.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TBALL_H
 #define PINBALL_TBALL_H
 
-#include "../../pinball.h"
-
 /* 95 */
 struct TBall;
 
diff --git a/Classes/TBlocker/TBlocker.h b/Classes/TBlocker/TBlocker.h
index e0564a3..3fc7e0f 100644
--- a/Classes/TBlocker/TBlocker.h
+++ b/Classes/TBlocker/TBlocker.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TBLOCKER_H
 #define PINBALL_TBLOCKER_H
 
-#include "../../pinball.h"
-
 /* 130 */
 struct TBlocker;
 
diff --git a/Classes/TBumper/TBumper.h b/Classes/TBumper/TBumper.h
index 174e56c..efed446 100644
--- a/Classes/TBumper/TBumper.h
+++ b/Classes/TBumper/TBumper.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TBUMPER_H
 #define PINBALL_TBUMPER_H
 
-#include "../../pinball.h"
-
 /* 104 */
 struct TBumper;
 
diff --git a/Classes/TCircle/TCircle.h b/Classes/TCircle/TCircle.h
index fe8c09b..14841bb 100644
--- a/Classes/TCircle/TCircle.h
+++ b/Classes/TCircle/TCircle.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TCIRCLE_H
 #define PINBALL_TCIRCLE_H
 
-#include "../../pinball.h"
-
 /* 99 */
 struct TCircle;
 
diff --git a/Classes/TCollisionComponent/TCollisionComponent.h b/Classes/TCollisionComponent/TCollisionComponent.h
index b1ca28e..db04530 100644
--- a/Classes/TCollisionComponent/TCollisionComponent.h
+++ b/Classes/TCollisionComponent/TCollisionComponent.h
@@ -1,12 +1,11 @@
 //
 // Created by neo on 2019-08-15.
 //
+#include "../../pinball.h"
 
 #ifndef PINBALL_TCOLLISIONCOMPONENT_H
 #define PINBALL_TCOLLISIONCOMPONENT_H
 
-#include "../../pinball.h"
-
 /* 101 */
 struct TCollisionComponent;
 
diff --git a/Classes/TComponentGroup/TComponentGroup.h b/Classes/TComponentGroup/TComponentGroup.h
index ef6f25d..f96cd9e 100644
--- a/Classes/TComponentGroup/TComponentGroup.h
+++ b/Classes/TComponentGroup/TComponentGroup.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TCOMPONENTGROUP_H
 #define PINBALL_TCOMPONENTGROUP_H
 
-#include "../../pinball.h"
-
 /* 127 */
 struct TComponentGroup;
 
diff --git a/Classes/TDemo/TDemo.h b/Classes/TDemo/TDemo.h
index cd2bd85..0a87797 100644
--- a/Classes/TDemo/TDemo.h
+++ b/Classes/TDemo/TDemo.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TDEMO_H
 #define PINBALL_TDEMO_H
 
-#include "../../pinball.h"
-
 /* 128 */
 struct TDemo;
 
diff --git a/Classes/TDrain/TDrain.h b/Classes/TDrain/TDrain.h
index 79b42b8..b2b52f9 100644
--- a/Classes/TDrain/TDrain.h
+++ b/Classes/TDrain/TDrain.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TDRAIN_H
 #define PINBALL_TDRAIN_H
 
-#include "../../pinball.h"
-
 /* 115 */
 struct TDrain
 
diff --git a/Classes/TEdgeBox/TEdgeBox.h b/Classes/TEdgeBox/TEdgeBox.h
index edf89e0..f52717a 100644
--- a/Classes/TEdgeBox/TEdgeBox.h
+++ b/Classes/TEdgeBox/TEdgeBox.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TEDGEBOX_H
 #define PINBALL_TEDGEBOX_H
 
-#include "../../pinball.h"
-
 /* 125 */
 struct TEdgeBox;
 
diff --git a/Classes/TEdgeManager/TEdgeManager.h b/Classes/TEdgeManager/TEdgeManager.h
index 7d4ad04..41d6f20 100644
--- a/Classes/TEdgeManager/TEdgeManager.h
+++ b/Classes/TEdgeManager/TEdgeManager.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TEDGEMANAGER_H
 #define PINBALL_TEDGEMANAGER_H
 
-#include "../../pinball.h"
-
 /* 96 */
 struct TEdgeManager;
 
diff --git a/Classes/TEdgeSegment/TEdgeSegment.h b/Classes/TEdgeSegment/TEdgeSegment.h
index b926322..b5c64ae 100644
--- a/Classes/TEdgeSegment/TEdgeSegment.h
+++ b/Classes/TEdgeSegment/TEdgeSegment.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TEDGESEGMENT_H
 #define PINBALL_TEDGESEGMENT_H
 
-#include "../../pinball.h"
-
 /* 98 */
 struct TEdgeSegment;
 
diff --git a/Classes/TFlagSpinner/TFlagSpinner.h b/Classes/TFlagSpinner/TFlagSpinner.h
index dbfffa5..a378004 100644
--- a/Classes/TFlagSpinner/TFlagSpinner.h
+++ b/Classes/TFlagSpinner/TFlagSpinner.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TFLAGSPINNER_H
 #define PINBALL_TFLAGSPINNER_H
 
-#include "../../pinball.h"
-
 /* 105 */
 struct TFlagSpinner;
 
diff --git a/Classes/TFlipper/TFlipper.h b/Classes/TFlipper/TFlipper.h
index 98ce9f8..eaeb18c 100644
--- a/Classes/TFlipper/TFlipper.h
+++ b/Classes/TFlipper/TFlipper.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TFLIPPER_H
 #define PINBALL_TFLIPPER_H
 
-#include "../../pinball.h"
-
 /* 121 */
 struct TFlipper;
 
diff --git a/Classes/TFlipperEdge/TFlipperEdge.h b/Classes/TFlipperEdge/TFlipperEdge.h
index 1ddfe2a..7136b4f 100644
--- a/Classes/TFlipperEdge/TFlipperEdge.h
+++ b/Classes/TFlipperEdge/TFlipperEdge.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TFLIPPEREDGE_H
 #define PINBALL_TFLIPPEREDGE_H
 
-#include "../../pinball.h"
-
 /* 120 */
 struct TFlipperEdge;
 
diff --git a/Classes/TGate/TGate.h b/Classes/TGate/TGate.h
index 5fcfbfc..ad0539b 100644
--- a/Classes/TGate/TGate.h
+++ b/Classes/TGate/TGate.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TGATE_H
 #define PINBALL_TGATE_H
 
-#include "../../pinball.h"
-
 /* 133 */
 struct TGate;
 
diff --git a/Classes/THole/THole.h b/Classes/THole/THole.h
index 6d0f2e3..0d89423 100644
--- a/Classes/THole/THole.h
+++ b/Classes/THole/THole.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_THOLE_H
 #define PINBALL_THOLE_H
 
-#include "../../pinball.h"
-
 /* 112 */
 struct THole;
 
diff --git a/Classes/TKickback/TKickback.h b/Classes/TKickback/TKickback.h
index 92b143e..09b6701 100644
--- a/Classes/TKickback/TKickback.h
+++ b/Classes/TKickback/TKickback.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TKICKBACK_H
 #define PINBALL_TKICKBACK_H
 
-#include "../../pinball.h"
-
 /* 110 */
 struct TKickback;
 
diff --git a/Classes/TKickout/TKickout.h b/Classes/TKickout/TKickout.h
index 41e9a49..b79978d 100644
--- a/Classes/TKickout/TKickout.h
+++ b/Classes/TKickout/TKickout.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TKICKOUT_H
 #define PINBALL_TKICKOUT_H
 
-#include "../../pinball.h"
-
 /* 111 */
 struct TKickout;
 
diff --git a/Classes/TLight/TLight.h b/Classes/TLight/TLight.h
index 54dfe73..54a4640 100644
--- a/Classes/TLight/TLight.h
+++ b/Classes/TLight/TLight.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TLIGHT_H
 #define PINBALL_TLIGHT_H
 
-#include "../../pinball.h"
-
 /* 124 */
 struct TLight;
 
diff --git a/Classes/TLightBargraph/TLightBargraph.h b/Classes/TLightBargraph/TLightBargraph.h
index ad398fc..1401df4 100644
--- a/Classes/TLightBargraph/TLightBargraph.h
+++ b/Classes/TLightBargraph/TLightBargraph.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TLIGHTBARGRAPH_H
 #define PINBALL_TLIGHTBARGRAPH_H
 
-#include "../../pinball.h"
-
 /* 94 */
 struct TLightBargraph;
 
diff --git a/Classes/TLightRollover/TLightRollover.h b/Classes/TLightRollover/TLightRollover.h
index 21266ba..0b625ae 100644
--- a/Classes/TLightRollover/TLightRollover.h
+++ b/Classes/TLightRollover/TLightRollover.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TLIGHTROLLOVER_H
 #define PINBALL_TLIGHTROLLOVER_H
 
-#include "../../pinball.h"
-
 /* 109 */
 struct TLightRollover;
 
diff --git a/Classes/TLine/TLine.h b/Classes/TLine/TLine.h
index 8468970..ad4e402 100644
--- a/Classes/TLine/TLine.h
+++ b/Classes/TLine/TLine.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TLINE_H
 #define PINBALL_TLINE_H
 
-#include "../../pinball.h"
-
 /* 122 */
 struct TLine;
 
diff --git a/Classes/TOneWay/TOneWay.h b/Classes/TOneWay/TOneWay.h
index 63d58dd..fec3e40 100644
--- a/Classes/TOneWay/TOneWay.h
+++ b/Classes/TOneWay/TOneWay.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TONEWAY_H
 #define PINBALL_TONEWAY_H
 
-#include "../../pinball.h"
-
 /* 103 */
 struct TOneway;
 
diff --git a/Classes/TPinballComponent/TPinballComponent.h b/Classes/TPinballComponent/TPinballComponent.h
index 979d25c..496f6bc 100644
--- a/Classes/TPinballComponent/TPinballComponent.h
+++ b/Classes/TPinballComponent/TPinballComponent.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TPINBALLCOMPONENT_H
 #define PINBALL_TPINBALLCOMPONENT_H
 
-#include "../../pinball.h"
-
 /* 100 */
 struct TPinballComponent;
 
diff --git a/Classes/TPinballTable/TPinballTable.h b/Classes/TPinballTable/TPinballTable.h
index 4070e2d..4e426ac 100644
--- a/Classes/TPinballTable/TPinballTable.h
+++ b/Classes/TPinballTable/TPinballTable.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TPINBALLTABLE_H
 #define PINBALL_TPINBALLTABLE_H
 
-#include "../../pinball.h"
-
 /* 117 */
 struct TPinballTable;
 
diff --git a/Classes/TPlunger/TPlunger.h b/Classes/TPlunger/TPlunger.h
index 71dc66a..6f47c1b 100644
--- a/Classes/TPlunger/TPlunger.h
+++ b/Classes/TPlunger/TPlunger.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TPLUNGER_H
 #define PINBALL_TPLUNGER_H
 
-#include "../../pinball.h"
-
 /* 118 */
 struct TPlunger;
 
diff --git a/Classes/TPopupTarget/TPopupTarget.h b/Classes/TPopupTarget/TPopupTarget.h
index d1ac45e..671ee58 100644
--- a/Classes/TPopupTarget/TPopupTarget.h
+++ b/Classes/TPopupTarget/TPopupTarget.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TPOPUPTARGET_H
 #define PINBALL_TPOPUPTARGET_H
 
-#include "../../pinball.h"
-
 /* 106 */
 struct TPopupTarget;
 
diff --git a/Classes/TRamp/TRamp.h b/Classes/TRamp/TRamp.h
index b0705be..d3b3e08 100644
--- a/Classes/TRamp/TRamp.h
+++ b/Classes/TRamp/TRamp.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TRAMP_H
 #define PINBALL_TRAMP_H
 
-#include "../../pinball.h"
-
 /* 113 */
 struct TRamp;
 
diff --git a/Classes/TRollover/TRollover.h b/Classes/TRollover/TRollover.h
index 1cf4d2e..822b0fe 100644
--- a/Classes/TRollover/TRollover.h
+++ b/Classes/TRollover/TRollover.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TROLLOVER_H
 #define PINBALL_TROLLOVER_H
 
-#include "../../pinball.h"
-
 /* 108 */
 struct TRollover;
 
diff --git a/Classes/TSink/TSink.h b/Classes/TSink/TSink.h
index 5e3c2d8..6e7ca29 100644
--- a/Classes/TSink/TSink.h
+++ b/Classes/TSink/TSink.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TSINK_H
 #define PINBALL_TSINK_H
 
-#include "../../pinball.h"
-
 /* 114 */
 struct TSink;
 
diff --git a/Classes/TSoloTarget/TSoloTarget.h b/Classes/TSoloTarget/TSoloTarget.h
index 05c7800..3f90d5e 100644
--- a/Classes/TSoloTarget/TSoloTarget.h
+++ b/Classes/TSoloTarget/TSoloTarget.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TSOLOTARGET_H
 #define PINBALL_TSOLOTARGET_H
 
-#include "../../pinball.h"
-
 /* 107 */
 struct TSoloTarget;
 
diff --git a/Classes/TSound/TSound.h b/Classes/TSound/TSound.h
index 56bcd45..4f18785 100644
--- a/Classes/TSound/TSound.h
+++ b/Classes/TSound/TSound.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TSOUND_H
 #define PINBALL_TSOUND_H
 
-#include "../../pinball.h"
-
 /* 132 */
 struct TSound;
 
diff --git a/Classes/TTableLayer/TTableLayer.h b/Classes/TTableLayer/TTableLayer.h
index c62d4c4..b20a194 100644
--- a/Classes/TTableLayer/TTableLayer.h
+++ b/Classes/TTableLayer/TTableLayer.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TTABLELAYER_H
 #define PINBALL_TTABLELAYER_H
 
-#include "../../pinball.h"
-
 /* 116 */
 struct TTableLayer;
 
diff --git a/Classes/TTextBox/TTextbox.h b/Classes/TTextBox/TTextbox.h
index 8084f9b..150b8ea 100644
--- a/Classes/TTextBox/TTextbox.h
+++ b/Classes/TTextBox/TTextbox.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TTEXTBOX_H
 #define PINBALL_TTEXTBOX_H
 
-#include "../../pinball.h"
-
 /* 119 */
 struct TTextBox;
 
diff --git a/Classes/TTextBoxMessage/TTextBoxMessage.h b/Classes/TTextBoxMessage/TTextBoxMessage.h
index d57ac90..d6f38d9 100644
--- a/Classes/TTextBoxMessage/TTextBoxMessage.h
+++ b/Classes/TTextBoxMessage/TTextBoxMessage.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TTEXTBOXMESSAGE_H
 #define PINBALL_TTEXTBOXMESSAGE_H
 
-#include "../../pinball.h"
-
 /* 97 */
 struct TTextBoxMessage;
 
diff --git a/Classes/TTimer/TTimer.h b/Classes/TTimer/TTimer.h
index 6d44067..da61897 100644
--- a/Classes/TTimer/TTimer.h
+++ b/Classes/TTimer/TTimer.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TTIMER_H
 #define PINBALL_TTIMER_H
 
-#include "../../pinball.h"
-
 /* 129 */
 struct TTimer;
 
diff --git a/Classes/TTripwire/TTripwire.h b/Classes/TTripwire/TTripwire.h
index 345b593..b756389 100644
--- a/Classes/TTripwire/TTripwire.h
+++ b/Classes/TTripwire/TTripwire.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TTRIPWIRE_H
 #define PINBALL_TTRIPWIRE_H
 
-#include "../../pinball.h"
-
 /* 131 */
 struct TTripwire;
 
diff --git a/Classes/TWall/TWall.h b/Classes/TWall/TWall.h
index b2367b0..184eeb6 100644
--- a/Classes/TWall/TWall.h
+++ b/Classes/TWall/TWall.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TWALL_H
 #define PINBALL_TWALL_H
 
-#include "../../pinball.h"
-
 /* 102 */
 struct TWall;
 
diff --git a/Classes/TZmapList/TZmaplist.h b/Classes/TZmapList/TZmaplist.h
index 703bad6..47c58bd 100644
--- a/Classes/TZmapList/TZmaplist.h
+++ b/Classes/TZmapList/TZmaplist.h
@@ -2,11 +2,11 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TZMAPLIST_H
 #define PINBALL_TZMAPLIST_H
 
-#include "../../pinball.h"
-
 /* 126 */
 struct TZmapList;
 
diff --git a/Classes/TlightGroup/TLightGroup.h b/Classes/TlightGroup/TLightGroup.h
index 31f5ec1..cdf32f1 100644
--- a/Classes/TlightGroup/TLightGroup.h
+++ b/Classes/TlightGroup/TLightGroup.h
@@ -2,6 +2,8 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../../pinball.h"
+
 #ifndef PINBALL_TLIGHTGROUP_H
 #define PINBALL_TLIGHTGROUP_H