diff --git a/hphp/compiler/analysis/file_scope.cpp b/hphp/compiler/analysis/file_scope.cpp
index 4309af0a3..15d597706 100644
--- a/hphp/compiler/analysis/file_scope.cpp
+++ b/hphp/compiler/analysis/file_scope.cpp
@@ -23,7 +23,7 @@
 #include "hphp/compiler/option.h"
 #include "hphp/compiler/analysis/constant_table.h"
 #include "hphp/compiler/analysis/function_scope.h"
-#include "sys/stat.h"
+#include <sys/stat.h>
 #include "hphp/compiler/parser/parser.h"
 #include "hphp/util/logger.h"
 #include "hphp/util/util.h"
diff --git a/hphp/compiler/compiler.cpp b/hphp/compiler/compiler.cpp
index 8ee44b494..05ad448db 100644
--- a/hphp/compiler/compiler.cpp
+++ b/hphp/compiler/compiler.cpp
@@ -14,23 +14,19 @@
    +----------------------------------------------------------------------+
 */
 
-#include <boost/program_options/options_description.hpp>
-#include <boost/program_options/positional_options.hpp>
-#include <boost/program_options/variables_map.hpp>
-#include <boost/program_options/parsers.hpp>
-
+#include "hphp/compiler/compiler.h"
 #include "hphp/compiler/package.h"
 #include "hphp/compiler/analysis/analysis_result.h"
 #include "hphp/compiler/analysis/alias_manager.h"
 #include "hphp/compiler/analysis/code_error.h"
 #include "hphp/compiler/analysis/emitter.h"
 #include "hphp/compiler/analysis/type.h"
-#include "hphp/util/json.h"
-#include "hphp/util/logger.h"
 #include "hphp/compiler/analysis/symbol_table.h"
 #include "hphp/compiler/option.h"
 #include "hphp/compiler/parser/parser.h"
 #include "hphp/compiler/builtin_symbols.h"
+#include "hphp/util/json.h"
+#include "hphp/util/logger.h"
 #include "hphp/util/db_conn.h"
 #include "hphp/util/exception.h"
 #include "hphp/util/process.h"
@@ -43,15 +39,20 @@
 #include "hphp/runtime/base/externals.h"
 #include "hphp/runtime/base/thread_init_fini.h"
 #include "hphp/runtime/vm/repo.h"
-#include "sys/types.h"
-#include "sys/wait.h"
-#include <dlfcn.h>
 #include "hphp/system/lib/systemlib.h"
-#include "hphp/compiler/compiler.h"
 #include "hphp/util/repo_schema.h"
 
 #include "hphp/hhvm/process_init.h"
 
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <dlfcn.h>
+
+#include <boost/program_options/options_description.hpp>
+#include <boost/program_options/positional_options.hpp>
+#include <boost/program_options/variables_map.hpp>
+#include <boost/program_options/parsers.hpp>
+
 using namespace boost::program_options;
 using std::cout;
 
diff --git a/hphp/compiler/package.cpp b/hphp/compiler/package.cpp
index 9f75abcd1..b25a53c37 100644
--- a/hphp/compiler/package.cpp
+++ b/hphp/compiler/package.cpp
@@ -15,8 +15,8 @@
 */
 
 #include "hphp/compiler/package.h"
-#include "sys/types.h"
-#include "sys/stat.h"
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <unistd.h>
 #include <dirent.h>
 #include "hphp/compiler/analysis/analysis_result.h"
diff --git a/hphp/runtime/base/file/file.cpp b/hphp/runtime/base/file/file.cpp
index 4088a70a5..1c0243f2b 100644
--- a/hphp/runtime/base/file/file.cpp
+++ b/hphp/runtime/base/file/file.cpp
@@ -29,7 +29,7 @@
 #include "hphp/runtime/base/zend/zend_string.h"
 #include "hphp/runtime/base/zend/zend_printf.h"
 #include "hphp/runtime/base/util/exceptions.h"
-#include "sys/file.h"
+#include <sys/file.h>
 #include "hphp/runtime/base/array/array_iterator.h"
 #include "hphp/runtime/base/file/stream_wrapper_registry.h"
 
diff --git a/hphp/runtime/base/file/socket.h b/hphp/runtime/base/file/socket.h
index a6bd954a2..f689309f5 100644
--- a/hphp/runtime/base/file/socket.h
+++ b/hphp/runtime/base/file/socket.h
@@ -18,8 +18,8 @@
 #define incl_HPHP_SOCKET_H_
 
 #include "hphp/runtime/base/file/file.h"
-#include "sys/types.h"
-#include "sys/socket.h"
+#include <sys/types.h>
+#include <sys/socket.h>
 
 #define SOCKET_ERROR(sock, msg, errn)                           \
   sock->setError(errn);                                         \
diff --git a/hphp/runtime/base/hardware_counter.cpp b/hphp/runtime/base/hardware_counter.cpp
index 1106a06ad..60b8e5b9e 100644
--- a/hphp/runtime/base/hardware_counter.cpp
+++ b/hphp/runtime/base/hardware_counter.cpp
@@ -25,10 +25,10 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <assert.h>
-#include "sys/mman.h"
-#include "sys/ioctl.h"
+#include <sys/mman.h>
+#include <sys/ioctl.h>
 #include "asm/unistd.h"
-#include "sys/prctl.h"
+#include <sys/prctl.h>
 #include "linux/perf_event.h"
 #include "hphp/runtime/base/string_data.h"
 #include "hphp/runtime/base/zend/zend_url.h"
diff --git a/hphp/runtime/base/server/http_server.cpp b/hphp/runtime/base/server/http_server.cpp
index a05870ec0..5fb39f6f1 100644
--- a/hphp/runtime/base/server/http_server.cpp
+++ b/hphp/runtime/base/server/http_server.cpp
@@ -34,7 +34,7 @@
 #include "hphp/runtime/eval/debugger/debugger.h"
 #include "hphp/util/db_conn.h"
 #include "hphp/runtime/ext/ext_apc.h"
-#include "sys/types.h"
+#include <sys/types.h>
 #include <signal.h>
 #include "hphp/util/ssl_init.h"
 
diff --git a/hphp/runtime/base/shared/shared_store_base.cpp b/hphp/runtime/base/shared/shared_store_base.cpp
index c9cf3388f..f3fa0f8ef 100644
--- a/hphp/runtime/base/shared/shared_store_base.cpp
+++ b/hphp/runtime/base/shared/shared_store_base.cpp
@@ -24,7 +24,7 @@
 #include "hphp/runtime/base/shared/concurrent_shared_store.h"
 #include "hphp/util/timer.h"
 #include "hphp/util/logger.h"
-#include "sys/mman.h"
+#include <sys/mman.h>
 
 namespace HPHP {
 
diff --git a/hphp/runtime/base/stat_cache.cpp b/hphp/runtime/base/stat_cache.cpp
index 99fb7246d..2afed8094 100644
--- a/hphp/runtime/base/stat_cache.cpp
+++ b/hphp/runtime/base/stat_cache.cpp
@@ -15,11 +15,11 @@
 */
 #include "hphp/runtime/base/stat_cache.h"
 
-#include "sys/types.h"
-#include "sys/stat.h"
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include "sys/param.h"
+#include <sys/param.h>
 
 #include "hphp/util/trace.h"
 #include "hphp/util/logger.h"
diff --git a/hphp/runtime/base/stat_cache.h b/hphp/runtime/base/stat_cache.h
index 5cf124bf7..61f74eb26 100644
--- a/hphp/runtime/base/stat_cache.h
+++ b/hphp/runtime/base/stat_cache.h
@@ -17,7 +17,7 @@
 #ifndef incl_HPHP_STAT_CACHE_H_
 #define incl_HPHP_STAT_CACHE_H_
 
-#include "sys/inotify.h"
+#include <sys/inotify.h>
 
 #include "tbb/concurrent_hash_map.h"
 
@@ -41,7 +41,7 @@ class StatCache {
     typedef hphp_hash_map<std::string, NodePtr, string_hash> NameNodeMap;
     typedef hphp_hash_map<std::string, void*, string_hash> NameMap;
 
-    Node(StatCache& statCache, int wd=-1);
+    explicit Node(StatCache& statCache, int wd=-1);
     void atomicRelease();
 
     void touch(bool invalidate=true);
diff --git a/hphp/runtime/base/timeout_thread.cpp b/hphp/runtime/base/timeout_thread.cpp
index 09699e65d..a78a21f20 100644
--- a/hphp/runtime/base/timeout_thread.cpp
+++ b/hphp/runtime/base/timeout_thread.cpp
@@ -14,13 +14,13 @@
    +----------------------------------------------------------------------+
 */
 
-#include "sys/mman.h"
-
 #include "hphp/runtime/base/timeout_thread.h"
 #include "hphp/runtime/base/runtime_option.h"
 #include "hphp/util/lock.h"
 #include "hphp/util/logger.h"
 
+#include <sys/mman.h>
+
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 // statics
diff --git a/hphp/runtime/base/util/string_buffer.cpp b/hphp/runtime/base/util/string_buffer.cpp
index 841d06d80..99d4497d5 100644
--- a/hphp/runtime/base/util/string_buffer.cpp
+++ b/hphp/runtime/base/util/string_buffer.cpp
@@ -14,18 +14,20 @@
    +----------------------------------------------------------------------+
 */
 
-#include "sys/types.h"
-#include "sys/stat.h"
-#include <fcntl.h>
-
-#include <algorithm>
 #include "hphp/runtime/base/util/string_buffer.h"
-#include "hphp/util/alloc.h"
 #include "hphp/runtime/base/file/file.h"
 #include "hphp/runtime/base/zend/zend_functions.h"
 #include "hphp/runtime/base/zend/utf8_decode.h"
 #include "hphp/runtime/ext/ext_json.h"
 
+#include "hphp/util/alloc.h"
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include <algorithm>
+
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -298,9 +300,9 @@ void StringBuffer::appendJsonEscape(const char *s, int len, int options) {
         }
         break;
       case '%':
-       	if (options & k_JSON_FB_EXTRA_ESCAPES) {
+        if (options & k_JSON_FB_EXTRA_ESCAPES) {
           append("\\u0025", 6);
-       	} else {
+        } else {
           append('%');
         }
         break;
diff --git a/hphp/runtime/base/zend/zend_php_config.h b/hphp/runtime/base/zend/zend_php_config.h
index fda03a46c..825d01dd6 100644
--- a/hphp/runtime/base/zend/zend_php_config.h
+++ b/hphp/runtime/base/zend/zend_php_config.h
@@ -2349,7 +2349,7 @@
 #endif
 
 #ifdef HAVE_SYS_SELECT_H
-#include "sys/select.h"
+#include <sys/select.h>
 #endif
 
 #ifdef HAVE_IEEEFP_H
diff --git a/hphp/runtime/eval/runtime/file_repository.h b/hphp/runtime/eval/runtime/file_repository.h
index 5aef49197..71a5769f0 100644
--- a/hphp/runtime/eval/runtime/file_repository.h
+++ b/hphp/runtime/eval/runtime/file_repository.h
@@ -18,7 +18,7 @@
 #define incl_HPHP_EVAL_FILE_REPOSITORY_H_
 
 #include <time.h>
-#include "sys/stat.h"
+#include <sys/stat.h>
 #include "hphp/util/lock.h"
 
 #include "hphp/runtime/base/runtime_option.h"
diff --git a/hphp/runtime/ext/ext_file.cpp b/hphp/runtime/ext/ext_file.cpp
index 9ac5de8af..ba4c5b498 100644
--- a/hphp/runtime/ext/ext_file.cpp
+++ b/hphp/runtime/ext/ext_file.cpp
@@ -34,8 +34,8 @@
 #include "hphp/util/process.h"
 #include <dirent.h>
 #include <glob.h>
-#include "sys/types.h"
-#include "sys/file.h"
+#include <sys/types.h>
+#include <sys/file.h>
 #if defined(__FreeBSD__) || defined(__APPLE__)
 # include <sys/mount.h>
 #else
diff --git a/hphp/runtime/ext/ext_ipc.cpp b/hphp/runtime/ext/ext_ipc.cpp
index f44053379..f3ba0f037 100644
--- a/hphp/runtime/ext/ext_ipc.cpp
+++ b/hphp/runtime/ext/ext_ipc.cpp
@@ -23,11 +23,11 @@
 
 #include <memory>
 
-#include "sys/types.h"
-#include "sys/ipc.h"
-#include "sys/msg.h"
-#include "sys/sem.h"
-#include "sys/shm.h"
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/msg.h>
+#include <sys/sem.h>
+#include <sys/shm.h>
 
 #if defined(__APPLE__) || defined(__FreeBSD__)
 # include <sys/msgbuf.h>
diff --git a/hphp/runtime/ext/ext_mcrypt.cpp b/hphp/runtime/ext/ext_mcrypt.cpp
index 28581b6ab..d190731ce 100644
--- a/hphp/runtime/ext/ext_mcrypt.cpp
+++ b/hphp/runtime/ext/ext_mcrypt.cpp
@@ -17,8 +17,8 @@
 
 #include "hphp/runtime/ext/ext_mcrypt.h"
 
-#include "sys/types.h"
-#include "sys/stat.h"
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <fcntl.h>
 
 #define NON_FREE
diff --git a/hphp/runtime/ext/ext_network.cpp b/hphp/runtime/ext/ext_network.cpp
index 098e9c40b..223a734c1 100644
--- a/hphp/runtime/ext/ext_network.cpp
+++ b/hphp/runtime/ext/ext_network.cpp
@@ -24,7 +24,7 @@
 #include "hphp/runtime/base/file/file.h"
 #include "netinet/in.h"
 #include <netdb.h>
-#include "sys/socket.h"
+#include <sys/socket.h>
 #include "arpa/inet.h"
 #include "arpa/nameser.h"
 #include <resolv.h>
diff --git a/hphp/runtime/ext/ext_options.cpp b/hphp/runtime/ext/ext_options.cpp
index 21e4d7211..29c8eef84 100644
--- a/hphp/runtime/ext/ext_options.cpp
+++ b/hphp/runtime/ext/ext_options.cpp
@@ -27,7 +27,7 @@
 #include "hphp/runtime/base/zend/zend_functions.h"
 #include "hphp/runtime/base/zend/zend_string.h"
 #include "hphp/util/process.h"
-#include "sys/utsname.h"
+#include <sys/utsname.h>
 #include <pwd.h>
 
 #include "hphp/runtime/vm/request_arena.h"
diff --git a/hphp/runtime/ext/ext_posix.cpp b/hphp/runtime/ext/ext_posix.cpp
index 0d9311aa3..9577951f4 100644
--- a/hphp/runtime/ext/ext_posix.cpp
+++ b/hphp/runtime/ext/ext_posix.cpp
@@ -17,10 +17,10 @@
 
 #include "hphp/runtime/ext/ext_posix.h"
 #include "hphp/runtime/base/file/file.h"
-#include "sys/times.h"
-#include "sys/utsname.h"
-#include "sys/types.h"
-#include "sys/time.h"
+#include <sys/times.h>
+#include <sys/utsname.h>
+#include <sys/types.h>
+#include <sys/time.h>
 #include <pwd.h>
 #include <memory>
 
diff --git a/hphp/runtime/ext/ext_posix.h b/hphp/runtime/ext/ext_posix.h
index 5b5b2953d..93a9cb0b6 100644
--- a/hphp/runtime/ext/ext_posix.h
+++ b/hphp/runtime/ext/ext_posix.h
@@ -19,7 +19,7 @@
 #define incl_HPHP_EXT_POSIX_H_
 
 #include "hphp/runtime/base/base_includes.h"
-#include "sys/types.h"
+#include <sys/types.h>
 #include <grp.h>
 #include <signal.h>
 
diff --git a/hphp/runtime/ext/ext_process.h b/hphp/runtime/ext/ext_process.h
index e8b3e9414..3b193f690 100644
--- a/hphp/runtime/ext/ext_process.h
+++ b/hphp/runtime/ext/ext_process.h
@@ -19,7 +19,7 @@
 #define incl_HPHP_EXT_PROCESS_H_
 
 #include "hphp/runtime/base/base_includes.h"
-#include "sys/wait.h"
+#include <sys/wait.h>
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/hphp/runtime/ext/ext_session.cpp b/hphp/runtime/ext/ext_session.cpp
index 08f131d79..55d9c1bd0 100644
--- a/hphp/runtime/ext/ext_session.cpp
+++ b/hphp/runtime/ext/ext_session.cpp
@@ -30,8 +30,8 @@
 #include "hphp/util/lock.h"
 #include "hphp/util/logger.h"
 #include "hphp/util/compatibility.h"
-#include "sys/types.h"
-#include "sys/stat.h"
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <fcntl.h>
 #include <dirent.h>
 
diff --git a/hphp/runtime/ext/ext_socket.cpp b/hphp/runtime/ext/ext_socket.cpp
index 9c72213d6..7e4722235 100644
--- a/hphp/runtime/ext/ext_socket.cpp
+++ b/hphp/runtime/ext/ext_socket.cpp
@@ -20,19 +20,19 @@
 #include "hphp/runtime/base/file/ssl_socket.h"
 #include "hphp/runtime/base/server/server_stats.h"
 
-#include "sys/types.h"
-#include "sys/socket.h"
+#include <sys/types.h>
+#include <sys/socket.h>
 #include <netdb.h>
 #include "netinet/in.h"
 #include "netinet/tcp.h"
-#include "sys/un.h"
+#include <sys/un.h>
 #include "arpa/inet.h"
-#include "sys/time.h"
+#include <sys/time.h>
 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
-#include "sys/uio.h"
+#include <sys/uio.h>
 #include "hphp/util/network.h"
 #include <poll.h>
 
diff --git a/hphp/runtime/ext/ext_stream.cpp b/hphp/runtime/ext/ext_stream.cpp
index 5efeffee3..80c552b79 100644
--- a/hphp/runtime/ext/ext_stream.cpp
+++ b/hphp/runtime/ext/ext_stream.cpp
@@ -30,10 +30,10 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <poll.h>
-#include "sys/types.h"
-#include "sys/socket.h"
+#include <sys/types.h>
+#include <sys/socket.h>
 #if defined(AF_UNIX)
-#include "sys/un.h"
+#include <sys/un.h>
 #endif
 
 #define PHP_STREAM_BUFFER_NONE  0   /* unbuffered */
diff --git a/hphp/runtime/ext/hash/hash_furc.cpp b/hphp/runtime/ext/hash/hash_furc.cpp
index 8551bb995..028b155cf 100644
--- a/hphp/runtime/ext/hash/hash_furc.cpp
+++ b/hphp/runtime/ext/hash/hash_furc.cpp
@@ -33,7 +33,7 @@
 
 #include <assert.h>
 #include <stdint.h>
-#include "sys/time.h"
+#include <sys/time.h>
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
diff --git a/hphp/runtime/ext/thrift/binary.cpp b/hphp/runtime/ext/thrift/binary.cpp
index 10a368be4..d525c1dbf 100644
--- a/hphp/runtime/ext/thrift/binary.cpp
+++ b/hphp/runtime/ext/thrift/binary.cpp
@@ -22,7 +22,7 @@
 #include "hphp/runtime/base/base_includes.h"
 #include "hphp/util/logger.h"
 
-#include "sys/types.h"
+#include <sys/types.h>
 #include "netinet/in.h"
 #include <unistd.h>
 #include <stdexcept>
diff --git a/hphp/runtime/ext/thrift/transport.h b/hphp/runtime/ext/thrift/transport.h
index 918ffdcb4..b5b74b8e5 100644
--- a/hphp/runtime/ext/thrift/transport.h
+++ b/hphp/runtime/ext/thrift/transport.h
@@ -21,7 +21,7 @@
 #include "hphp/runtime/base/base_includes.h"
 #include "hphp/util/logger.h"
 
-#include "sys/types.h"
+#include <sys/types.h>
 #include "netinet/in.h"
 #include <unistd.h>
 #if defined(__FreeBSD__)
diff --git a/hphp/runtime/vm/bytecode.cpp b/hphp/runtime/vm/bytecode.cpp
index 451ad8e74..636fe4cb5 100644
--- a/hphp/runtime/vm/bytecode.cpp
+++ b/hphp/runtime/vm/bytecode.cpp
@@ -14,19 +14,8 @@
    +----------------------------------------------------------------------+
 */
 
-#include <iostream>
-#include <iomanip>
-#include <algorithm>
-#include <boost/format.hpp>
-#include <boost/utility/typed_in_place_factory.hpp>
-
-#include <cinttypes>
-
-#include <libgen.h>
-#include "sys/mman.h"
-
-#include "hphp/compiler/builtin_symbols.h"
 #include "hphp/runtime/vm/bytecode.h"
+#include "hphp/compiler/builtin_symbols.h"
 #include "hphp/runtime/vm/event_hook.h"
 #include "hphp/runtime/vm/translator/translator-deps.h"
 #include "hphp/runtime/vm/translator/translator-x64.h"
@@ -68,6 +57,16 @@
 #include "hphp/runtime/vm/request_arena.h"
 #include "hphp/util/arena.h"
 
+#include <iostream>
+#include <iomanip>
+#include <algorithm>
+#include <boost/format.hpp>
+#include <boost/utility/typed_in_place_factory.hpp>
+
+#include <cinttypes>
+
+#include <libgen.h>
+#include <sys/mman.h>
 
 namespace HPHP {
 
diff --git a/hphp/runtime/vm/debug/debug.cpp b/hphp/runtime/vm/debug/debug.cpp
index a0eecb62b..32a0e25f8 100644
--- a/hphp/runtime/vm/debug/debug.cpp
+++ b/hphp/runtime/vm/debug/debug.cpp
@@ -14,13 +14,13 @@
    +----------------------------------------------------------------------+
 */
 
-#include "hphp/runtime/base/execution_context.h"
-
-#include "debug.h"
+#include "hphp/runtime/vm/debug/debug.h"
 #include "hphp/runtime/vm/debug/gdb-jit.h"
 #include "hphp/runtime/vm/debug/elfwriter.h"
 
-#include "sys/types.h"
+#include "hphp/runtime/base/execution_context.h"
+
+#include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
@@ -107,7 +107,7 @@ void DebugInfo::recordBCInstr(TCRange range, uint32_t op) {
       name = highOpcodeName[op - OpHighStart];
     }
     fprintf(m_perfMap, "%lx %x %s\n",
-	    uintptr_t(range.begin()), range.size(), name);
+            uintptr_t(range.begin()), range.size(), name);
   }
 }
 
diff --git a/hphp/runtime/vm/debug/gdb-jit.cpp b/hphp/runtime/vm/debug/gdb-jit.cpp
index a34e4c33d..eea46d927 100644
--- a/hphp/runtime/vm/debug/gdb-jit.cpp
+++ b/hphp/runtime/vm/debug/gdb-jit.cpp
@@ -13,14 +13,14 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <stdio.h>
-#include <stdlib.h>
-#include "sys/mman.h"
-
 #include "hphp/runtime/vm/debug/gdb-jit.h"
 #include "hphp/util/lock.h"
 #include "hphp/runtime/base/execution_context.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/mman.h>
+
 using namespace HPHP;
 
 struct jit_descriptor __jit_debug_descriptor = { 1, 0, 0, 0 };
diff --git a/hphp/runtime/vm/repo.h b/hphp/runtime/vm/repo.h
index ab6237e6a..1c0ca8777 100644
--- a/hphp/runtime/vm/repo.h
+++ b/hphp/runtime/vm/repo.h
@@ -26,7 +26,7 @@
 // For sysconf(3).
 #include <unistd.h>
 // For getpwuid_r(3).
-#include "sys/types.h"
+#include <sys/types.h>
 #include <pwd.h>
 
 namespace HPHP {
diff --git a/hphp/runtime/vm/translator/targetcache.cpp b/hphp/runtime/vm/translator/targetcache.cpp
index 64365f6b2..b20241089 100644
--- a/hphp/runtime/vm/translator/targetcache.cpp
+++ b/hphp/runtime/vm/translator/targetcache.cpp
@@ -13,13 +13,7 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <string>
-#include <stdio.h>
-#include "sys/mman.h"
-
-#include "hphp/util/trace.h"
-#include "hphp/util/base.h"
-#include "hphp/util/maphuge.h"
+#include "hphp/runtime/vm/translator/targetcache.h"
 #include "hphp/runtime/base/complex_types.h"
 #include "hphp/runtime/base/execution_context.h"
 #include "hphp/runtime/base/types.h"
@@ -28,9 +22,15 @@
 #include "hphp/runtime/vm/class.h"
 #include "hphp/runtime/vm/runtime.h"
 #include "hphp/runtime/vm/translator/annotation.h"
-#include "hphp/runtime/vm/translator/targetcache.h"
 #include "hphp/runtime/vm/translator/translator-inline.h"
 #include "hphp/runtime/base/stats.h"
+#include "hphp/util/trace.h"
+#include "hphp/util/base.h"
+#include "hphp/util/maphuge.h"
+
+#include <string>
+#include <stdio.h>
+#include <sys/mman.h>
 
 using namespace HPHP::MethodLookup;
 using namespace HPHP::Util;
diff --git a/hphp/runtime/vm/translator/translator-x64.cpp b/hphp/runtime/vm/translator/translator-x64.cpp
index 5e6bc32bf..4f6977d0c 100644
--- a/hphp/runtime/vm/translator/translator-x64.cpp
+++ b/hphp/runtime/vm/translator/translator-x64.cpp
@@ -19,7 +19,7 @@
 #include <stdint.h>
 #include <assert.h>
 #include <unistd.h>
-#include "sys/mman.h"
+#include <sys/mman.h>
 #include <strstream>
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/hphp/runtime/vm/translator/writelease.cpp b/hphp/runtime/vm/translator/writelease.cpp
index ff2ed0564..aa75d09ab 100644
--- a/hphp/runtime/vm/translator/writelease.cpp
+++ b/hphp/runtime/vm/translator/writelease.cpp
@@ -13,12 +13,12 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include "sys/mman.h"
-
+#include "hphp/runtime/vm/translator/writelease.h"
 #include "hphp/util/timer.h"
 #include "hphp/runtime/vm/bytecode.h"
 #include "hphp/runtime/vm/translator/translator.h"
-#include "hphp/runtime/vm/translator/writelease.h"
+
+#include <sys/mman.h>
 
 namespace HPHP { namespace Transl {
 TRACE_SET_MOD(txlease);
diff --git a/hphp/runtime/vm/translator/writelease.h b/hphp/runtime/vm/translator/writelease.h
index cadb28357..b614bd5df 100644
--- a/hphp/runtime/vm/translator/writelease.h
+++ b/hphp/runtime/vm/translator/writelease.h
@@ -16,6 +16,8 @@
 #ifndef incl_HPHP_WRITELEASE_H_
 #define incl_HPHP_WRITELEASE_H_
 
+#include "hphp/util/base.h"
+
 #include <pthread.h>
 
 namespace HPHP { namespace Transl {
diff --git a/hphp/runtime/vm/type_profile.cpp b/hphp/runtime/vm/type_profile.cpp
index 0047f177d..017f63f94 100644
--- a/hphp/runtime/vm/type_profile.cpp
+++ b/hphp/runtime/vm/type_profile.cpp
@@ -20,9 +20,9 @@
 #include "hphp/util/trace.h"
 
 #include <string.h>
-#include "sys/types.h"
-#include "sys/stat.h"
-#include "sys/mman.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
 #include <unistd.h>
 #include <fcntl.h>
 
diff --git a/hphp/runtime/vm/unit.cpp b/hphp/runtime/vm/unit.cpp
index 1c6edefd1..6bf82f2df 100644
--- a/hphp/runtime/vm/unit.cpp
+++ b/hphp/runtime/vm/unit.cpp
@@ -14,7 +14,7 @@
    +----------------------------------------------------------------------+
 */
 
-#include "sys/mman.h"
+#include <sys/mman.h>
 
 #include <iostream>
 #include <iomanip>
diff --git a/hphp/test/test_base.cpp b/hphp/test/test_base.cpp
index aa2b77c57..c5ec6ca30 100644
--- a/hphp/test/test_base.cpp
+++ b/hphp/test/test_base.cpp
@@ -15,7 +15,7 @@
 */
 
 #include "hphp/test/test_base.h"
-#include "sys/param.h"
+#include <sys/param.h>
 #include "hphp/compiler/option.h"
 #include "hphp/test/test.h"
 #include "hphp/runtime/base/complex_types.h"
diff --git a/hphp/test/test_ext_ipc.cpp b/hphp/test/test_ext_ipc.cpp
index 3bdef6c5b..d30b61538 100644
--- a/hphp/test/test_ext_ipc.cpp
+++ b/hphp/test/test_ext_ipc.cpp
@@ -16,7 +16,7 @@
 
 #include "hphp/test/test_ext_ipc.h"
 #include "hphp/runtime/ext/ext_ipc.h"
-#include "sys/wait.h"
+#include <sys/wait.h>
 
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/hphp/test/test_logger.cpp b/hphp/test/test_logger.cpp
index d7af99a36..6fdb07477 100644
--- a/hphp/test/test_logger.cpp
+++ b/hphp/test/test_logger.cpp
@@ -17,7 +17,7 @@
 #include "hphp/test/test_logger.h"
 #include <pwd.h>
 #include <unistd.h>
-#include "sys/param.h"
+#include <sys/param.h>
 #include "hphp/runtime/base/util/http_client.h"
 #include "hphp/runtime/ext/ext_json.h"
 #include "hphp/runtime/ext/ext_mb.h"
diff --git a/hphp/util/alloc.cpp b/hphp/util/alloc.cpp
index b6de9aeaf..eec38e5f9 100644
--- a/hphp/util/alloc.cpp
+++ b/hphp/util/alloc.cpp
@@ -17,7 +17,7 @@
 
 #include <atomic>
 
-#include "sys/mman.h"
+#include <sys/mman.h>
 #include <stdlib.h>
 #include <errno.h>
 #include "hphp/util/util.h"
diff --git a/hphp/util/asm-x64.cpp b/hphp/util/asm-x64.cpp
index a228f88a5..9e3b6c982 100644
--- a/hphp/util/asm-x64.cpp
+++ b/hphp/util/asm-x64.cpp
@@ -22,8 +22,8 @@
 #include <errno.h>
 
 #include <unistd.h>
-#include "sys/mman.h"
-#include "sys/types.h"
+#include <sys/mman.h>
+#include <sys/types.h>
 
 #include "hphp/util/assertions.h"
 #include "hphp/util/maphuge.h"
diff --git a/hphp/util/async_job.h b/hphp/util/async_job.h
index 9443a79b6..33f38121f 100644
--- a/hphp/util/async_job.h
+++ b/hphp/util/async_job.h
@@ -21,7 +21,7 @@
 #include "hphp/util/async_func.h"
 #include "hphp/util/lock.h"
 #include <algorithm>
-#include "sys/time.h"
+#include <sys/time.h>
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/hphp/util/base.h b/hphp/util/base.h
index 8c69970c9..ba7b6e2a4 100644
--- a/hphp/util/base.h
+++ b/hphp/util/base.h
@@ -33,14 +33,14 @@
 #include <signal.h>
 #include <fcntl.h>
 
-#include "sys/time.h"
-#include "sys/stat.h"
-#include "sys/types.h"
-#include "sys/resource.h"
-#include "sys/utsname.h"
-#include "sys/socket.h"
-#include "sys/wait.h"
-#include "sys/poll.h"
+#include <sys/time.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/resource.h>
+#include <sys/utsname.h>
+#include <sys/socket.h>
+#include <sys/wait.h>
+#include <sys/poll.h>
 
 #include <fstream>
 #include <iostream>
diff --git a/hphp/util/capability.cpp b/hphp/util/capability.cpp
index 198aa7991..1ef20b997 100644
--- a/hphp/util/capability.cpp
+++ b/hphp/util/capability.cpp
@@ -19,9 +19,9 @@
 #include "hphp/util/capability.h"
 #include "hphp/util/logger.h"
 #include "linux/types.h"
-#include "sys/capability.h"
-#include "sys/prctl.h"
-#include "sys/types.h"
+#include <sys/capability.h>
+#include <sys/prctl.h>
+#include <sys/types.h>
 #include <pwd.h>
 
 namespace HPHP {
diff --git a/hphp/util/capability.h b/hphp/util/capability.h
index f8e004506..b4228a880 100644
--- a/hphp/util/capability.h
+++ b/hphp/util/capability.h
@@ -19,7 +19,7 @@
 
 #if !defined(SKIP_USER_CHANGE)
 
-#include "sys/types.h"
+#include <sys/types.h>
 #include <unistd.h>
 #include <string>
 
diff --git a/hphp/util/cronoutils.h b/hphp/util/cronoutils.h
index 4fa03fbb9..2c1a1fdd8 100644
--- a/hphp/util/cronoutils.h
+++ b/hphp/util/cronoutils.h
@@ -90,8 +90,8 @@
 #include <direct.h>
 #endif
 #include <string.h>
-#include "sys/types.h"
-#include "sys/stat.h"
+#include <sys/types.h>
+#include <sys/stat.h>
 
 
 #if TIME_WITH_SYS_TIME
diff --git a/hphp/util/embedded_data.cpp b/hphp/util/embedded_data.cpp
index 27e16a6de..74c5099f9 100644
--- a/hphp/util/embedded_data.cpp
+++ b/hphp/util/embedded_data.cpp
@@ -21,8 +21,8 @@
 #include <libelf.h>
 #include <gelf.h>
 #include <stdio.h>
-#include "sys/types.h"
-#include "sys/stat.h"
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/hphp/util/embedded_vfs.cpp b/hphp/util/embedded_vfs.cpp
index c428de7dd..061f37879 100644
--- a/hphp/util/embedded_vfs.cpp
+++ b/hphp/util/embedded_vfs.cpp
@@ -25,8 +25,8 @@
 #include <stdio.h>
 
 #include <unistd.h>
-#include "sys/types.h"
-#include "sys/stat.h"
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <fcntl.h>
 
 
diff --git a/hphp/util/file_cache.cpp b/hphp/util/file_cache.cpp
index 7d862c800..5eb7b6f55 100644
--- a/hphp/util/file_cache.cpp
+++ b/hphp/util/file_cache.cpp
@@ -19,7 +19,7 @@
 #include "hphp/util/compression.h"
 #include "util.h"
 #include "hphp/util/logger.h"
-#include "sys/mman.h"
+#include <sys/mman.h>
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/hphp/util/kernel_version.cpp b/hphp/util/kernel_version.cpp
index 4bec7ce2d..649f9d6a9 100644
--- a/hphp/util/kernel_version.cpp
+++ b/hphp/util/kernel_version.cpp
@@ -13,13 +13,13 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include <unistd.h>
-#include "sys/utsname.h"
-#include <stdio.h>
-
+#include "hphp/util/kernel_version.h"
 #include "hphp/util/util.h"
 #include "hphp/util/assertions.h"
-#include "hphp/util/kernel_version.h"
+
+#include <unistd.h>
+#include <sys/utsname.h>
+#include <stdio.h>
 
 namespace HPHP {
 
diff --git a/hphp/util/light_process.cpp b/hphp/util/light_process.cpp
index 493576140..fdbcf7efd 100644
--- a/hphp/util/light_process.cpp
+++ b/hphp/util/light_process.cpp
@@ -24,7 +24,7 @@
 #include <vector>
 #include <stdlib.h>
 #include <unistd.h>
-#include "sys/wait.h"
+#include <sys/wait.h>
 #include <poll.h>
 #include <pwd.h>
 #include <signal.h>
diff --git a/hphp/util/maphuge.cpp b/hphp/util/maphuge.cpp
index 2454d8b17..fe064a947 100644
--- a/hphp/util/maphuge.cpp
+++ b/hphp/util/maphuge.cpp
@@ -15,8 +15,8 @@
 */
 
 #include <unistd.h>
-#include "sys/mman.h"
-#include "sys/types.h"
+#include <sys/mman.h>
+#include <sys/types.h>
 
 #include "hphp/util/kernel_version.h"
 
diff --git a/hphp/util/neo/neo_files.h b/hphp/util/neo/neo_files.h
index 56674106d..cc7ade8da 100644
--- a/hphp/util/neo/neo_files.h
+++ b/hphp/util/neo/neo_files.h
@@ -15,7 +15,7 @@
 __BEGIN_DECLS
 
 #include <stdarg.h>
-#include "sys/types.h"
+#include <sys/types.h>
 #include "hphp/util/neo/ulist.h"
 
 
@@ -29,7 +29,7 @@ NEOERR *ne_save_file (const char *path, char *str);
 NEOERR *ne_remove_dir (const char *path);
 NEOERR *ne_listdir(const char *path, ULIST **files);
 NEOERR *ne_listdir_match(const char *path, ULIST **files, const char *match);
-NEOERR *ne_listdir_fmatch(const char *path, ULIST **files, MATCH_FUNC fmatch, 
+NEOERR *ne_listdir_fmatch(const char *path, ULIST **files, MATCH_FUNC fmatch,
                           void *rock);
 
 __END_DECLS
diff --git a/hphp/util/neo/neo_misc.h b/hphp/util/neo/neo_misc.h
index 6b1faaf1f..c5e8d498c 100644
--- a/hphp/util/neo/neo_misc.h
+++ b/hphp/util/neo/neo_misc.h
@@ -90,7 +90,7 @@ int vsnprintf (char *str, size_t count, const char *fmt, va_list arg);
 #endif
 
 #include <stdarg.h>
-#include "sys/types.h"
+#include <sys/types.h>
 
 typedef unsigned int UINT32;
 typedef int INT32;
diff --git a/hphp/util/network.h b/hphp/util/network.h
index f34e4f211..a6f358990 100644
--- a/hphp/util/network.h
+++ b/hphp/util/network.h
@@ -20,7 +20,7 @@
 #include "hphp/util/base.h"
 #include <string>
 #include <netdb.h>
-#include "sys/socket.h"
+#include <sys/socket.h>
 #include <stdlib.h>
 
 /**
diff --git a/hphp/util/process.h b/hphp/util/process.h
index fe6f8237e..2473a4d57 100644
--- a/hphp/util/process.h
+++ b/hphp/util/process.h
@@ -18,7 +18,7 @@
 #define incl_HPHP_PROCESS_H_
 
 #include "hphp/util/base.h"
-#include "sys/syscall.h"
+#include <sys/syscall.h>
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/hphp/util/read_only_arena.cpp b/hphp/util/read_only_arena.cpp
index f71c0be01..eb34cc86a 100644
--- a/hphp/util/read_only_arena.cpp
+++ b/hphp/util/read_only_arena.cpp
@@ -15,7 +15,7 @@
 */
 #include "hphp/util/read_only_arena.h"
 
-#include "sys/mman.h"
+#include <sys/mman.h>
 
 #include "folly/Exception.h"
 
diff --git a/hphp/util/shm_counter.cpp b/hphp/util/shm_counter.cpp
index 98d7eed66..488aeadd9 100644
--- a/hphp/util/shm_counter.cpp
+++ b/hphp/util/shm_counter.cpp
@@ -13,14 +13,14 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
+#include "hphp/util/shm_counter.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
-#include "sys/ipc.h"
-#include "sys/shm.h"
+#include <sys/ipc.h>
+#include <sys/shm.h>
 #include <new>
-#include "hphp/util/shm_counter.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/hphp/util/smalllocks.h b/hphp/util/smalllocks.h
index 189fb286a..64503c768 100644
--- a/hphp/util/smalllocks.h
+++ b/hphp/util/smalllocks.h
@@ -22,7 +22,7 @@
 #ifdef __linux__
 #include <syscall.h>
 #include "linux/futex.h"
-#include "sys/time.h"
+#include <sys/time.h>
 #endif
 
 namespace HPHP {
diff --git a/hphp/util/stack_trace.cpp b/hphp/util/stack_trace.cpp
index f5a20cf52..fc4ae51c4 100644
--- a/hphp/util/stack_trace.cpp
+++ b/hphp/util/stack_trace.cpp
@@ -24,8 +24,8 @@
 #include <execinfo.h>
 #include <bfd.h>
 #include <signal.h>
-#include "sys/types.h"
-#include "sys/stat.h"
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <fcntl.h>
 #include "hphp/util/light_process.h"
 #include "hphp/util/compatibility.h"
diff --git a/hphp/util/util.cpp b/hphp/util/util.cpp
index ef3f2c5c0..adcfecc3a 100644
--- a/hphp/util/util.cpp
+++ b/hphp/util/util.cpp
@@ -21,9 +21,9 @@
 #include "hphp/util/exception.h"
 #include "hphp/util/network.h"
 
-#include "sys/types.h"
+#include <sys/types.h>
 #include <dirent.h>
-#include "sys/stat.h"
+#include <sys/stat.h>
 #include <fcntl.h>
 #include <libgen.h>
 #include <execinfo.h>