inlining of functions and and fixing of old includes