Merge otsystem.h into definitions.h