Simplify the inclusion processing
Clean up examples