diff --git a/ClangVisitor.cpp b/ClangVisitor.cpp
index 53e0bd00151efb8094e4fad1123e36a9cf52fd61..0e9f6b665a1ee637a3d66761fa82e94d9d4597ab 100644
--- a/ClangVisitor.cpp
+++ b/ClangVisitor.cpp
@@ -2874,13 +2874,11 @@ exp_node FramacVisitor::makeExpression(
           expr->dump(llvm::errs(), _context->getSourceManager());
           std::cerr << "\nAborting\n";
           exit(2);
-          // default:
-          //   std::cerr << "Unsupported binary expression:";
-          //   expr->dump(llvm::errs(), _context->getSourceManager());
-          //   std::cerr << "\nAborting\n";
-          //   exit(2);
           default:
-            break;
+            std::cerr << "Unsupported binary expression:";
+            expr->dump(llvm::errs(), _context->getSourceManager());
+            std::cerr << "\nAborting\n";
+            exit(2);
         };
         exp_node lhsPart = makeExpression(binaryOperator->getLHS(),
                                           shouldDelay,receiver);
diff --git a/Clang_utils.h b/Clang_utils.h
index 89e3a8bf65d85d0171b6ff3c89e61f530e952bea..35925b9b52ce562dbf96ae1ca9532a9f004cdb2c 100644
--- a/Clang_utils.h
+++ b/Clang_utils.h
@@ -49,8 +49,6 @@
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
 #endif
-#include "clang/Basic/SourceManager.h"
-#include "clang/Basic/FileManager.h"
 
 extern "C" {
 #include "intermediate_format.h"
diff --git a/gen_ast.ml b/gen_ast.ml
index 4af499b230f802dce5587df768a013708dbdd441..61cfad2f5727861359d491365dd6f079fe359560 100644
--- a/gen_ast.ml
+++ b/gen_ast.ml
@@ -746,11 +746,11 @@ and destruct_ptr_or_int obj fmt t =
         obj
         (generate_free_call content) t
     else
+      (* Avoid generating an unused local variable. *)
       Format.fprintf fmt
         "%a"
         (generate_free_call content) t
   end
- 
 
 let generate_destructor_body obj fmt (name,typ) =
   let obj fmt = Format.fprintf fmt "%t.%s" obj name in