After commit ec5fa016 "replace all but one .hdl include with equivalent .hpp includes" some of these includes were doubled in the corresponding files. This patch deletes those duplicates.