diff --git a/libdm/datastruct/bitset.h b/libdm/datastruct/bitset.h
deleted file mode 100644
index d4b161fbc..000000000
--- a/libdm/datastruct/bitset.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.  
- * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved.
- *
- * This file is part of the device-mapper userspace tools.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License v.2.1.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _DM_BITSET_H
-#define _DM_BITSET_H
-
-#include "pool.h"
-
-#include <limits.h>
-
-typedef uint32_t *bitset_t;
-
-bitset_t bitset_create(struct pool *mem, unsigned num_bits);
-void bitset_destroy(bitset_t bs);
-
-void bit_union(bitset_t out, bitset_t in1, bitset_t in2);
-int bit_get_first(bitset_t bs);
-int bit_get_next(bitset_t bs, int last_bit);
-
-#define BITS_PER_INT (sizeof(int) * CHAR_BIT)
-
-#define bit(bs, i) \
-   (bs[(i / BITS_PER_INT) + 1] & (0x1 << (i & (BITS_PER_INT - 1))))
-
-#define bit_set(bs, i) \
-   (bs[(i / BITS_PER_INT) + 1] |= (0x1 << (i & (BITS_PER_INT - 1))))
-
-#define bit_clear(bs, i) \
-   (bs[(i / BITS_PER_INT) + 1] &= ~(0x1 << (i & (BITS_PER_INT - 1))))
-
-#define bit_set_all(bs) \
-   memset(bs + 1, -1, ((*bs / BITS_PER_INT) + 1) * sizeof(int))
-
-#define bit_clear_all(bs) \
-   memset(bs + 1, 0, ((*bs / BITS_PER_INT) + 1) * sizeof(int))
-
-#define bit_copy(bs1, bs2) \
-   memcpy(bs1 + 1, bs2 + 1, ((*bs1 / BITS_PER_INT) + 1) * sizeof(int))
-
-#endif
diff --git a/libdm/datastruct/hash.h b/libdm/datastruct/hash.h
deleted file mode 100644
index 2b86931bb..000000000
--- a/libdm/datastruct/hash.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved.
- *
- * This file is part of the device-mapper userspace tools.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License v.2.1.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _DM_HASH_H
-#define _DM_HASH_H
-
-struct hash_table;
-struct hash_node;
-
-typedef void (*iterate_fn) (void *data);
-
-struct hash_table *hash_create(unsigned size_hint);
-void hash_destroy(struct hash_table *t);
-void hash_wipe(struct hash_table *t);
-
-void *hash_lookup(struct hash_table *t, const char *key);
-int hash_insert(struct hash_table *t, const char *key, void *data);
-void hash_remove(struct hash_table *t, const char *key);
-
-void *hash_lookup_binary(struct hash_table *t, const char *key, uint32_t len);
-int hash_insert_binary(struct hash_table *t, const char *key, uint32_t len,
-		       void *data);
-void hash_remove_binary(struct hash_table *t, const char *key, uint32_t len);
-
-unsigned hash_get_num_entries(struct hash_table *t);
-void hash_iter(struct hash_table *t, iterate_fn f);
-
-char *hash_get_key(struct hash_table *t, struct hash_node *n);
-void *hash_get_data(struct hash_table *t, struct hash_node *n);
-struct hash_node *hash_get_first(struct hash_table *t);
-struct hash_node *hash_get_next(struct hash_table *t, struct hash_node *n);
-
-#define hash_iterate(v, h) \
-	for (v = hash_get_first(h); v; \
-	     v = hash_get_next(h, v))
-
-#endif