Fix all the things
Add deps to header files