Re-port ReverbSample to new header structure