Remove unnecessary declarations.
Remove unnecessary declarations. Fix the install-
target to install in the proper directory.