Add lib and includes