[ADD] Missing util

[MOD] Adding some header check with #ifndef