Fix includes

Makes the library more modular