forgot to impliment conditional compilation in my headers

also updated a line for cleanup in my bash script too