Mix fewer declarations and code
Mix fewer declarations and code

git-svn-id: 0e603907cfa4f06ae5dc5acf3d8fa5d387d7bd3e@9374 aec4f576-4910-0410-beeb-ecb0427469e7

cc-archive/liblicense,cc-archive/liblicense,cc-archive/liblicense,cc-archive/liblicense,cc-archive/liblicense,cc-archive/liblicense