os.h ERGO part removed
colormap.h some function protoypes changed
funcs.h    some function protoypes changed
some file names have been restored to its original names
from X11R4 sources (their names are longer than 8 chars)
serial.h added