Also, a number of changes were made based on the assumption that
rds.h wasn't exported, so roll these back.
Signed-off-by: NAndy Grover <andy.grover@oracle.com>