Oops, garbage includes
Merge branch 'ios-optimization' into midi-callbacks-or-something-like-that