am d919aa74: am 9069aa31: Merge change I57515f33 into eclair-mr2

Merge commit 'd919aa74927fcabd18a9ea14a57f44240aecc7af'

* commit 'd919aa74927fcabd18a9ea14a57f44240aecc7af':
  Moving the individual extractor headers files to the private include directory.