fix the bug of not having vi defined in header.cpp

also changed tab to space and reordered includes alphabetically. Also removed rep marco.