Index: uspace/Makefile.common
===================================================================
--- uspace/Makefile.common	(revision 2e08dce7ba2d9b9c25ddda03bf102fa4665ce057)
+++ uspace/Makefile.common	(revision 7ab6fc268f754ce4464266e07ab25e2143fee108)
@@ -154,21 +154,26 @@
 JOBFILE = $(LIBC_PREFIX)/../../../tools/jobfile.py
 
+ifeq ($(POSIX_COMPAT),1)
+	CFLAGS = -I$(LIBCOMPAT_PREFIX)
+	LIBS += $(LIBCOMPAT_PREFIX)/libcompat.a
+endif
+
 ifeq ($(COMPILER),gcc_cross)
-	CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)
+	CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
 	DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
 ifeq ($(COMPILER),gcc_native)
-	CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)
+	CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
 	DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
 ifeq ($(COMPILER),icc)
-	CFLAGS = $(ICC_CFLAGS) $(EXTRA_CFLAGS)
+	CFLAGS += $(ICC_CFLAGS) $(EXTRA_CFLAGS)
 	DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
 ifeq ($(COMPILER),clang)
-	CFLAGS = $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
+	CFLAGS += $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
 	DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
Index: uspace/app/pcc/cc/cpp/Makefile
===================================================================
--- uspace/app/pcc/cc/cpp/Makefile	(revision 2e08dce7ba2d9b9c25ddda03bf102fa4665ce057)
+++ uspace/app/pcc/cc/cpp/Makefile	(revision 7ab6fc268f754ce4464266e07ab25e2143fee108)
@@ -27,16 +27,15 @@
 #
 
-# TODO: prefer libcompat headers to libc
-
 ARCH = i386  # FIXME: figure out the real arch
 
 USPACE_PREFIX = ../../../..
-LIBS = $(LIBCOMPAT_PREFIX)/libcompat.a
 MIPDIR = ../../mip
 ARCHDIR = ../../arch/$(ARCH)
-EXTRA_CFLAGS = -I$(LIBCOMPAT_PREFIX) -I$(MIPDIR) -I$(ARCHDIR)
+EXTRA_CFLAGS = -I$(MIPDIR) -I$(ARCHDIR)
 EXTRA_CLEAN = y.tab.c y.tab.h
 DEFS = -DCPP_DEBUG -Dfree=free -DCPPBUF=16384
 BINARY = cpp
+
+POSIX_COMPAT = 1
 
 YACC = yacc
Index: uspace/app/pcc/cc/cpp/cpp.c
===================================================================
--- uspace/app/pcc/cc/cpp/cpp.c	(revision 2e08dce7ba2d9b9c25ddda03bf102fa4665ce057)
+++ uspace/app/pcc/cc/cpp/cpp.c	(revision 7ab6fc268f754ce4464266e07ab25e2143fee108)
@@ -37,9 +37,9 @@
 #include <sys/wait.h>
 #endif
-#include <compat/sys/stat.h>
+#include <sys/stat.h>
 
 #include <fcntl.h>
 #ifdef HAVE_UNISTD_H
-#include <compat/unistd.h>
+#include <unistd.h>
 #endif
 #include <stdio.h>
@@ -47,5 +47,5 @@
 #include <stdlib.h>
 #include <string.h>
-#include <compat/time.h>
+#include <time.h>
 #include <ctype.h>
 
Index: uspace/app/pcc/cc/cpp/token.c
===================================================================
--- uspace/app/pcc/cc/cpp/token.c	(revision 2e08dce7ba2d9b9c25ddda03bf102fa4665ce057)
+++ uspace/app/pcc/cc/cpp/token.c	(revision 7ab6fc268f754ce4464266e07ab25e2143fee108)
@@ -45,5 +45,5 @@
 #include <stdlib.h>
 #include <string.h>
-#include <compat/ctype.h>
+#include <ctype.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
Index: pace/lib/compat/compat
===================================================================
--- uspace/lib/compat/compat	(revision 2e08dce7ba2d9b9c25ddda03bf102fa4665ce057)
+++ 	(revision )
@@ -1,1 +1,0 @@
-/home/jirkazr/HelenOS_pcc/uspace/lib/compat
Index: uspace/lib/compat/ctype.h
===================================================================
--- uspace/lib/compat/ctype.h	(revision 2e08dce7ba2d9b9c25ddda03bf102fa4665ce057)
+++ uspace/lib/compat/ctype.h	(revision 7ab6fc268f754ce4464266e07ab25e2143fee108)
@@ -30,5 +30,5 @@
 #define COMPAT_CTYPE_H
 
-#include <ctype.h>
+#include "../c/include/ctype.h"
 
 extern int isxdigit(int ch);
Index: uspace/lib/compat/sys/stat.h
===================================================================
--- uspace/lib/compat/sys/stat.h	(revision 2e08dce7ba2d9b9c25ddda03bf102fa4665ce057)
+++ uspace/lib/compat/sys/stat.h	(revision 7ab6fc268f754ce4464266e07ab25e2143fee108)
@@ -3,5 +3,5 @@
 #define COMPAT_STAT_H
 
-#include <sys/stat.h>
+#include "../../c/include/sys/stat.h"
 #include "time.h"
 
Index: uspace/lib/compat/time.h
===================================================================
--- uspace/lib/compat/time.h	(revision 2e08dce7ba2d9b9c25ddda03bf102fa4665ce057)
+++ uspace/lib/compat/time.h	(revision 7ab6fc268f754ce4464266e07ab25e2143fee108)
@@ -30,5 +30,5 @@
 #define COMPAT_TIME_H
 
-#include <time.h>
+#include "../c/include/time.h"
 
 struct tm {
Index: uspace/lib/compat/unistd.h
===================================================================
--- uspace/lib/compat/unistd.h	(revision 2e08dce7ba2d9b9c25ddda03bf102fa4665ce057)
+++ uspace/lib/compat/unistd.h	(revision 7ab6fc268f754ce4464266e07ab25e2143fee108)
@@ -30,4 +30,6 @@
 #define COMPAT_UNISTD_H
 
+#include "../c/include/unistd.h"
+
 //#include <getopt.h>