Move arch headers from ./lib/include

fix #1510