Fix header and source declaration