Fixed this branch like the other one, so that configure/make works. Need to add .ext stuff in next commit.