API check, makefile updates