I'm looking at creating a patch that adds // _SOMETHING_H to the #endif of .h-files in the Haiku source. Do we want this? Any paths in particular that should have a C-style comment instead? (Does it matter anymore?) I take it the format should be: C++ #endif<tab>//<space><whatever the header guard #ifndef:ed> C #endif<tab>/*<space><whatever the header guard #ifndef:ed><space>*/ I suppose one could make a script or BApp to automate this. I can try the BApp route, unless somebody else with decent shell scripting skills steps up and takes on the task. /Jonas.