Minimize Source Includes

Only reordering/removing of include files in otlib sources.
No actual code was touched.