Simplified includes