diff --git a/infer/models/c/src/libc_basic.c b/infer/models/c/src/libc_basic.c
index 826ab7bfa..d3af81da7 100644
--- a/infer/models/c/src/libc_basic.c
+++ b/infer/models/c/src/libc_basic.c
@@ -30,18 +30,32 @@
 
 #include "infer_builtins.h"
 
-#include <dirent.h>
+// use c++ headers if in C++ mode - they are mostly same as C headers,
+// but there are some subtle differences from time to time. For example,
+// 'getc' may be defined as macro in stdio.h, and a function in cstdio
+#ifdef __cplusplus
+#include <climits>
+#include <clocale>
+#include <csetjmp>
+#include <cstdarg>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <csignal>
+#else
 #include <limits.h>
 #include <locale.h>
-#include <pwd.h>
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <signal.h>
+#endif
 
+#include <dirent.h>
+#include <pwd.h>
 #include <pthread.h>
-#include <signal.h>
 #include <sys/shm.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
diff --git a/infer/src/clang/cLocation.ml b/infer/src/clang/cLocation.ml
index fbabc96ae..ab1488bcb 100644
--- a/infer/src/clang/cLocation.ml
+++ b/infer/src/clang/cLocation.ml
@@ -118,13 +118,14 @@ let should_translate (loc_start, loc_end) decl_trans_context =
   in
   let file_in_project = map_path_of file_in_project loc_end
                         || map_path_of file_in_project loc_start in
+  let translate_on_demand = file_in_project || Config.models_mode in
   let file_in_models = map_path_of DB.file_is_in_cpp_model loc_end
                        || map_path_of DB.file_is_in_cpp_model loc_start in
   equal_current_source !curr_file
   || map_file_of equal_current_source loc_end
   || map_file_of equal_current_source loc_start
   || file_in_models
-  || (Config.cxx_experimental && decl_trans_context = `Translation && file_in_project
+  || (Config.cxx_experimental && decl_trans_context = `Translation && translate_on_demand
       && not Config.testing_mode)
 
 let should_translate_lib source_range decl_trans_context =
diff --git a/infer/tests/codetoanalyze/cpp/errors/c_tests/c_bugs.cpp b/infer/tests/codetoanalyze/cpp/errors/c_tests/c_bugs.cpp
index 3e5283b09..131e7d01e 100644
--- a/infer/tests/codetoanalyze/cpp/errors/c_tests/c_bugs.cpp
+++ b/infer/tests/codetoanalyze/cpp/errors/c_tests/c_bugs.cpp
@@ -41,3 +41,21 @@ void memcpy_spec_is_found() {
   memcpy(0, &x, sizeof(int));
   int p = 1 / 0; // infer won't reach it when memcpy spec is found
 }
+
+// taken from getc.c e2e test
+void crash_getc() {
+  FILE* f;
+  int i;
+  f = fopen("this_file_doesnt_exist", "r");
+  i = getc(f);
+  fclose(f);
+}
+
+// taken from getc.c e2e test
+void crash_fgetc() {
+  FILE* f;
+  int i;
+  f = fopen("this_file_doesnt_exist", "r");
+  i = fgetc(f);
+  fclose(f);
+}
diff --git a/infer/tests/endtoend/cpp/CBugsTest.java b/infer/tests/endtoend/cpp/CBugsTest.java
index 3cdc61e87..ee585341f 100644
--- a/infer/tests/endtoend/cpp/CBugsTest.java
+++ b/infer/tests/endtoend/cpp/CBugsTest.java
@@ -112,4 +112,23 @@ public class CBugsTest {
         doesNotContain(DIVIDE_BY_ZERO, FILE, "memcpy_spec_is_found"));
   }
 
+  @Test
+  public void whenInferRunsOnGetcCrashThenNullDereferenceIsFound()
+      throws InterruptedException, IOException, InferException {
+    InferResults inferResults = InferRunner.runInferCPP(inferCmd);
+    assertThat(
+        "Not checking malloc result should report null dereference",
+        inferResults,
+        contains(NULL_DEREFERENCE, FILE, "crash_getc"));
+  }
+
+  @Test
+  public void whenInferRunsOnFgetcCrashThenNullDereferenceIsFound()
+      throws InterruptedException, IOException, InferException {
+    InferResults inferResults = InferRunner.runInferCPP(inferCmd);
+    assertThat(
+        "Not checking malloc result should report null dereference",
+        inferResults,
+        contains(NULL_DEREFERENCE, FILE, "crash_fgetc"));
+  }
 }