diff --git a/firmware/common/disk.h b/firmware/common/disk.h
deleted file mode 100644
index 865b7bb4b4..0000000000
--- a/firmware/common/disk.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2002 by Björn Stenberg
- *
- * All files in this archive are subject to the GNU General Public License.
- * See the file COPYING in the source tree root for full license agreement.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-#ifndef _DISK_H_
-#define _DISK_H_
-
-struct partinfo {
-    unsigned long start; /* first sector (LBA) */
-    unsigned long size;  /* number of sectors */
-    unsigned char type;
-};
-
-#define PARTITION_TYPE_FAT32     0x0b
-#define PARTITION_TYPE_FAT32_LBA 0x0c
-
-/* returns a pointer to an array of 8 partinfo structs */
-struct partinfo* disk_init(void);
-struct partinfo* disk_partinfo(int partition);
-
-#endif
diff --git a/firmware/drivers/lcd-player-charset.h b/firmware/export/lcd-player-charset.h
similarity index 100%
rename from firmware/drivers/lcd-player-charset.h
rename to firmware/export/lcd-player-charset.h
diff --git a/firmware/common/atoi.h b/firmware/include/atoi.h
similarity index 100%
rename from firmware/common/atoi.h
rename to firmware/include/atoi.h
diff --git a/firmware/common/dir.h b/firmware/include/dir.h
similarity index 100%
rename from firmware/common/dir.h
rename to firmware/include/dir.h
diff --git a/firmware/common/errno.h b/firmware/include/errno.h
similarity index 100%
rename from firmware/common/errno.h
rename to firmware/include/errno.h
diff --git a/firmware/common/file.h b/firmware/include/file.h
similarity index 100%
rename from firmware/common/file.h
rename to firmware/include/file.h
diff --git a/firmware/common/sprintf.h b/firmware/include/sprintf.h
similarity index 100%
rename from firmware/common/sprintf.h
rename to firmware/include/sprintf.h
diff --git a/firmware/common/timefuncs.h b/firmware/include/timefuncs.h
similarity index 100%
rename from firmware/common/timefuncs.h
rename to firmware/include/timefuncs.h