Proper includes to avoid per machine differences