#include <string.h>
#include <assert.h>
+
+#ifndef COMMON_H
+#define COMMON_H
+
+#if defined(__APPLE__) && (__MACH__)
+#ifdef _G
+#undef _G
+#endif
+#endif
+
#include "SDCCglobl.h"
-#include "SDCCast.h"
#include "SDCCmem.h"
+#include "SDCCast.h"
#include "SDCCy.h"
#include "SDCChasht.h"
#include "SDCCbitv.h"
#include "SDCClrange.h"
#include "SDCCptropt.h"
#include "SDCCopt.h"
+#include "SDCCglue.h"
+#include "SDCCpeeph.h"
+#include "SDCCdebug.h"
+#include "SDCCutil.h"
+#include "SDCCasm.h"
#include "port.h"
-#include "config.h"
-/*
-#include "SDCCralloc.h"
-*/
+#include "newalloc.h"
+
+#endif