Fixed more declarations to define their members at global scope.