Move more public-api headers to devel-api. PART 3