Switch to external lib

Update and order headers.