handle restructure of C library, get machine type cleanly