Fixed some dependencies to be compile time only.