diff --git a/Android.bp b/Android.bp
index 032a61a..0f91348 100644
--- a/Android.bp
+++ b/Android.bp
@@ -17,6 +17,7 @@
     cflags: [
         "-Wall",
         "-Werror",
+        "-Wextra-semi",
     ],
 }
 
diff --git a/libhidlcache/HidlMemoryCache.cpp b/libhidlcache/HidlMemoryCache.cpp
index 6f9c25c..f8fbbc1 100644
--- a/libhidlcache/HidlMemoryCache.cpp
+++ b/libhidlcache/HidlMemoryCache.cpp
@@ -31,9 +31,9 @@
 class IMemoryDecorator : public virtual IMemory {
    public:
     IMemoryDecorator(sp<IMemory> heap) : mHeap(heap) {}
-    virtual ~IMemoryDecorator(){};
+    virtual ~IMemoryDecorator(){}
     Return<void> update() override { return mHeap->update(); }
-    Return<void> read() override { return mHeap->read(); };
+    Return<void> read() override { return mHeap->read(); }
     Return<void> updateRange(uint64_t start, uint64_t length) override {
         return mHeap->updateRange(start, length);
     }
diff --git a/transport/ServiceManagement.cpp b/transport/ServiceManagement.cpp
index e652c66..50a527a 100644
--- a/transport/ServiceManagement.cpp
+++ b/transport/ServiceManagement.cpp
@@ -734,7 +734,7 @@
     return nullptr;
 }
 
-}; // namespace details
+} // namespace details
 
-}; // namespace hardware
-}; // namespace android
+} // namespace hardware
+} // namespace android
diff --git a/transport/include/hidl/ServiceManagement.h b/transport/include/hidl/ServiceManagement.h
index a26a282..83b8c32 100644
--- a/transport/include/hidl/ServiceManagement.h
+++ b/transport/include/hidl/ServiceManagement.h
@@ -28,15 +28,15 @@
 namespace manager {
 namespace V1_0 {
     struct IServiceManager;
-};  // namespace V1_0
+}  // namespace V1_0
 namespace V1_1 {
 struct IServiceManager;
-};  // namespace V1_1
+}  // namespace V1_1
 namespace V1_2 {
 struct IServiceManager;
-};  // namespace V1_2
-};  // namespace manager
-};  // namespace hidl
+}  // namespace V1_2
+}  // namespace manager
+}  // namespace hidl
 
 namespace hardware {
 
@@ -61,7 +61,7 @@
 sp<::android::hidl::base::V1_0::IBase> getRawServiceInternal(const std::string& descriptor,
                                                              const std::string& instance,
                                                              bool retry, bool getStub);
-};
+}
 
 // These functions are for internal use by hidl. If you want to get ahold
 // of an interface, the best way to do this is by calling IFoo::getService()
@@ -82,8 +82,8 @@
     details::preloadPassthroughService(I::descriptor);
 }
 
-}; // namespace hardware
-}; // namespace android
+} // namespace hardware
+} // namespace android
 
 #endif // ANDROID_HARDWARE_ISERVICE_MANAGER_H