S no longer includes types and constants - include directly if you need them