This patch inlines the file (it only contained two lines) at all its #include points. committed, Andrew