Header file and package fixes.