diff --git a/frama-c b/frama-c
index 6a1f8d78ae2add0c62732e2f9eadb452bec6e879..038d45c0a4ec5a3de9a84110c9d7e683aa9204b1 160000
--- a/frama-c
+++ b/frama-c
@@ -1 +1 @@
-Subproject commit 6a1f8d78ae2add0c62732e2f9eadb452bec6e879
+Subproject commit 038d45c0a4ec5a3de9a84110c9d7e683aa9204b1
diff --git a/polarssl/compile_commands.json b/polarssl/compile_commands.json
index db43ea356833e2e5e2090d5c62351ddee805d96c..df2cd4986101fd9dfe9a98ba5673505dfc220ac6 100644
--- a/polarssl/compile_commands.json
+++ b/polarssl/compile_commands.json
@@ -3,7 +3,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -20,7 +20,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -35,7 +35,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -52,7 +52,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -67,7 +67,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -82,7 +82,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -97,7 +97,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -112,7 +112,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -127,7 +127,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -144,7 +144,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -159,7 +159,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -174,7 +174,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -189,7 +189,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -204,7 +204,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -221,7 +221,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -236,7 +236,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -251,7 +251,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -266,7 +266,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -281,7 +281,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -296,7 +296,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -311,7 +311,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -326,7 +326,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -341,7 +341,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -356,7 +356,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -371,7 +371,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -388,7 +388,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -403,7 +403,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -418,7 +418,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -435,7 +435,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -450,7 +450,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -467,7 +467,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -484,7 +484,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -501,7 +501,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -516,7 +516,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -531,7 +531,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -548,7 +548,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -565,7 +565,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -580,7 +580,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -595,7 +595,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -612,7 +612,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -629,7 +629,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -644,7 +644,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -661,7 +661,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -676,7 +676,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -693,7 +693,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -710,7 +710,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -727,7 +727,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -742,7 +742,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -757,7 +757,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -772,7 +772,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -789,7 +789,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -806,7 +806,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -823,7 +823,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -840,7 +840,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -857,7 +857,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -874,7 +874,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -891,7 +891,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -908,7 +908,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -923,7 +923,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -938,7 +938,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -955,7 +955,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -972,7 +972,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -989,7 +989,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -1006,7 +1006,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -1023,7 +1023,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -1038,7 +1038,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -1053,7 +1053,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -1068,7 +1068,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -1085,7 +1085,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W", 
@@ -1102,7 +1102,7 @@
         "arguments": [
             "cc", 
             "-c", 
-            "-Iinclude", 
+            "-I../include", 
             "-D_FILE_OFFSET_BITS=64", 
             "-Wall", 
             "-W",