includes: move libhfuzz/libcommon includes to a separate directory

hfuzz_cc/hfuzz-cc.c

@@ -141,11 +141,12 @@ char* getIncPaths(void) {
 #endif
 
     static char path[PATH_MAX];
-    snprintf(path, sizeof(path), "-I%s", _XSTR(_HFUZZ_INC_PATH));
+    snprintf(path, sizeof(path), "-I%s/includes/", _XSTR(_HFUZZ_INC_PATH));
     return path;
 }
 
 static void commonOpts(int* j, char** args) {
+    args[(*j)++] = getIncPaths();
     if (isGCC) {
         /* That's the best gcc-6/7 currently offers */
         args[(*j)++] = "-fsanitize-coverage=trace-pc";
@@ -233,8 +234,6 @@ static int ccMode(int argc, char** argv) {
         args[j++] = argv[i];
     }
 
-    args[j++] = getIncPaths();
-
     return execCC(j, args);
 }
 
@@ -297,7 +296,6 @@ static int ldMode(int argc, char** argv) {
     args[j++] = "-Wl,--no-whole-archive";
 
     args[j++] = "-lpthread";
-    args[j++] = getIncPaths();
 
     return execCC(j, args);
 }

includes/libcommon

@@ -0,0 +1 @@
+../libcommon

includes/libhfuzz

@@ -0,0 +1 @@
+../libhfuzz