NF: I fixed the Makefiles header dependencies