- Use standard file's layout - Fix build with clang
Reported by: kris Approved by: portmgr (marcus), fjoe (mentor, implicit), maintainer