Header file handling in specs corrected