Fix order of inclusions (#28)