diff --git a/programs/develop/libraries/cairo/Makefile b/programs/develop/libraries/cairo/Makefile
index 83ee261aaa..2203daca50 100644
--- a/programs/develop/libraries/cairo/Makefile
+++ b/programs/develop/libraries/cairo/Makefile
@@ -1,11 +1,12 @@
 
+
 LIBRARY = cairo
 
 CC = gcc
 
-CFLAGS = -c -O2
+CFLAGS = -c -O2 -fomit-frame-pointer
 
-DEFINES = -DHAVE_CONFIG_H -U_WIN32 -DCAIRO_NO_MUTEX
+DEFINES = -DHAVE_CONFIG_H -DCAIRO_NO_MUTEX -U_WIN32 -U_MSC_VER -U__WIN32__ 
 
 INCLUDES = -I../pixman -I../newlib/include -I../newlib/include/sys
 
@@ -26,7 +27,6 @@ SOURCES = 					\
 	cairo-clip.c \
 	cairo-color.c \
 	cairo-composite-rectangles.c \
-	cairo-debug.c \
 	cairo-device.c \
 	cairo-fixed.c \
 	cairo-font-face.c \
diff --git a/programs/develop/libraries/pixman/Makefile b/programs/develop/libraries/pixman/Makefile
index 74782fc5f1..5230a23b08 100644
--- a/programs/develop/libraries/pixman/Makefile
+++ b/programs/develop/libraries/pixman/Makefile
@@ -3,9 +3,9 @@ LIBRARY = pixman-1
 
 CC = gcc
 
-CFLAGS = -c -O2 -mmmx -Winline
+CFLAGS = -c -O2 -mmmx -Winline -fomit-frame-pointer
 
-DEFINES = -DHAVE_CONFIG_H -DPACKAGE -DPIXMAN_NO_TLS -DUSE_MMX
+DEFINES = -DHAVE_CONFIG_H -DPIXMAN_NO_TLS -DUSE_MMX
 
 INCLUDES = -I../pixman -I../newlib/include
 
diff --git a/programs/develop/libraries/pixman/config.h b/programs/develop/libraries/pixman/config.h
index 61e29aa2a8..c57fa62ed3 100644
--- a/programs/develop/libraries/pixman/config.h
+++ b/programs/develop/libraries/pixman/config.h
@@ -99,7 +99,7 @@
 #define STDC_HEADERS 1
 
 /* Whether the tool chain supports __thread */
-#define TOOLCHAIN_SUPPORTS__THREAD /**/
+//#define TOOLCHAIN_SUPPORTS__THREAD /**/
 
 /* use ARM NEON assembly optimizations */
 /* #undef USE_ARM_NEON */
@@ -114,10 +114,10 @@
 #define USE_MMX 1
 
 /* use OpenMP in the test suite */
-#define USE_OPENMP 1
+//#define USE_OPENMP 1
 
 /* use SSE2 compiler intrinsics */
-#define USE_SSE2 1
+//#define USE_SSE2 1
 
 /* use VMX compiler intrinsics */
 /* #undef USE_VMX */