Merge "Moving include to static." into klp-dev