Functions' headers reorganization