cache.h before system includes to avoid duplicate include warnings
- except for stddef.h, which should come before cache.h to avoid warnings on
  Linux/gcc
some reordering for the same reason
remove some unused includes
misc cleanup

Still incomplete