merged conflicts

diff --cc source/gir_internals.h
Simple merge

diff --cc source/parser.c
index 63fde05b8b0b94900daffed8a899c108bbd4ad27,a3094dbabcdafc27450fcdc89247a032226d933e..6a3ed984f51046f5f15fdd27288084fbd0898dee
--- 1/source/parser.c
--- 2/source/parser.c
+++ b/source/parser.c
@@@ -1,7 -1,13 +1,8 @@@
  /**
    @file parser.c
  */
+ //#include "parser.h"
  #include "gir_internals.h"
 -#include <stdlib.h>
 -#include <stdio.h>
 -#include <ctype.h>
 -#include <string.h>
 -#include <stdint.h>
  
  #define UNKNOWN     0
  #define SYMBOL      1