diff --git a/system/hwc3/Layer.h b/system/hwc3/Layer.h
index 7d6a9ed..4d100a1 100644
--- a/system/hwc3/Layer.h
+++ b/system/hwc3/Layer.h
@@ -31,8 +31,8 @@
   Layer(const Layer&) = delete;
   Layer& operator=(const Layer&) = delete;
 
-  Layer(Layer&&) = default;
-  Layer& operator=(Layer&&) = default;
+  Layer(Layer&&) = delete;
+  Layer& operator=(Layer&&) = delete;
 
   int64_t getId() const { return mId; }
 
@@ -113,4 +113,4 @@
 
 }  // namespace aidl::android::hardware::graphics::composer3::impl
 
-#endif
\ No newline at end of file
+#endif
diff --git a/system/hwc3/VsyncThread.h b/system/hwc3/VsyncThread.h
index 5738b5d..ffa859f 100644
--- a/system/hwc3/VsyncThread.h
+++ b/system/hwc3/VsyncThread.h
@@ -36,11 +36,11 @@
   VsyncThread(int64_t id);
   virtual ~VsyncThread();
 
-  VsyncThread(const VsyncThread&) = default;
-  VsyncThread& operator=(const VsyncThread&) = default;
+  VsyncThread(const VsyncThread&) = delete;
+  VsyncThread& operator=(const VsyncThread&) = delete;
 
-  VsyncThread(VsyncThread&&) = default;
-  VsyncThread& operator=(VsyncThread&&) = default;
+  VsyncThread(VsyncThread&&) = delete;
+  VsyncThread& operator=(VsyncThread&&) = delete;
 
   HWC3::Error start(int32_t periodNanos);
 
@@ -84,4 +84,4 @@
 
 }  // namespace aidl::android::hardware::graphics::composer3::impl
 
-#endif
\ No newline at end of file
+#endif