Use tabs for indentation
Marks -h and -v as deprecated options
Removes unnecessary includes