diff --git a/VolumeManager.h b/VolumeManager.h
new file mode 100644
index 0000000..8263805
--- /dev/null
+++ b/VolumeManager.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _VOLUMEMANAGER_H
+#define _VOLUMEMANAGER_H
+
+#include <pthread.h>
+
+#include <utils/List.h>
+#include <sysutils/SocketListener.h>
+
+#include "BlockDevice.h"
+#include "Volume.h"
+
+class VolumeManager {
+private:
+    static VolumeManager *sInstance;
+
+private:
+    SocketListener        *mBroadcaster;
+    BlockDeviceCollection *mBlockDevices;
+
+    VolumeCollection      *mVolumes;
+
+public:
+    virtual ~VolumeManager();
+
+    int start();
+    int stop();
+
+    void handleDiskInserted(const char *devpath, int maj, int min,
+                            int nr_parts);
+    void handleDiskRemoved(int maj, int min);
+
+    void handlePartCreated(const char *devpath, int maj, int min,
+                           int part_no);
+    void handlePartRemoved(int maj, int min);
+
+    int addVolume(Volume *v);
+
+    int listVolumes(SocketClient *cli);
+
+    void setBroadcaster(SocketListener *sl) { mBroadcaster = sl; }
+    SocketListener *getBroadcaster() { return mBroadcaster; }
+
+    static VolumeManager *Instance();
+
+private:
+    VolumeManager();
+};
+#endif