Inclusion cleanup in Map to avoid dep-hell.
Include cleanup in QueryGenerator to avoid dep-hell.
Include cleanup in Database to avoid dep-hell.
Include cleanup in Screen to avoid dep-hell.
Inclusion cleanup in Layer to avoid dep-hell.
Inclusion cleanup in Drawable to avoid dep-hell.
Inclusion cleanup in GraphicsEngine to avoid dep-hell.
Inclusion cleanup in Dialog to avoid dep-hell.
Inclusion cleanup in GuiFactory to avoid dep-hell.
Inclusion cleanup in Theme to avoid dep-hell.
Various inclusion cleanup in database classes.
Inclusion cleanup in DrawableFactory to avoid dep-hell.
Inclusion cleanup in MapObject to avoid dep-hell.
Inclusion cleanup in MapObjectFactory to avoid dep-hell.
Inclusion cleanup in Inventory to avoid dep-hell.