Move libpq to apache