Fix dependencies in builds so that files correctly know about header files, etc

[jt-traub]

Maybe also move from recursive to non-recursive make but that's less important to me.