Merge change I57515f33 into eclair-mr2

* changes:
  Moving the individual extractor headers files to the private include directory.