diff --git a/Android.bp b/Android.bp
index b6aff3e..583248b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -124,7 +124,7 @@
     "adb_trace.cpp",
     "adb_unique_fd.cpp",
     "adb_utils.cpp",
-    "fdevent.cpp",
+    "fdevent/fdevent.cpp",
     "services.cpp",
     "sockets.cpp",
     "socket_spec.cpp",
@@ -144,7 +144,7 @@
     "adb_io_test.cpp",
     "adb_listeners_test.cpp",
     "adb_utils_test.cpp",
-    "fdevent_test.cpp",
+    "fdevent/fdevent_test.cpp",
     "socket_spec_test.cpp",
     "socket_test.cpp",
     "sysdeps_test.cpp",
diff --git a/adb.h b/adb.h
index 3a6f059..352b2fe 100644
--- a/adb.h
+++ b/adb.h
@@ -26,7 +26,7 @@
 #include <android-base/macros.h>
 
 #include "adb_trace.h"
-#include "fdevent.h"
+#include "fdevent/fdevent.h"
 #include "socket.h"
 #include "types.h"
 #include "usb.h"
diff --git a/adb_listeners_test.cpp b/adb_listeners_test.cpp
index b697769..a7e2dea 100644
--- a/adb_listeners_test.cpp
+++ b/adb_listeners_test.cpp
@@ -21,7 +21,7 @@
 #include <android-base/stringprintf.h>
 #include <android-base/strings.h>
 
-#include "fdevent.h"
+#include "fdevent/fdevent.h"
 #include "sysdeps.h"
 #include "transport.h"
 
diff --git a/client/transport_mdns.cpp b/client/transport_mdns.cpp
index 283fac5..1a34384 100644
--- a/client/transport_mdns.cpp
+++ b/client/transport_mdns.cpp
@@ -31,7 +31,7 @@
 
 #include "adb_mdns.h"
 #include "adb_trace.h"
-#include "fdevent.h"
+#include "fdevent/fdevent.h"
 #include "sysdeps.h"
 
 static DNSServiceRef service_ref;
diff --git a/daemon/auth.cpp b/daemon/auth.cpp
index 00268a7..2b8f461 100644
--- a/daemon/auth.cpp
+++ b/daemon/auth.cpp
@@ -19,7 +19,7 @@
 #include "adb.h"
 #include "adb_auth.h"
 #include "adb_io.h"
-#include "fdevent.h"
+#include "fdevent/fdevent.h"
 #include "sysdeps.h"
 #include "transport.h"
 
diff --git a/daemon/framebuffer_service.cpp b/daemon/framebuffer_service.cpp
index 2a6418a..676f8e9 100644
--- a/daemon/framebuffer_service.cpp
+++ b/daemon/framebuffer_service.cpp
@@ -33,7 +33,6 @@
 #include "adb.h"
 #include "adb_io.h"
 #include "adb_utils.h"
-#include "fdevent.h"
 
 /* TODO:
 ** - sync with vsync to avoid tearing
diff --git a/fdevent.cpp b/fdevent/fdevent.cpp
similarity index 100%
rename from fdevent.cpp
rename to fdevent/fdevent.cpp
diff --git a/fdevent.h b/fdevent/fdevent.h
similarity index 100%
rename from fdevent.h
rename to fdevent/fdevent.h
diff --git a/fdevent_test.cpp b/fdevent/fdevent_test.cpp
similarity index 100%
rename from fdevent_test.cpp
rename to fdevent/fdevent_test.cpp
diff --git a/fdevent_test.h b/fdevent/fdevent_test.h
similarity index 100%
rename from fdevent_test.h
rename to fdevent/fdevent_test.h
diff --git a/socket.h b/socket.h
index b8c559a..4276851 100644
--- a/socket.h
+++ b/socket.h
@@ -24,7 +24,7 @@
 #include <string>
 
 #include "adb_unique_fd.h"
-#include "fdevent.h"
+#include "fdevent/fdevent.h"
 #include "types.h"
 
 class atransport;
diff --git a/socket_test.cpp b/socket_test.cpp
index 5e28f76..1601ff0 100644
--- a/socket_test.cpp
+++ b/socket_test.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "fdevent.h"
+#include "fdevent/fdevent.h"
 
 #include <gtest/gtest.h>
 
@@ -29,7 +29,7 @@
 
 #include "adb.h"
 #include "adb_io.h"
-#include "fdevent_test.h"
+#include "fdevent/fdevent_test.h"
 #include "socket.h"
 #include "sysdeps.h"
 #include "sysdeps/chrono.h"
diff --git a/sysdeps.h b/sysdeps.h
index 78abba5..b0e7fa0 100644
--- a/sysdeps.h
+++ b/sysdeps.h
@@ -64,8 +64,6 @@
 #include <memory>   // unique_ptr
 #include <string>
 
-#include "fdevent.h"
-
 #define OS_PATH_SEPARATORS "\\/"
 #define OS_PATH_SEPARATOR '\\'
 #define OS_PATH_SEPARATOR_STR "\\"
diff --git a/transport.cpp b/transport.cpp
index 841865a..8bc925f 100644
--- a/transport.cpp
+++ b/transport.cpp
@@ -49,7 +49,7 @@
 #include "adb_io.h"
 #include "adb_trace.h"
 #include "adb_utils.h"
-#include "fdevent.h"
+#include "fdevent/fdevent.h"
 #include "sysdeps/chrono.h"
 
 using android::base::ScopedLockAssertion;
diff --git a/transport_test.cpp b/transport_test.cpp
index b66f8fa..00beb3a 100644
--- a/transport_test.cpp
+++ b/transport_test.cpp
@@ -19,7 +19,7 @@
 #include <gtest/gtest.h>
 
 #include "adb.h"
-#include "fdevent_test.h"
+#include "fdevent/fdevent_test.h"
 
 struct TransportTest : public FdeventTest {};