fixed #792
inline functions in headers are now marked as static
(cherry picked from commit a48c7fe)
inline functions in headers are now marked as static
(cherry picked from commit cb0db50)