diff --git a/Classes/Objlist/objlist.h b/Classes/Objlist/objlist.h
index 8258a81..6319d49 100644
--- a/Classes/Objlist/objlist.h
+++ b/Classes/Objlist/objlist.h
@@ -5,4 +5,6 @@
 #ifndef PINBALL_OBJLIST_CLASS_H
 #define PINBALL_OBJLIST_CLASS_H
 
+#include "../../pinball.h"
+
 #endif //PINBALL_OBJLIST_CLASS_H
diff --git a/Classes/TBall/TBall.h b/Classes/TBall/TBall.h
index dab579c..665aac3 100644
--- a/Classes/TBall/TBall.h
+++ b/Classes/TBall/TBall.h
@@ -5,4 +5,6 @@
 #ifndef PINBALL_TBALL_H
 #define PINBALL_TBALL_H
 
+#include "../../pinball.h"
+
 #endif //PINBALL_TBALL_H
diff --git a/Classes/TBlocker/TBlocker.cpp b/Classes/TBlocker/TBlocker.cpp
index 6487287..85e1fbd 100644
--- a/Classes/TBlocker/TBlocker.cpp
+++ b/Classes/TBlocker/TBlocker.cpp
@@ -1,4 +1,4 @@
-#include "../../pinball.h"
+#include "TBlocker.h"
 
 //----- (0101631C) --------------------------------------------------------
 int __thiscall TBlocker::Message(TBlocker *this, int a2, float a3)
diff --git a/Classes/TBlocker/TBlocker.h b/Classes/TBlocker/TBlocker.h
new file mode 100644
index 0000000..a3a0ef6
--- /dev/null
+++ b/Classes/TBlocker/TBlocker.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TBLOCKER_H
+#define PINBALL_TBLOCKER_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TBLOCKER_H
diff --git a/Classes/TBumper/TBumper.cpp b/Classes/TBumper/TBumper.cpp
index e92f316..62e2ed2 100644
--- a/Classes/TBumper/TBumper.cpp
+++ b/Classes/TBumper/TBumper.cpp
@@ -1,4 +1,4 @@
-#include "../../pinball.h"
+#include "TBumper.h"
 
 //----- (01015CB2) --------------------------------------------------------
 void __stdcall TBumper::TimerExpired(int a1, void *a2)
diff --git a/Classes/TBumper/TBumper.h b/Classes/TBumper/TBumper.h
new file mode 100644
index 0000000..e179667
--- /dev/null
+++ b/Classes/TBumper/TBumper.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TBUMPER_H
+#define PINBALL_TBUMPER_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TBUMPER_H
diff --git a/Classes/TCircle/TCircle.cpp b/Classes/TCircle/TCircle.cpp
index b406f12..ed05bd2 100644
--- a/Classes/TCircle/TCircle.cpp
+++ b/Classes/TCircle/TCircle.cpp
@@ -1,4 +1,4 @@
-#include "../../pinball.h"
+#include "TCircle.h"
 
 //----- (01015898) --------------------------------------------------------
 TCircle *__thiscall TCircle::TCircle(TCircle *this, struct TCollisionComponent *a2, char *a3, unsigned int a4, struct vector_type *a5, float a6)
diff --git a/Classes/TCircle/TCircle.h b/Classes/TCircle/TCircle.h
new file mode 100644
index 0000000..55e9aaf
--- /dev/null
+++ b/Classes/TCircle/TCircle.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TCIRCLE_H
+#define PINBALL_TCIRCLE_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TCIRCLE_H
diff --git a/Classes/TCollisionComponent/TCollisionComponent.cpp b/Classes/TCollisionComponent/TCollisionComponent.cpp
index 555c3b9..e81d717 100644
--- a/Classes/TCollisionComponent/TCollisionComponent.cpp
+++ b/Classes/TCollisionComponent/TCollisionComponent.cpp
@@ -1,4 +1,4 @@
-#include "../../pinball.h"
+#include "TCollisionComponent.h"
 
 //----- (01015A9A) --------------------------------------------------------
 void __thiscall TCollisionComponent::port_draw(TCollisionComponent *this)
diff --git a/Classes/TCollisionComponent/TCollisionComponent.h b/Classes/TCollisionComponent/TCollisionComponent.h
new file mode 100644
index 0000000..8988bda
--- /dev/null
+++ b/Classes/TCollisionComponent/TCollisionComponent.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TCOLLISIONCOMPONENT_H
+#define PINBALL_TCOLLISIONCOMPONENT_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TCOLLISIONCOMPONENT_H
diff --git a/Classes/TComponentGroup/TComponentGroup.cpp b/Classes/TComponentGroup/TComponentGroup.cpp
index 0c368b8..db2fd33 100644
--- a/Classes/TComponentGroup/TComponentGroup.cpp
+++ b/Classes/TComponentGroup/TComponentGroup.cpp
@@ -1,4 +1,4 @@
-#include "../../pinball.h"
+#include "TComponentGroup.h"
 
 //----- (010159DC) --------------------------------------------------------
 void __stdcall TComponentGroup::NotifyTimerExpired(int a1, struct TPinballComponent *a2)
diff --git a/Classes/TComponentGroup/TComponentGroup.h b/Classes/TComponentGroup/TComponentGroup.h
new file mode 100644
index 0000000..c659465
--- /dev/null
+++ b/Classes/TComponentGroup/TComponentGroup.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TCOMPONENTGROUP_H
+#define PINBALL_TCOMPONENTGROUP_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TCOMPONENTGROUP_H
diff --git a/Classes/TDemo/TDemo.cpp b/Classes/TDemo/TDemo.cpp
index 6224c2d..951db39 100644
--- a/Classes/TDemo/TDemo.cpp
+++ b/Classes/TDemo/TDemo.cpp
@@ -1,4 +1,4 @@
-#include "../../pinball.h"
+#include "TDemo.h"
 
 //----- (01016D62) --------------------------------------------------------
 void __stdcall TDemo::PlungerRelease(int a1, void *a2)
diff --git a/Classes/TDemo/TDemo.h b/Classes/TDemo/TDemo.h
new file mode 100644
index 0000000..9d4813a
--- /dev/null
+++ b/Classes/TDemo/TDemo.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TDEMO_H
+#define PINBALL_TDEMO_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TDEMO_H
diff --git a/Classes/TDrain/TDrain.cpp b/Classes/TDrain/TDrain.cpp
index 07091b6..83dbe42 100644
--- a/Classes/TDrain/TDrain.cpp
+++ b/Classes/TDrain/TDrain.cpp
@@ -1,4 +1,4 @@
-#include "../../pinball.h"
+#include "TDrain.h"
 
 //----- (010172A3) --------------------------------------------------------
 int __thiscall TDrain::Message(TDrain *this, int a2, float a3)
diff --git a/Classes/TDrain/TDrain.h b/Classes/TDrain/TDrain.h
new file mode 100644
index 0000000..80de8f1
--- /dev/null
+++ b/Classes/TDrain/TDrain.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TDRAIN_H
+#define PINBALL_TDRAIN_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TDRAIN_H
diff --git a/Classes/TEdgeSegment/TEdgeSegment.cpp b/Classes/TEdgeSegment/TEdgeSegment.cpp
index c2170fa..dd075f7 100644
--- a/Classes/TEdgeSegment/TEdgeSegment.cpp
+++ b/Classes/TEdgeSegment/TEdgeSegment.cpp
@@ -1,4 +1,4 @@
-#include "../../pinball.h"
+#include "TEdgeSegment.h
 
 //----- (01015866) --------------------------------------------------------
 TEdgeSegment *__thiscall TEdgeSegment::TEdgeSegment(TEdgeSegment *this, struct TCollisionComponent *a2, char *a3, unsigned int a4)
diff --git a/Classes/TEdgeSegment/TEdgeSegment.h b/Classes/TEdgeSegment/TEdgeSegment.h
new file mode 100644
index 0000000..b89179d
--- /dev/null
+++ b/Classes/TEdgeSegment/TEdgeSegment.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TEDGESEGMENT_H
+#define PINBALL_TEDGESEGMENT_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TEDGESEGMENT_H
diff --git a/Classes/TFlagSpinner/TFlagSpinner.cpp b/Classes/TFlagSpinner/TFlagSpinner.cpp
index c75f9f1..7906a9b 100644
--- a/Classes/TFlagSpinner/TFlagSpinner.cpp
+++ b/Classes/TFlagSpinner/TFlagSpinner.cpp
@@ -1,4 +1,4 @@
-#include "../../pinball.h"
+#include "TFlagSpinner.h"
 
 //----- (01015F34) --------------------------------------------------------
 void __stdcall TFlagSpinner::SpinTimer(int a1, void *a2)
diff --git a/Classes/TFlagSpinner/TFlagSpinner.h b/Classes/TFlagSpinner/TFlagSpinner.h
new file mode 100644
index 0000000..53b3645
--- /dev/null
+++ b/Classes/TFlagSpinner/TFlagSpinner.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TFLAGSPINNER_H
+#define PINBALL_TFLAGSPINNER_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TFLAGSPINNER_H
diff --git a/Classes/TFlipper/TFlipper.cpp b/Classes/TFlipper/TFlipper.cpp
index f937744..9e7241c 100644
--- a/Classes/TFlipper/TFlipper.cpp
+++ b/Classes/TFlipper/TFlipper.cpp
@@ -1,4 +1,4 @@
-#include "../../pinball.h"
+#include "TFlipper.h"
 
 
 //----- (0101C047) --------------------------------------------------------
diff --git a/Classes/TFlipper/TFlipper.h b/Classes/TFlipper/TFlipper.h
new file mode 100644
index 0000000..4f7f466
--- /dev/null
+++ b/Classes/TFlipper/TFlipper.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TFLIPPER_H
+#define PINBALL_TFLIPPER_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TFLIPPER_H
diff --git a/Classes/TFlipperEdge/TFlipperEdge.cpp b/Classes/TFlipperEdge/TFlipperEdge.cpp
index 5cc0673..7df5fe7 100644
--- a/Classes/TFlipperEdge/TFlipperEdge.cpp
+++ b/Classes/TFlipperEdge/TFlipperEdge.cpp
@@ -1,4 +1,4 @@
-#include "../../pinball.h"
+#include "TFlipperEdge.h"
 
 //----- (0101B0D4) --------------------------------------------------------
 void __thiscall TFlipperEdge::place_in_grid(TFlipperEdge *this)
diff --git a/Classes/TFlipperEdge/TFlipperEdge.h b/Classes/TFlipperEdge/TFlipperEdge.h
new file mode 100644
index 0000000..edc38e7
--- /dev/null
+++ b/Classes/TFlipperEdge/TFlipperEdge.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TFLIPPEREDGE_H
+#define PINBALL_TFLIPPEREDGE_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TFLIPPEREDGE_H
diff --git a/Classes/TGate/TGate.h b/Classes/TGate/TGate.h
new file mode 100644
index 0000000..f49a309
--- /dev/null
+++ b/Classes/TGate/TGate.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TGATE_H
+#define PINBALL_TGATE_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TGATE_H
diff --git a/Classes/THole/THole.h b/Classes/THole/THole.h
new file mode 100644
index 0000000..910ebbd
--- /dev/null
+++ b/Classes/THole/THole.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_THOLE_H
+#define PINBALL_THOLE_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_THOLE_H
diff --git a/Classes/TKickback/TKickback.h b/Classes/TKickback/TKickback.h
new file mode 100644
index 0000000..d021448
--- /dev/null
+++ b/Classes/TKickback/TKickback.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TKICKBACK_H
+#define PINBALL_TKICKBACK_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TKICKBACK_H
diff --git a/Classes/TKickout/TKickout.h b/Classes/TKickout/TKickout.h
new file mode 100644
index 0000000..927b9e8
--- /dev/null
+++ b/Classes/TKickout/TKickout.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TKICKOUT_H
+#define PINBALL_TKICKOUT_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TKICKOUT_H
diff --git a/Classes/TLightRollover/TLightRollover.cpp b/Classes/TLightRollover/TLightRollover.cpp
index b2a5b93..b1f44bf 100644
--- a/Classes/TLightRollover/TLightRollover.cpp
+++ b/Classes/TLightRollover/TLightRollover.cpp
@@ -1,4 +1,4 @@
-#include "../../pinball.h"
+#include "TLightRollover.h"
 
 //----- (010164D1) --------------------------------------------------------
 void __stdcall TLightRollover::delay_expired(int a1, void *a2)
diff --git a/Classes/TLightRollover/TLightRollover.h b/Classes/TLightRollover/TLightRollover.h
new file mode 100644
index 0000000..7e134f1
--- /dev/null
+++ b/Classes/TLightRollover/TLightRollover.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TLIGHTROLLOVER_H
+#define PINBALL_TLIGHTROLLOVER_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TLIGHTROLLOVER_H
diff --git a/Classes/TLine/TLine.cpp b/Classes/TLine/TLine.cpp
index a40170e..96940d7 100644
--- a/Classes/TLine/TLine.cpp
+++ b/Classes/TLine/TLine.cpp
@@ -1,4 +1,4 @@
-#include "../../pinball.h"
+#include "TLine.h"
 
 //----- (0101C6FD) --------------------------------------------------------
 TLine *__thiscall TLine::TLine(TLine *this, struct TCollisionComponent *a2, char *a3, unsigned int a4, float a5, float a6, float a7, float a8)
diff --git a/Classes/TLine/TLine.h b/Classes/TLine/TLine.h
new file mode 100644
index 0000000..f2e2527
--- /dev/null
+++ b/Classes/TLine/TLine.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TLINE_H
+#define PINBALL_TLINE_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TLINE_H
diff --git a/Classes/TOneWay/TOneWay.cpp b/Classes/TOneWay/TOneWay.cpp
index 5bd38a5..8349788 100644
--- a/Classes/TOneWay/TOneWay.cpp
+++ b/Classes/TOneWay/TOneWay.cpp
@@ -1,5 +1,4 @@
-
-#include "../../pinball.h"
+#include "TOneWay.h"
 
 //----- (01015B61) --------------------------------------------------------
 int __thiscall TOneway::get_scoring(TOneway *this, int a2)
diff --git a/Classes/TOneWay/TOneWay.h b/Classes/TOneWay/TOneWay.h
new file mode 100644
index 0000000..aa91f22
--- /dev/null
+++ b/Classes/TOneWay/TOneWay.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TONEWAY_H
+#define PINBALL_TONEWAY_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TONEWAY_H
diff --git a/Classes/TPinballTable/TPinballTable.cpp b/Classes/TPinballTable/TPinballTable.cpp
index 4543e54..61a2ba7 100644
--- a/Classes/TPinballTable/TPinballTable.cpp
+++ b/Classes/TPinballTable/TPinballTable.cpp
@@ -1,4 +1,4 @@
-#include "../../pinball.h"
+#include "TPinballTable.h"
 
 //----- (01017467) --------------------------------------------------------
 void __stdcall TPinballTable::LightShow_timeout(int a1, void *a2)
diff --git a/Classes/TPinballTable/TPinballTable.h b/Classes/TPinballTable/TPinballTable.h
new file mode 100644
index 0000000..022b667
--- /dev/null
+++ b/Classes/TPinballTable/TPinballTable.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TPINBALLTABLE_H
+#define PINBALL_TPINBALLTABLE_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TPINBALLTABLE_H
diff --git a/Classes/TPlunger/TPlunger.cpp b/Classes/TPlunger/TPlunger.cpp
index 5aca65d..2fec5db 100644
--- a/Classes/TPlunger/TPlunger.cpp
+++ b/Classes/TPlunger/TPlunger.cpp
@@ -1,5 +1,4 @@
-#include "../../pinball.h"
-
+#include "TPlunger.h"
 
 //----- (010172F0) --------------------------------------------------------
 void __stdcall TPlunger::BallFeedTimer(int a1, void *a2)
diff --git a/Classes/TPlunger/TPlunger.h b/Classes/TPlunger/TPlunger.h
new file mode 100644
index 0000000..6f692b5
--- /dev/null
+++ b/Classes/TPlunger/TPlunger.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TPLUNGER_H
+#define PINBALL_TPLUNGER_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TPLUNGER_H
diff --git a/Classes/TPopupTarget/TPopupTarget.cpp b/Classes/TPopupTarget/TPopupTarget.cpp
index 8cc64f1..7e40f42 100644
--- a/Classes/TPopupTarget/TPopupTarget.cpp
+++ b/Classes/TPopupTarget/TPopupTarget.cpp
@@ -1,4 +1,4 @@
-#include "../../pinball.h"
+#include "TPopupTarget.h"
 
 //----- (010160B3) --------------------------------------------------------
 void __stdcall TPopupTarget::TimerExpired(int a1, void *a2)
diff --git a/Classes/TPopupTarget/TPopupTarget.h b/Classes/TPopupTarget/TPopupTarget.h
new file mode 100644
index 0000000..eaba3d4
--- /dev/null
+++ b/Classes/TPopupTarget/TPopupTarget.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TPOPUPTARGET_H
+#define PINBALL_TPOPUPTARGET_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TPOPUPTARGET_H
diff --git a/Classes/TRamp/TRamp.cpp b/Classes/TRamp/TRamp.cpp
index 7a3fff9..711f02f 100644
--- a/Classes/TRamp/TRamp.cpp
+++ b/Classes/TRamp/TRamp.cpp
@@ -1,4 +1,4 @@
-#include "../../pinball.h"
+#include "TRamp.h"
 
 //----- (01016AEC) --------------------------------------------------------
 int __thiscall TRamp::get_scoring(TRamp *this, int a2)
diff --git a/Classes/TRamp/TRamp.h b/Classes/TRamp/TRamp.h
new file mode 100644
index 0000000..0167707
--- /dev/null
+++ b/Classes/TRamp/TRamp.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TRAMP_H
+#define PINBALL_TRAMP_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TRAMP_H
diff --git a/Classes/TRollover/TRollover.cpp b/Classes/TRollover/TRollover.cpp
index 6298f80..b7a9312 100644
--- a/Classes/TRollover/TRollover.cpp
+++ b/Classes/TRollover/TRollover.cpp
@@ -1,4 +1,4 @@
-#include "../../pinball.h"
+#include "TRollover.h"
 
 //----- (0101644B) --------------------------------------------------------
 void __stdcall TRollover::TimerExpired(int a1, void *a2)
diff --git a/Classes/TRollover/TRollover.h b/Classes/TRollover/TRollover.h
new file mode 100644
index 0000000..50039b8
--- /dev/null
+++ b/Classes/TRollover/TRollover.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TROLLOVER_H
+#define PINBALL_TROLLOVER_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TROLLOVER_H
diff --git a/Classes/TSink/TSink.cpp b/Classes/TSink/TSink.cpp
index 89df5c0..6d025a2 100644
--- a/Classes/TSink/TSink.cpp
+++ b/Classes/TSink/TSink.cpp
@@ -1,4 +1,4 @@
-#include "../../pinball.h"
+#include "TSink.h"
 
 //----- (01017130) --------------------------------------------------------
 void __stdcall TSink::TimerExpired(int a1, void *a2)
diff --git a/Classes/TSink/TSink.h b/Classes/TSink/TSink.h
new file mode 100644
index 0000000..80b62f6
--- /dev/null
+++ b/Classes/TSink/TSink.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TSINK_H
+#define PINBALL_TSINK_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TSINK_H
diff --git a/Classes/TSoloTarget/TSoloTarget.cpp b/Classes/TSoloTarget/TSoloTarget.cpp
index 453d384..3aa5273 100644
--- a/Classes/TSoloTarget/TSoloTarget.cpp
+++ b/Classes/TSoloTarget/TSoloTarget.cpp
@@ -1,4 +1,4 @@
-#include "../../pinball.h"
+#include "TSoloTarget.h"
 
 //----- (01016230) --------------------------------------------------------
 int __thiscall TSoloTarget::Message(TSoloTarget *this, int a2, float a3)
diff --git a/Classes/TSoloTarget/TSoloTarget.h b/Classes/TSoloTarget/TSoloTarget.h
new file mode 100644
index 0000000..ab0b6e6
--- /dev/null
+++ b/Classes/TSoloTarget/TSoloTarget.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TSOLOTARGET_H
+#define PINBALL_TSOLOTARGET_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TSOLOTARGET_H
diff --git a/Classes/TTableLayer/TTableLayer.cpp b/Classes/TTableLayer/TTableLayer.cpp
index 1db1e7e..79f504c 100644
--- a/Classes/TTableLayer/TTableLayer.cpp
+++ b/Classes/TTableLayer/TTableLayer.cpp
@@ -1,4 +1,4 @@
-#include "../../pinball.h"
+#include "TTableLayer.h"
 
 //----- (010173E7) --------------------------------------------------------
 int __thiscall TTableLayer::FieldEffect(TTableLayer *this, struct TBall *a2, struct vector_type *a3)
diff --git a/Classes/TTableLayer/TTableLayer.h b/Classes/TTableLayer/TTableLayer.h
new file mode 100644
index 0000000..0386f9f
--- /dev/null
+++ b/Classes/TTableLayer/TTableLayer.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TTABLELAYER_H
+#define PINBALL_TTABLELAYER_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TTABLELAYER_H
diff --git a/Classes/TTextBox/TTextBox.cpp b/Classes/TTextBox/TTextBox.cpp
index fd5652d..20ce600 100644
--- a/Classes/TTextBox/TTextBox.cpp
+++ b/Classes/TTextBox/TTextBox.cpp
@@ -1,4 +1,4 @@
-#include "../../pinball.h"
+#include "TTextbox.h"
 
 //----- (01014092) --------------------------------------------------------
 TTextBox *__thiscall TTextBox::TTextBox(TTextBox *this, struct TPinballTable *a2, int a3)
diff --git a/Classes/TTextBox/TTextbox.h b/Classes/TTextBox/TTextbox.h
new file mode 100644
index 0000000..831a987
--- /dev/null
+++ b/Classes/TTextBox/TTextbox.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TTEXTBOX_H
+#define PINBALL_TTEXTBOX_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TTEXTBOX_H
diff --git a/Classes/TTextBoxMessage/TTextBoxMessage.cpp b/Classes/TTextBoxMessage/TTextBoxMessage.cpp
index 002877a..1765ec9 100644
--- a/Classes/TTextBoxMessage/TTextBoxMessage.cpp
+++ b/Classes/TTextBoxMessage/TTextBoxMessage.cpp
@@ -1,4 +1,4 @@
-#include "../../pinball.h"
+#include "TTextBoxMessage.h"
 
 //----- (01013AF1) --------------------------------------------------------
 TTextBoxMessage *__thiscall TTextBoxMessage::TTextBoxMessage(TTextBoxMessage *this, char *a2, float a3)
diff --git a/Classes/TTextBoxMessage/TTextBoxMessage.h b/Classes/TTextBoxMessage/TTextBoxMessage.h
new file mode 100644
index 0000000..c6bbafd
--- /dev/null
+++ b/Classes/TTextBoxMessage/TTextBoxMessage.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TTEXTBOXMESSAGE_H
+#define PINBALL_TTEXTBOXMESSAGE_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TTEXTBOXMESSAGE_H
diff --git a/Classes/TTimer/TTimer.h b/Classes/TTimer/TTimer.h
new file mode 100644
index 0000000..a1f46a5
--- /dev/null
+++ b/Classes/TTimer/TTimer.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TTIMER_H
+#define PINBALL_TTIMER_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TTIMER_H
diff --git a/Classes/TTripwire/TTripwire.cpp b/Classes/TTripwire/TTripwire.cpp
index ce147d0..7ff0836 100644
--- a/Classes/TTripwire/TTripwire.cpp
+++ b/Classes/TTripwire/TTripwire.cpp
@@ -1,4 +1,4 @@
-#include "../../pinball.h"
+#include "TTripwire.h"
 
 //----- (010165ED) --------------------------------------------------------
 void __thiscall TTripwire::Collision(TTripwire *this, struct TBall *a2, struct vector_type *a3, struct vector_type *a4, float a5, struct TEdgeSegment *a6)
diff --git a/Classes/TTripwire/TTripwire.h b/Classes/TTripwire/TTripwire.h
new file mode 100644
index 0000000..37476b1
--- /dev/null
+++ b/Classes/TTripwire/TTripwire.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TTRIPWIRE_H
+#define PINBALL_TTRIPWIRE_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TTRIPWIRE_H
diff --git a/Classes/TWall/TWall.cpp b/Classes/TWall/TWall.cpp
index daac599..f87789b 100644
--- a/Classes/TWall/TWall.cpp
+++ b/Classes/TWall/TWall.cpp
@@ -1,4 +1,4 @@
-#include "../../pinball.h"
+#include "TWall.h"
 
 //----- (01015ACE) --------------------------------------------------------
 void __stdcall TWall::TimerExpired(int a1, void *a2)
diff --git a/Classes/TWall/TWall.h b/Classes/TWall/TWall.h
new file mode 100644
index 0000000..8a1862c
--- /dev/null
+++ b/Classes/TWall/TWall.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TWALL_H
+#define PINBALL_TWALL_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TWALL_H
diff --git a/Classes/TZmapList/TZmapList.cpp b/Classes/TZmapList/TZmapList.cpp
index ecb6dd1..19d1cfb 100644
--- a/Classes/TZmapList/TZmapList.cpp
+++ b/Classes/TZmapList/TZmapList.cpp
@@ -1,4 +1,4 @@
-#include "../../pinball.h"
+#include "TZmaplist.h"
 
 //----- (010158F0) --------------------------------------------------------
 TZmapList *__thiscall TZmapList::TZmapList(TZmapList *this, int a2, int a3)
diff --git a/Classes/TZmapList/TZmaplist.h b/Classes/TZmapList/TZmaplist.h
new file mode 100644
index 0000000..ea725a2
--- /dev/null
+++ b/Classes/TZmapList/TZmaplist.h
@@ -0,0 +1,10 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_TZMAPLIST_H
+#define PINBALL_TZMAPLIST_H
+
+#include "../../pinball.h"
+
+#endif //PINBALL_TZMAPLIST_H
diff --git a/Classes/classes.h b/Classes/classes.h
new file mode 100644
index 0000000..66f29ef
--- /dev/null
+++ b/Classes/classes.h
@@ -0,0 +1,45 @@
+//
+// Created by neo on 2019-08-15.
+//
+
+#ifndef PINBALL_CLASSES_H
+#define PINBALL_CLASSES_H
+
+#include "Objlist/objlist.h"
+#include "TBall/TBall.h"
+#include "TBumper/TBumper.h"
+#include "TCircle/TCircle.h"
+#include "TCollisionComponent/TCollisionComponent.h"
+#include "TComponentGroup/TComponentGroup.h"
+#include "TDemo/TDemo.h"
+#include "TEdgeBox/TEdgeBox.h"
+#include "TEdgeManager/TEdgeManager.h"
+#include "TEdgeSegment/TEdgeSegment.h"
+#include "TFlagSpinner/TFlagSpinner.h"
+#include "TGate/TGate.h"
+#include "THole/THole.h"
+#include "TKickback/TKickback.h"
+#include "TLight/TLight.h"
+#include "TLightBargraph/TLightBargraph.h"
+#include "TlightGroup/TLightGroup.h"
+#include "TLightRollover/TLightRollover.h"
+#include "TLine/TLine.h"
+#include "TOneWay/TOneWay.h"
+#include "TPinballComponent/TPinballComponent.h"
+#include "TPinballTable/TPinballTable.h"
+#include "TPlunger/TPlunger.h"
+#include "TPopupTarget/TPopupTarget.h"
+#include "TRamp/TRamp.h"
+#include "TRollover/TRollover.h"
+#include "TSink/TSink.h"
+#include "TSoloTarget/TSoloTarget.h"
+#include "TSound/TSound.h
+#include "TTableLayer/TTableLayer.h"
+#include "TTextBox/TTextbox.h"
+#include "TTextBoxMessage/TTextBoxMessage.h"
+#include "TTimer/TTimer.h"
+#include "TTripwire/TTripwire.h"
+#include "TWall/TWall.h"
+#include "TZmapList/TZmaplist.h"
+
+#endif //PINBALL_CLASSES_H
diff --git a/about.cpp b/Forms/about.cpp
similarity index 95%
rename from about.cpp
rename to Forms/about.cpp
index 08b73e6..e3933cc 100644
--- a/about.cpp
+++ b/Forms/about.cpp
@@ -1,6 +1,8 @@
 //
 // Created by neo on 2019-08-15.
-//
+
+
+#include "../pinball.h"
 
 //----- (0100789A) --------------------------------------------------------
 INT __stdcall a_dialog(HINSTANCE hInstance, HWND hWnd, int a3)
diff --git a/help.cpp b/Forms/help.cpp
similarity index 98%
rename from help.cpp
rename to Forms/help.cpp
index bcd03d7..be8d90f 100644
--- a/help.cpp
+++ b/Forms/help.cpp
@@ -1,4 +1,4 @@
-#include "pinball.h"
+#include "../pinball.h"
 
 //----- (0100772D) --------------------------------------------------------
 void __stdcall help_introduction(int a1, int a2)
diff --git a/highscore.cpp b/Forms/highscore.cpp
similarity index 99%
rename from highscore.cpp
rename to Forms/highscore.cpp
index fd429b8..d84cc7e 100644
--- a/highscore.cpp
+++ b/Forms/highscore.cpp
@@ -2,7 +2,7 @@
 // Created by neo on 2019-08-15.
 //
 
-#include "pinball.h"
+#include "../pinball.h"
 
 //----- (01004C3C) --------------------------------------------------------
 int __stdcall high_score_clear_table(int a1)
diff --git a/options.cpp b/Forms/options.cpp
similarity index 100%
rename from options.cpp
rename to Forms/options.cpp
diff --git a/geometry/edges.cpp b/geometry/edges.cpp
index d07c401..6455fc8 100644
--- a/geometry/edges.cpp
+++ b/geometry/edges.cpp
@@ -2,6 +2,8 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../pinball.h"
+
 //----- (0100B9C7) --------------------------------------------------------
 void __stdcall edges_insert_circle(struct circle_type *a1, struct TEdgeSegment *a2, struct field_effect_type *a3)
 {
diff --git a/graphics/flasher.cpp b/graphics/flasher.cpp
index e406ca6..f9b7f57 100644
--- a/graphics/flasher.cpp
+++ b/graphics/flasher.cpp
@@ -2,6 +2,8 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../pinball.h"
+
 //----- (01009910) --------------------------------------------------------
 void __stdcall flasher_callback(int a1, void *a2)
 {
diff --git a/graphics/render.cpp b/graphics/render.cpp
index dce8d4f..9cd5b68 100644
--- a/graphics/render.cpp
+++ b/graphics/render.cpp
@@ -1,4 +1,4 @@
-#include "pinball.h"
+#include "../pinball.h"
 
 //----- (0101304D) --------------------------------------------------------
 void __stdcall render_repaint(struct render_sprite_type_struct *a1)
diff --git a/graphics/splash.cpp b/graphics/splash.cpp
index 12a4ea9..9e9253c 100644
--- a/graphics/splash.cpp
+++ b/graphics/splash.cpp
@@ -2,6 +2,8 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "../pinball.h"
+
 //----- (01006D96) --------------------------------------------------------
 HPALETTE __stdcall splash_init_palette(LOGPALETTE *plpal)
 {
diff --git a/missions.cpp b/missions.cpp
index 7d8a102..c4261d6 100644
--- a/missions.cpp
+++ b/missions.cpp
@@ -1,3 +1,5 @@
+#include"pinball.h"
+
 //----- (0100E657) --------------------------------------------------------
 void __userpurge WaitingDeploymentController(int a1@<ebx>, int a2, struct TPinballComponent *a3)
 {
diff --git a/pinball.h b/pinball.h
index f975f67..ebcabf1 100644
--- a/pinball.h
+++ b/pinball.h
@@ -2,6 +2,8 @@
 // Created by neo on 2019-08-15.
 //
 
+#include "Classes/classes.h"
+
 #ifndef PINBALL_PINBALL_H
 #define PINBALL_PINBALL_H
 
diff --git a/wavemix.cpp b/sound/wavemix.cpp
similarity index 99%
rename from wavemix.cpp
rename to sound/wavemix.cpp
index daac4b8..a832f56 100644
--- a/wavemix.cpp
+++ b/sound/wavemix.cpp
@@ -1,4 +1,4 @@
-#include "pinball.h"
+#include "../pinball.h"
 
 //----- (0101CFD0) --------------------------------------------------------
 _WORD *__stdcall SessionToGlobalDataPtr(_WORD *a1)
diff --git a/vectors.cpp b/vectors.cpp
index c2f817d..1b4fec0 100644
--- a/vectors.cpp
+++ b/vectors.cpp
@@ -1,3 +1,5 @@
+#include "pinball.h"
+
 //----- (0101CB8E) --------------------------------------------------------
 void __stdcall vector_add(struct vector_type *a1, struct vector_type *a2)
 {