Added includes back in for minify