Added proper references to includes in src files