Update oes_types.h

Fix various compilation issues