Box2d definitions

Try this again with the branch merges fixed and single file.