Removed config include from types.h and included separately to reduce
linkage
Updated includes to reduce linnkage, remove types.h usage
Removed types.h as now unused