as an example, take Modules/termios.c: there's a bunch of #include magic to (I assume) help the build process on different boxes. I don't have access to all of these boxes to test it. In general, I'm going to _assume_ that platform-specific fixes on the trunk have been made and then tested to be sane - and that they're ok for the branch. In particular, the Max and OS/2 stuff could generously be referred to as deep dark bad magic from where I am...