Fix header includes, remove old encryption files