Move logger/analyzer includes back to the top