Fixed includes issue in .h files