Fix make distcheck (up until uninstall check)

Change-Id: I0a963766fa4b4494e7eca53a6edd613632f6cbe1