[refactor] removed unsused header includes;
[syscall] merge fix;