diff --git a/src/kits/storage/DiskDevice.cpp b/src/kits/storage/DiskDevice.cpp
index 7dbd093ccd..3e9329eab1 100644
--- a/src/kits/storage/DiskDevice.cpp
+++ b/src/kits/storage/DiskDevice.cpp
@@ -8,7 +8,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <new.h>
+#include <new>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/kits/storage/DiskDeviceList.cpp b/src/kits/storage/DiskDeviceList.cpp
index 6b90b5710e..5cf399d25e 100644
--- a/src/kits/storage/DiskDeviceList.cpp
+++ b/src/kits/storage/DiskDeviceList.cpp
@@ -3,7 +3,8 @@
 //  by the OpenBeOS license.
 //---------------------------------------------------------------------
 
-#include <new.h>
+#include <new>
+using namespace std;
 
 #include <DiskDevice.h>
 #include <DiskDeviceList.h>
@@ -305,6 +306,7 @@ BDiskDeviceList::VisitEachMountedPartition(BDiskDeviceVisitor *visitor)
 	BPartition *partition = NULL;
 	if (visitor) {
 		struct MountedPartitionFilter : public PartitionFilter {
+			virtual ~MountedPartitionFilter() {};
 			virtual bool Filter(BPartition *partition, int32 level)
 				{ return partition->IsMounted(); }
 		} filter;
@@ -334,6 +336,7 @@ BDiskDeviceList::VisitEachMountablePartition(BDiskDeviceVisitor *visitor)
 	BPartition *partition = NULL;
 	if (visitor) {
 		struct MountablePartitionFilter : public PartitionFilter {
+			virtual ~MountablePartitionFilter() {};
 			virtual bool Filter(BPartition *partition, int32 level)
 				{ return partition->ContainsFileSystem(); }
 		} filter;
diff --git a/src/kits/support/PointerList.cpp b/src/kits/support/PointerList.cpp
index a09349a0a9..4f78bb0361 100644
--- a/src/kits/support/PointerList.cpp
+++ b/src/kits/support/PointerList.cpp
@@ -72,6 +72,7 @@ struct comparator;
 class AbstractPointerListHelper {
 public:
 	AbstractPointerListHelper() {};
+	virtual ~AbstractPointerListHelper() {};
 	
 	/** 
 		Returns the index of the item that matches key or
diff --git a/src/kits/tracker/SettingsHandler.h b/src/kits/tracker/SettingsHandler.h
index 7fc23e3221..399398f2a3 100644
--- a/src/kits/tracker/SettingsHandler.h
+++ b/src/kits/tracker/SettingsHandler.h
@@ -104,6 +104,7 @@ class SettingsArgvDispatcher {
 	// base class for a single setting item
 public:
 	SettingsArgvDispatcher(const char *name);
+	virtual ~SettingsArgvDispatcher() {};
 
 	void SaveSettings(Settings *settings, bool onlyIfNonDefault);