Move the OTIO macro to define.h to avoid having to add it to all required files. Also add some cleanup.