changes includes in test programs to use splitted header