Remove inline functions and cpp includes