Better include arrangement