diff --git a/com.oracle.truffle.r.native/fficall/src/common/rffi_upcallsindex.h b/com.oracle.truffle.r.native/fficall/src/common/rffi_upcallsindex.h
index 1a22cd98dfbba24eace2ea14d2018ba2c14d7d1e..17342d6c375d1ce3e1d05d79fff0bf5bb8be3de4 100644
--- a/com.oracle.truffle.r.native/fficall/src/common/rffi_upcallsindex.h
+++ b/com.oracle.truffle.r.native/fficall/src/common/rffi_upcallsindex.h
@@ -116,281 +116,172 @@
 #define Rf_copyListMatrix_x 111
 #define Rf_copyMatrix_x 112
 #define Rf_copyMostAttrib_x 113
-#define Rf_dchisq_x 114
-#define Rf_defineVar_x 115
-#define Rf_dnchisq_x 116
-#define Rf_dunif_x 117
-#define Rf_duplicate_x 118
-#define Rf_error_x 119
-#define Rf_errorcall_x 120
-#define Rf_eval_x 121
-#define Rf_findFun_x 122
-#define Rf_findVar_x 123
-#define Rf_findVarInFrame_x 124
-#define Rf_findVarInFrame3_x 125
-#define Rf_getAttrib_x 126
-#define Rf_gsetVar_x 127
-#define Rf_inherits_x 128
-#define Rf_install_x 129
-#define Rf_installChar_x 130
-#define Rf_isNull_x 131
-#define Rf_isString_x 132
-#define Rf_lengthgets_x 133
-#define Rf_match_x 134
-#define Rf_mkCharLenCE_x 135
-#define Rf_namesgets_x 136
-#define Rf_ncols_x 137
-#define Rf_nrows_x 138
-#define Rf_pchisq_x 139
-#define Rf_pnchisq_x 140
-#define Rf_protect_x 141
-#define Rf_punif_x 142
-#define Rf_qchisq_x 143
-#define Rf_qnchisq_x 144
-#define Rf_qunif_x 145
-#define Rf_rchisq_x 146
-#define Rf_rnchisq_x 147
-#define Rf_runif_x 148
-#define Rf_setAttrib_x 149
-#define Rf_str2type_x 150
-#define Rf_unprotect_x 151
-#define Rf_unprotect_ptr_x 152
-#define Rf_warning_x 153
-#define Rf_warningcall_x 154
-#define Rprintf_x 155
-#define SETCAD4R_x 156
-#define SETCADDDR_x 157
-#define SETCADDR_x 158
-#define SETCADR_x 159
-#define SETCAR_x 160
-#define SETCDR_x 161
-#define SET_BODY_x 162
-#define SET_CLOENV_x 163
-#define SET_FORMALS_x 164
-#define SET_NAMED_FASTR_x 165
-#define SET_RDEBUG_x 166
-#define SET_RSTEP_x 167
-#define SET_S4_OBJECT_x 168
-#define SET_STRING_ELT_x 169
-#define SET_SYMVALUE_x 170
-#define SET_TAG_x 171
-#define SET_TYPEOF_FASTR_x 172
-#define SET_VECTOR_ELT_x 173
-#define STRING_ELT_x 174
-#define SYMVALUE_x 175
-#define TAG_x 176
-#define TYPEOF_x 177
-#define UNSET_S4_OBJECT_x 178
-#define VECTOR_ELT_x 179
-#define forceSymbols_x 180
-#define getCCallable_x 181
-#define getConnectionClassString_x 182
-#define getEmbeddingDLLInfo_x 183
-#define getOpenModeString_x 184
-#define getSummaryDescription_x 185
-#define isSeekable_x 186
-#define octsize_x 187
-#define registerCCallable_x 188
-#define registerRoutines_x 189
-#define restoreHandlerStacks_x 190
-#define setDotSymbolValues_x 191
-#define unif_rand_x 192
-#define useDynamicSymbols_x 193
-#define Rf_any_duplicated3_x 102
-#define Rf_asChar_x 103
-#define Rf_asCharacterFactor_x 104
-#define Rf_asInteger_x 105
-#define Rf_asLogical_x 106
-#define Rf_asReal_x 107
-#define Rf_classgets_x 108
-#define Rf_coerceVector_x 109
-#define Rf_cons_x 110
-#define Rf_copyListMatrix_x 111
-#define isSeekable_x 186
-#define octsize_x 187
-#define registerCCallable_x 188
-#define registerRoutines_x 189
-#define restoreHandlerStacks_x 190
-#define setDotSymbolValues_x 191
-#define unif_rand_x 192
-#define useDynamicSymbols_x 193
-#define Rf_asChar_x 102
-#define Rf_asCharacterFactor_x 103
-#define Rf_asInteger_x 104
-#define Rf_asLogical_x 105
-#define Rf_asReal_x 106
-#define Rf_classgets_x 107
-#define Rf_coerceVector_x 108
-#define Rf_cons_x 109
-#define Rf_copyListMatrix_x 110
-#define Rf_copyMatrix_x 111
-#define Rf_copyMostAttrib_x 112
-#define Rf_dbeta_x 113
-#define Rf_dbinom_x 114
-#define Rf_dcauchy_x 115
-#define Rf_dchisq_x 116
-#define Rf_defineVar_x 117
-#define Rf_dexp_x 118
-#define Rf_df_x 119
-#define Rf_dgamma_x 120
-#define Rf_dgeom_x 121
-#define Rf_dhyper_x 122
-#define Rf_dlnorm_x 123
-#define Rf_dlogis_x 124
-#define Rf_dnbeta_x 125
-#define Rf_dnbinom_x 126
-#define Rf_dnbinom_mu_x 127
-#define Rf_dnchisq_x 128
-#define Rf_dnf_x 129
-#define Rf_dnorm_x 130
-#define Rf_dnt_x 131
-#define Rf_dpois_x 132
-#define Rf_dsignrank_x 133
-#define Rf_dt_x 134
-#define Rf_dunif_x 135
-#define Rf_duplicate_x 136
-#define Rf_dweibull_x 137
-#define Rf_dwilcox_x 138
-#define Rf_error_x 139
-#define Rf_errorcall_x 140
-#define Rf_eval_x 141
-#define Rf_findFun_x 142
-#define Rf_findVar_x 143
-#define Rf_findVarInFrame_x 144
-#define Rf_findVarInFrame3_x 145
-#define Rf_ftrunc_x 146
-#define Rf_getAttrib_x 147
-#define Rf_gsetVar_x 148
-#define Rf_inherits_x 149
-#define Rf_install_x 150
-#define Rf_installChar_x 151
-#define Rf_isNull_x 152
-#define Rf_isString_x 153
-#define Rf_lengthgets_x 154
-#define Rf_match_x 155
-#define Rf_mkCharLenCE_x 156
-#define Rf_namesgets_x 157
-#define Rf_ncols_x 158
-#define Rf_nrows_x 159
-#define Rf_pbeta_x 160
-#define Rf_pbinom_x 161
-#define Rf_pcauchy_x 162
-#define Rf_pchisq_x 163
-#define Rf_pexp_x 164
-#define Rf_pf_x 165
-#define Rf_pgamma_x 166
-#define Rf_pgeom_x 167
-#define Rf_phyper_x 168
-#define Rf_plnorm_x 169
-#define Rf_plogis_x 170
-#define Rf_pnbeta_x 171
-#define Rf_pnbinom_x 172
-#define Rf_pnbinom_mu_x 173
-#define Rf_pnchisq_x 174
-#define Rf_pnf_x 175
-#define Rf_pnorm_x 176
-#define Rf_pnt_x 177
-#define Rf_ppois_x 178
-#define Rf_protect_x 179
-#define Rf_psignrank_x 180
-#define Rf_pt_x 181
-#define Rf_ptukey_x 182
-#define Rf_punif_x 183
-#define Rf_pweibull_x 184
-#define Rf_pwilcox_x 185
-#define Rf_qbeta_x 186
-#define Rf_qbinom_x 187
-#define Rf_qcauchy_x 188
-#define Rf_qchisq_x 189
-#define Rf_qexp_x 190
-#define Rf_qf_x 191
-#define Rf_qgamma_x 192
-#define Rf_qgeom_x 193
-#define Rf_qhyper_x 194
-#define Rf_qlnorm_x 195
-#define Rf_qlogis_x 196
-#define Rf_qnbeta_x 197
-#define Rf_qnbinom_x 198
-#define Rf_qnbinom_mu_x 199
-#define Rf_qnchisq_x 200
-#define Rf_qnf_x 201
-#define Rf_qnorm_x 202
-#define Rf_qnt_x 203
-#define Rf_qpois_x 204
-#define Rf_qsignrank_x 205
-#define Rf_qt_x 206
-#define Rf_qtukey_x 207
-#define Rf_qunif_x 208
-#define Rf_qweibull_x 209
-#define Rf_qwilcox_x 210
-#define Rf_rbeta_x 211
-#define Rf_rbinom_x 212
-#define Rf_rcauchy_x 213
-#define Rf_rchisq_x 214
-#define Rf_rexp_x 215
-#define Rf_rf_x 216
-#define Rf_rgamma_x 217
-#define Rf_rgeom_x 218
-#define Rf_rhyper_x 219
-#define Rf_rlnorm_x 220
-#define Rf_rlogis_x 221
-#define Rf_rmultinom_x 222
-#define Rf_rnbinom_x 223
-#define Rf_rnbinom_mu_x 224
-#define Rf_rnchisq_x 225
-#define Rf_rnorm_x 226
-#define Rf_rpois_x 227
-#define Rf_rsignrank_x 228
-#define Rf_rt_x 229
-#define Rf_runif_x 230
-#define Rf_rweibull_x 231
-#define Rf_rwilcox_x 232
-#define Rf_setAttrib_x 233
-#define Rf_str2type_x 234
-#define Rf_unprotect_x 235
-#define Rf_unprotect_ptr_x 236
-#define Rf_warning_x 237
-#define Rf_warningcall_x 238
-#define Rprintf_x 239
-#define SETCAD4R_x 240
-#define SETCADDDR_x 241
-#define SETCADDR_x 242
-#define SETCADR_x 243
-#define SETCAR_x 244
-#define SETCDR_x 245
-#define SET_BODY_x 246
-#define SET_CLOENV_x 247
-#define SET_FORMALS_x 248
-#define SET_NAMED_FASTR_x 249
-#define SET_RDEBUG_x 250
-#define SET_RSTEP_x 251
-#define SET_S4_OBJECT_x 252
-#define SET_STRING_ELT_x 253
-#define SET_SYMVALUE_x 254
-#define SET_TAG_x 255
-#define SET_TYPEOF_FASTR_x 256
-#define SET_VECTOR_ELT_x 257
-#define STRING_ELT_x 258
-#define SYMVALUE_x 259
-#define TAG_x 260
-#define TYPEOF_x 261
-#define UNSET_S4_OBJECT_x 262
-#define VECTOR_ELT_x 263
-#define forceSymbols_x 264
-#define getCCallable_x 265
-#define getConnectionClassString_x 266
-#define getEmbeddingDLLInfo_x 267
-#define getOpenModeString_x 268
-#define getSummaryDescription_x 269
-#define isSeekable_x 270
-#define octsize_x 271
-#define registerCCallable_x 272
-#define registerRoutines_x 273
-#define restoreHandlerStacks_x 274
-#define setDotSymbolValues_x 275
-#define unif_rand_x 276
-#define useDynamicSymbols_x 277
+#define Rf_dbeta_x 114
+#define Rf_dbinom_x 115
+#define Rf_dcauchy_x 116
+#define Rf_dchisq_x 117
+#define Rf_defineVar_x 118
+#define Rf_dexp_x 119
+#define Rf_df_x 120
+#define Rf_dgamma_x 121
+#define Rf_dgeom_x 122
+#define Rf_dhyper_x 123
+#define Rf_dlnorm_x 124
+#define Rf_dlogis_x 125
+#define Rf_dnbeta_x 126
+#define Rf_dnbinom_x 127
+#define Rf_dnbinom_mu_x 128
+#define Rf_dnchisq_x 129
+#define Rf_dnf_x 130
+#define Rf_dnorm_x 131
+#define Rf_dnt_x 132
+#define Rf_dpois_x 133
+#define Rf_dsignrank_x 134
+#define Rf_dt_x 135
+#define Rf_dunif_x 136
+#define Rf_duplicate_x 137
+#define Rf_dweibull_x 138
+#define Rf_dwilcox_x 139
+#define Rf_error_x 140
+#define Rf_errorcall_x 141
+#define Rf_eval_x 142
+#define Rf_findFun_x 143
+#define Rf_findVar_x 144
+#define Rf_findVarInFrame_x 145
+#define Rf_findVarInFrame3_x 146
+#define Rf_ftrunc_x 147
+#define Rf_getAttrib_x 148
+#define Rf_gsetVar_x 149
+#define Rf_inherits_x 150
+#define Rf_install_x 151
+#define Rf_installChar_x 152
+#define Rf_isNull_x 153
+#define Rf_isString_x 154
+#define Rf_lengthgets_x 155
+#define Rf_match_x 156
+#define Rf_mkCharLenCE_x 157
+#define Rf_namesgets_x 158
+#define Rf_ncols_x 159
+#define Rf_nrows_x 160
+#define Rf_pbeta_x 161
+#define Rf_pbinom_x 162
+#define Rf_pcauchy_x 163
+#define Rf_pchisq_x 164
+#define Rf_pexp_x 165
+#define Rf_pf_x 166
+#define Rf_pgamma_x 167
+#define Rf_pgeom_x 168
+#define Rf_phyper_x 169
+#define Rf_plnorm_x 170
+#define Rf_plogis_x 171
+#define Rf_pnbeta_x 172
+#define Rf_pnbinom_x 173
+#define Rf_pnbinom_mu_x 174
+#define Rf_pnchisq_x 175
+#define Rf_pnf_x 176
+#define Rf_pnorm_x 177
+#define Rf_pnt_x 178
+#define Rf_ppois_x 179
+#define Rf_protect_x 180
+#define Rf_psignrank_x 181
+#define Rf_pt_x 182
+#define Rf_ptukey_x 183
+#define Rf_punif_x 184
+#define Rf_pweibull_x 185
+#define Rf_pwilcox_x 186
+#define Rf_qbeta_x 187
+#define Rf_qbinom_x 188
+#define Rf_qcauchy_x 189
+#define Rf_qchisq_x 190
+#define Rf_qexp_x 191
+#define Rf_qf_x 192
+#define Rf_qgamma_x 193
+#define Rf_qgeom_x 194
+#define Rf_qhyper_x 195
+#define Rf_qlnorm_x 196
+#define Rf_qlogis_x 197
+#define Rf_qnbeta_x 198
+#define Rf_qnbinom_x 199
+#define Rf_qnbinom_mu_x 200
+#define Rf_qnchisq_x 201
+#define Rf_qnf_x 202
+#define Rf_qnorm_x 203
+#define Rf_qnt_x 204
+#define Rf_qpois_x 205
+#define Rf_qsignrank_x 206
+#define Rf_qt_x 207
+#define Rf_qtukey_x 208
+#define Rf_qunif_x 209
+#define Rf_qweibull_x 210
+#define Rf_qwilcox_x 211
+#define Rf_rbeta_x 212
+#define Rf_rbinom_x 213
+#define Rf_rcauchy_x 214
+#define Rf_rchisq_x 215
+#define Rf_rexp_x 216
+#define Rf_rf_x 217
+#define Rf_rgamma_x 218
+#define Rf_rgeom_x 219
+#define Rf_rhyper_x 220
+#define Rf_rlnorm_x 221
+#define Rf_rlogis_x 222
+#define Rf_rmultinom_x 223
+#define Rf_rnbinom_x 224
+#define Rf_rnbinom_mu_x 225
+#define Rf_rnchisq_x 226
+#define Rf_rnorm_x 227
+#define Rf_rpois_x 228
+#define Rf_rsignrank_x 229
+#define Rf_rt_x 230
+#define Rf_runif_x 231
+#define Rf_rweibull_x 232
+#define Rf_rwilcox_x 233
+#define Rf_setAttrib_x 234
+#define Rf_str2type_x 235
+#define Rf_unprotect_x 236
+#define Rf_unprotect_ptr_x 237
+#define Rf_warning_x 238
+#define Rf_warningcall_x 239
+#define Rprintf_x 240
+#define SETCAD4R_x 241
+#define SETCADDDR_x 242
+#define SETCADDR_x 243
+#define SETCADR_x 244
+#define SETCAR_x 245
+#define SETCDR_x 246
+#define SET_BODY_x 247
+#define SET_CLOENV_x 248
+#define SET_FORMALS_x 249
+#define SET_NAMED_FASTR_x 250
+#define SET_RDEBUG_x 251
+#define SET_RSTEP_x 252
+#define SET_S4_OBJECT_x 253
+#define SET_STRING_ELT_x 254
+#define SET_SYMVALUE_x 255
+#define SET_TAG_x 256
+#define SET_TYPEOF_FASTR_x 257
+#define SET_VECTOR_ELT_x 258
+#define STRING_ELT_x 259
+#define SYMVALUE_x 260
+#define TAG_x 261
+#define TYPEOF_x 262
+#define UNSET_S4_OBJECT_x 263
+#define VECTOR_ELT_x 264
+#define forceSymbols_x 265
+#define getCCallable_x 266
+#define getConnectionClassString_x 267
+#define getEmbeddingDLLInfo_x 268
+#define getOpenModeString_x 269
+#define getSummaryDescription_x 270
+#define isSeekable_x 271
+#define octsize_x 272
+#define registerCCallable_x 273
+#define registerRoutines_x 274
+#define restoreHandlerStacks_x 275
+#define setDotSymbolValues_x 276
+#define unif_rand_x 277
+#define useDynamicSymbols_x 278
 
-#define UPCALLS_TABLE_SIZE 278
+#define UPCALLS_TABLE_SIZE 279
 
 #endif // RFFI_UPCALLSINDEX_H