Code cleanup.
code cleanup (cppcheck)
code cleanup: make more functions static or include their own headers.
moving trunk for module inkscape