i moved the sim header to the sim patch and pushed that first, then the gdb one.  
i don't like having commits that are not bisectable, nor having to squash large 
ones to avoid.

see attached patches for what went in.

thanks for the port!
-mike