Only minor change was to make sure all defines were before the structs in spoe-t.h, everything else went smoothly.