Got rid of using-s in headers.
Added wc Makefile target.