Merge "Revert "Extra audio headers for better build-time compatibility""