Removed dependencies to global lib and inc