Merge pull request #3975 from lioncash/header FifoPlayer: Remove unnecessary headers/namespace cleanup
