Fix includes for analytics