diff --git a/external/android-emugl/shared/OpenglCodecCommon/GLDecoderContextData.h b/external/android-emugl/shared/OpenglCodecCommon/GLDecoderContextData.h
index 3a6ee178aeed94bdb19f201c598ff8e8b4c978bb..f8720bf8e5ed4f4a687f6b46dbb88c0a9a322cde 100644
--- a/external/android-emugl/shared/OpenglCodecCommon/GLDecoderContextData.h
+++ b/external/android-emugl/shared/OpenglCodecCommon/GLDecoderContextData.h
@@ -52,7 +52,7 @@ public:
               mNumLocations(static_cast<unsigned>(numLocations)) {
         mPointerData.resize(mNumLocations);
     }
-
+    ~GLDecoderContextData(){}
     // Store |len| bytes from |data| into the buffer associated with
     // vertex attribute index |loc|.
     void storePointerData(unsigned int loc, void *data, size_t len) {
diff --git a/src/anbox/cmds/system_info.cpp b/src/anbox/cmds/system_info.cpp
index b99941764893b769bb12335211668696385639ad..41d73322ae7cdf62c068adb866541665b467eb08 100644
--- a/src/anbox/cmds/system_info.cpp
+++ b/src/anbox/cmds/system_info.cpp
@@ -54,7 +54,7 @@ class SystemInformation {
     collect_kernel_info();
     collect_graphics_info();
   }
-
+  ~SystemInformation() {}
   std::string to_text() const {
     std::stringstream s;
 
diff --git a/src/anbox/common/small_vector.h b/src/anbox/common/small_vector.h
index 74f5f0d18aeec2547f5b375e9a2024af610f09da..88355df397ef0441d6cf63b3dcfe227284f8fe09 100644
--- a/src/anbox/common/small_vector.h
+++ b/src/anbox/common/small_vector.h
@@ -153,6 +153,7 @@ class SmallVector {
     this->destruct(this->begin(), this->end());
     if (isAllocated()) {
       free(this->mBegin);
+      this->mBegin = nullptr;
     }
   }
 
diff --git a/src/anbox/graphics/buffer_queue.h b/src/anbox/graphics/buffer_queue.h
index 6060a84fb599fc7fdb45a2887aa0201c806cf2d6..8169ad27de4a1f2e657a771196691b939e00133d 100644
--- a/src/anbox/graphics/buffer_queue.h
+++ b/src/anbox/graphics/buffer_queue.h
@@ -40,6 +40,7 @@ class BufferQueue {
   int try_pop_locked(Buffer *buffer);
   int pop_locked(Buffer *buffer, std::unique_lock<std::mutex> &lock);
   void close_locked();
+  ~BufferQueue() {}
 
  private:
   size_t capacity_ = 0;