Merge "minadbd: remove unnecessary header files."