refs #171 split the includes that are used for OSX vs linux builds

util/scoped_malloc.cc

@@ -89,11 +89,7 @@ PATENT RIGHTS GRANT:
 #ident "Copyright (c) 2007-2013 Tokutek Inc.  All rights reserved."
 #ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
 
-#include <set>
-#include <pthread.h>
-
 #include <toku_include/memory.h>
-#include <portability/toku_pthread.h>
 
 #include <util/scoped_malloc.h>
 
@@ -120,6 +116,11 @@ void toku_scoped_malloc_destroy(void) {}
 
 #else // __APPLE__
 
+#include <set>
+#include <pthread.h>
+
+#include <portability/toku_pthread.h>
+
 namespace toku {
 
     // see pthread_key handling at the bottom