Moved some #include and fixed server things (still doesn't compile)
Authored by: surfdargent 2002-10-21
Parent: [r4700]
Child: [r4702]