[*] FO : Move header modules to new hook, last part 2/2