Simplify includes
Use pkg-config