Some of these were introduced after the Makefile was written. Adding them guarentees fewer issues down the road. Also did some small reorganization for consistency between packages. Signed-off-by: Rosen Penev <rosenp@gmail.com>