Minimize source includes

Only include file reordering/removing in otlib sources.
No actual code touched.