The last os2 patch finishes the move of all .h files to arch/ excepting mmap/unix/mm/mm.h, which we all agreed stays put since that is a package private to unix.
Brian, please test, beat on me if it breaks anything and I'll revert as you propose. -Before- you beat on me, please look at apr.hw to see what this accomplished for us on this side.