diff --git a/hphp/runtime/ext/asio/gen_vector_wait_handle.cpp b/hphp/runtime/ext/asio/gen_vector_wait_handle.cpp
index 773e959da..d41708b79 100644
--- a/hphp/runtime/ext/asio/gen_vector_wait_handle.cpp
+++ b/hphp/runtime/ext/asio/gen_vector_wait_handle.cpp
@@ -15,12 +15,12 @@
    +----------------------------------------------------------------------+
 */
 
-#include <runtime/ext/ext_asio.h>
-#include <runtime/ext/ext_collections.h>
-#include <runtime/ext/ext_closure.h>
-#include <runtime/ext/asio/asio_context.h>
-#include <runtime/ext/asio/asio_session.h>
-#include <system/lib/systemlib.h>
+#include "hphp/runtime/ext/ext_asio.h"
+#include "hphp/runtime/ext/ext_collections.h"
+#include "hphp/runtime/ext/ext_closure.h"
+#include "hphp/runtime/ext/asio/asio_context.h"
+#include "hphp/runtime/ext/asio/asio_session.h"
+#include "hphp/system/lib/systemlib.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/hphp/test/ext/test_ext_memcached.cpp b/hphp/test/ext/test_ext_memcached.cpp
index cbbdbaa2a..d23cac125 100644
--- a/hphp/test/ext/test_ext_memcached.cpp
+++ b/hphp/test/ext/test_ext_memcached.cpp
@@ -17,7 +17,7 @@
 #include "hphp/test/ext/test_ext_memcached.h"
 #include "hphp/runtime/ext/ext_memcached.h"
 #include "hphp/runtime/ext/ext_options.h"
-#include <test/test_memcached_info.inc>
+#include "hphp/test/test_memcached_info.inc"
 
 IMPLEMENT_SEP_EXTENSION_TEST(Memcached);
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/hphp/tools/gen-ext-hhvm/gen-infotabs.cpp b/hphp/tools/gen-ext-hhvm/gen-infotabs.cpp
index 7c2b3a2e5..1089fdd40 100644
--- a/hphp/tools/gen-ext-hhvm/gen-infotabs.cpp
+++ b/hphp/tools/gen-ext-hhvm/gen-infotabs.cpp
@@ -49,8 +49,8 @@ int main(int argc, const char* argv[]) {
 
   std::ofstream cpp(argv[1]);
 
-  cpp << "#include \"runtime/ext_hhvm/ext_hhvm.h\"\n";
-  cpp << "#include \"runtime/ext/ext.h\"\n";
+  cpp << "#include \"hphp/runtime/ext_hhvm/ext_hhvm.h\"\n";
+  cpp << "#include \"hphp/runtime/ext/ext.h\"\n";
   cpp << "#include \"ext_hhvm_infotabs.h\"\n";
   cpp << "namespace HPHP {\n";
   cpp << "  struct TypedValue;\n";