main.cpp includes cleanup