Corrected .h-files to nolonger having relative includes