Added the missing hpp files after the change