RRCP: don't include unneeded headers
VJC: NDOize