fixing inclusion order for bundler’s sake