Add cpphs as build-depends to make lens happy
Reorder SRCS in Makefile to make things compile cleanly