Attached patch removes a couple of extern definitions from adminpack,
replacing some of them with a #include. (Cam eup with this because we
got a duplicate definition of DataDir when building with Visual C++).
Seems much more correct to pull in the header file that has the
definition, and only do that.
//Magnus
