includes and visibility fix for gcc