Addition to issue-415: removal of h in files