Library - fixes

Include fixes