5 files changed, 10 insertions, 3 deletions
diff --git a/remote-processor/Android.mk b/remote-processor/Android.mk
index 7da064a..2a79297 100644
--- a/remote-processor/Android.mk
+++ b/remote-processor/Android.mk
@@ -16,10 +16,7 @@ COMMON_SRC_FILES := \
 COMMON_MODULE := libremote-processor
 COMMON_MODULE_TAGS := optional
 
-COMMON_CFLAGS := -Wno-non-virtual-dtor
-
 COMMON_LDLIBS := -lpthread
-
 #############################
 # Target build
 
diff --git a/remote-processor/RemoteCommand.h b/remote-processor/RemoteCommand.h
index df3d5a4..ffcbcfc 100644
--- a/remote-processor/RemoteCommand.h
+++ b/remote-processor/RemoteCommand.h
@@ -38,4 +38,7 @@ public:
     virtual uint32_t getArgumentCount() const = 0;
     virtual const std::string& getArgument(uint32_t uiArgument) const = 0;
     virtual const std::string packArguments(uint32_t uiStartArgument, uint32_t uiNbArguments) const = 0;
+
+protected:
+    virtual ~IRemoteCommand() {}
 };
diff --git a/remote-processor/RemoteCommandHandler.h b/remote-processor/RemoteCommandHandler.h
index 97aa04f..fcd98a9 100644
--- a/remote-processor/RemoteCommandHandler.h
+++ b/remote-processor/RemoteCommandHandler.h
@@ -32,4 +32,7 @@ class IRemoteCommandHandler
 public:
     // Return true on success, fill result in any cases
     virtual bool remoteCommandProcess(const IRemoteCommand& remoteCommand, std::string& strResult) = 0;
+
+protected:
+    virtual ~IRemoteCommandHandler() {}
 };
diff --git a/remote-processor/RemoteCommandHandlerTemplate.h b/remote-processor/RemoteCommandHandlerTemplate.h
index 5d9817e..6223b9c 100644
--- a/remote-processor/RemoteCommandHandlerTemplate.h
+++ b/remote-processor/RemoteCommandHandlerTemplate.h
@@ -217,3 +217,4 @@ private:
     std::vector<CRemoteCommandParserItem*> _remoteCommandParserVector;
     uint32_t _uiMaxCommandUsageLength;
 };
+
diff --git a/remote-processor/RemoteProcessorServerInterface.h b/remote-processor/RemoteProcessorServerInterface.h
index 11ceb10..fdc97cc 100644
--- a/remote-processor/RemoteProcessorServerInterface.h
+++ b/remote-processor/RemoteProcessorServerInterface.h
@@ -34,4 +34,7 @@ public:
     virtual bool start() = 0;
     virtual void stop() = 0;
     virtual bool isStarted() const = 0;
+
+    /* FIXME this was missing but is explicitly called */
+    virtual ~IRemoteProcessorServerInterface() {}
 };