diff -r 34e705fa4da4 setup.py
--- a/setup.py	Sat Jul 07 14:29:58 2012 -0700
+++ b/setup.py	Sun Jul 08 02:16:50 2012 +0200
@@ -438,9 +438,7 @@
         if not cross_compiling:
             add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
             add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-        # only change this for cross builds for 3.3, issues on Mageia
-        if cross_compiling:
-            self.add_gcc_paths()
+        self.add_gcc_paths()
         self.add_multiarch_paths()
 
         # Add paths specified in the environment variables LDFLAGS and
@@ -491,12 +489,18 @@
         # lib_dirs and inc_dirs are used to search for files;
         # if a file is found in one of those directories, it can
         # be assumed that no additional -I,-L directives are needed.
+        inc_dirs = self.compiler.include_dirs[:]
+        lib_dirs = self.compiler.library_dirs[:]
         if not cross_compiling:
-            lib_dirs = self.compiler.library_dirs + [
+            for d in (
+                '/usr/include',
+                ):
+                add_dir_to_list(inc_dirs, d)
+            for d in (
                 '/lib64', '/usr/lib64',
                 '/lib', '/usr/lib',
-                ]
-            inc_dirs = self.compiler.include_dirs + ['/usr/include']
+                ):
+                add_dir_to_list(lib_dirs, d)
         exts = []
         missing = []