Thanks, worked like a charm. I also had to edit sdl12/Makefile.cfg and replace all references of "sdl/" with "sdl12/", but once I did that everything was just peachy.
I'm thinking the changes to sdl12/Makefile.cfg should be committed upstream, the workaround includes should be specified in a...