Index: uspace/srv/fs/minixfs/mfs.c
===================================================================
--- uspace/srv/fs/minixfs/mfs.c	(revision 55c51c2845625dfa434e5e2ae20f4c0478ee5bd0)
+++ uspace/srv/fs/minixfs/mfs.c	(revision 82650385f4aa9a1d708b1c3ad49b5af9575aac32)
@@ -47,5 +47,4 @@
 #include <libfs.h>
 #include "mfs.h"
-#include "mfs_super.h"
 
 #define NAME	"mfs"
Index: uspace/srv/fs/minixfs/mfs.h
===================================================================
--- uspace/srv/fs/minixfs/mfs.h	(revision 55c51c2845625dfa434e5e2ae20f4c0478ee5bd0)
+++ uspace/srv/fs/minixfs/mfs.h	(revision 82650385f4aa9a1d708b1c3ad49b5af9575aac32)
@@ -34,6 +34,14 @@
 #define _MFS_H_
 
-#include "mfs_const.h"
+#include <fs/minix.h>
 #include "../../vfs/vfs.h"
+
+typedef enum {
+	MFS_VERSION_V1 = 1,
+	MFS_VERSION_V1L,
+	MFS_VERSION_V2,
+	MFS_VERSION_V2L,
+	MFS_VERSION_V3
+} mfs_version_t;
 
 extern void mfs_mounted(ipc_callid_t rid, ipc_call_t *request);
Index: uspace/srv/fs/minixfs/mfs_const.h
===================================================================
--- uspace/srv/fs/minixfs/mfs_const.h	(revision 55c51c2845625dfa434e5e2ae20f4c0478ee5bd0)
+++ 	(revision )
@@ -1,65 +1,0 @@
-/*
- * Copyright (c) 2011 Maurizio Lombardi
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** @addtogroup fs
- * @{
- */ 
-
-
-#ifndef _MFS_CONST_H_
-#define _MFS_CONST_H_
-
-#include <sys/types.h>
-#include <bool.h>
-
-#define MFS_MAX_BLOCK_SIZE	4096
-#define MFS_MIN_BLOCK_SIZE	1024
-
-#define MFS_ROOT_INO		1
-#define MFS_SUPER_BLOCK		0
-#define MFS_SUPER_BLOCK_SIZE	1024
-
-#define V2_NR_DIRECT_ZONES	7
-#define V2_NR_INDIRECT_ZONES	3
-
-#define V1_NR_DIRECT_ZONES	7
-#define V1_NR_INDIRECT_ZONES	2
-
-#define V1_MAX_NAME_LEN		14
-#define V1L_MAX_NAME_LEN	30
-#define V2_MAX_NAME_LEN		14
-#define V2L_MAX_NAME_LEN	30
-#define V3_MAX_NAME_LEN		60
-
-#endif
-
-
-/**
- * @}
- */ 
-
Index: uspace/srv/fs/minixfs/mfs_dentry.h
===================================================================
--- uspace/srv/fs/minixfs/mfs_dentry.h	(revision 55c51c2845625dfa434e5e2ae20f4c0478ee5bd0)
+++ 	(revision )
@@ -1,64 +1,0 @@
-/*
- * Copyright (c) 2011 Maurizio Lombardi
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** @addtogroup fs
- * @{
- */ 
-
-#ifndef _MFS_DENTRY_H_
-#define _MFS_DENTRY_H_
-
-#include "mfs_const.h"
-
-#define mfs_v2_dentry	mfs_v1_dentry
-#define mfs_v1l_dentry	mfs_v2l_dentry
-
-/*MinixFS V1 directory entry on-disk structure*/
-struct mfs_v1_dentry {
-	uint16_t d_inum;
-	char d_name[V1_MAX_NAME_LEN];
-} __attribute__ ((packed));
-
-/*MinixFS V2 with 30-char filenames (Linux variant)*/
-struct mfs_v2l_dentry {
-	uint16_t d_inum;
-	char d_name[V2E_MAX_NAME_LEN];
-} __attribute__ ((packed));
-
-/*MinixFS V3 directory entry on-disk structure*/
-struct mfs_v3_dentry {
-	uint32_t d_inum;
-	char d_name[V3_MAX_NAME_LEN];
-} __attribute__ ((packed));
-
-#endif
-
-/**
- * @}
- */ 
-
Index: uspace/srv/fs/minixfs/mfs_inode.h
===================================================================
--- uspace/srv/fs/minixfs/mfs_inode.h	(revision 55c51c2845625dfa434e5e2ae20f4c0478ee5bd0)
+++ 	(revision )
@@ -1,74 +1,0 @@
-/*
- * Copyright (c) 2011 Maurizio Lombardi
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** @addtogroup fs
- * @{
- */ 
-
-
-#ifndef _MFS_INODE_H_
-#define _MFS_INODE_H_
-
-#include "mfs_const.h"
-
-/*MinixFS V1 inode structure as it is on disk*/
-struct mfs_v1_inode {
-	uint16_t	i_mode;
-	int16_t		i_uid;
-	int32_t		i_size;
-	int32_t		i_mtime;
-	uint8_t		i_gid;
-	uint8_t		i_nlinks;
-	/*Block numbers for direct zones*/
-	uint16_t	i_dzone[V1_NR_DIRECT_ZONES];
-	/*Block numbers for indirect zones*/
-	uint16_t	i_izone[V1_NR_INDIRECT_ZONES];
-} __attribute__ ((packed));
-
-/*MinixFS V2 inode structure as it is on disk.*/
-struct mfs_v2_inode {
-	uint16_t 	i_mode;
-	uint16_t 	i_nlinks;
-	int16_t 	i_uid;
-	uint16_t 	i_gid;
-	int32_t 	i_size;
-	int32_t		i_atime;
-	int32_t		i_mtime;
-	int32_t		i_ctime;
-	/*Block numbers for direct zones*/
-	uint32_t	i_dzone[V2_NR_DIRECT_ZONES];
-	/*Block numbers for indirect zones*/
-	uint32_t	i_izone[V2_NR_INDIRECT_ZONES];
-} __attribute__ ((packed));
-
-#endif
-
-/**
- * @}
- */ 
-
Index: uspace/srv/fs/minixfs/mfs_super.c
===================================================================
--- uspace/srv/fs/minixfs/mfs_super.c	(revision 55c51c2845625dfa434e5e2ae20f4c0478ee5bd0)
+++ uspace/srv/fs/minixfs/mfs_super.c	(revision 82650385f4aa9a1d708b1c3ad49b5af9575aac32)
@@ -37,5 +37,4 @@
 #include <str.h>
 #include "mfs.h"
-#include "mfs_super.h"
 #include "mfs_utils.h"
 #include "../../vfs/vfs.h"
Index: uspace/srv/fs/minixfs/mfs_super.h
===================================================================
--- uspace/srv/fs/minixfs/mfs_super.h	(revision 55c51c2845625dfa434e5e2ae20f4c0478ee5bd0)
+++ 	(revision )
@@ -1,122 +1,0 @@
-/*
- * Copyright (c) 2011 Maurizio Lombardi
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** @addtogroup fs
- * @{
- */ 
-
-#ifndef _MFS_SUPER_H_
-#define _MFS_SUPER_H_
-
-#include "mfs_const.h"
-
-#define MFS_MAGIC_V1		0x137F
-#define MFS_MAGIC_V1R		0x7F13
-
-#define MFS_MAGIC_V1L		0x138F
-#define MFS_MAGIC_V1LR		0x8F13
-
-#define MFS_MAGIC_V2		0x2468
-#define MFS_MAGIC_V2R		0x6824
-
-#define MFS_MAGIC_V2L		0x2478
-#define MFS_MAGIC_V2LR		0x7824
-
-#define MFS_MAGIC_V3		0x4D5A
-#define MFS_MAGIC_V3R		0x5A4D
-
-/*MFS V1/V2 superblock data on disk*/
-struct mfs_superblock {
-	/*Total number of inodes on the device*/
-	uint16_t	s_ninodes;
-	/*Total number of zones on the device*/
-	uint16_t	s_nzones;
-	/*Number of inode bitmap blocks*/
-	uint16_t	s_ibmap_blocks;
-	/*Number of zone bitmap blocks*/
-	uint16_t	s_zbmap_blocks;
-	/*First data zone on device*/
-	uint16_t	s_first_data_zone;
-	/*Base 2 logarithm of the zone to block ratio*/
-	uint16_t	s_log2_zone_size;
-	/*Maximum file size expressed in bytes*/
-	uint32_t	s_max_file_size;
-	/*
-	 *Magic number used to recognize MinixFS
-	 *and to detect on-disk endianness
-	 */
-	uint16_t	s_magic;
-	/*Flag used to detect FS errors*/
-	uint16_t	s_state;
-	/*Total number of zones on the device (V2 only)*/
-	uint32_t	s_nzones2;
-} __attribute__ ((packed));
-
-
-/*MFS V3 superblock data on disk*/
-struct mfs3_superblock {
-	/*Total number of inodes on the device*/
-	uint32_t	s_ninodes;
-	/*Number of inode bitmap blocks*/
-	int16_t		s_ibmap_blocks;
-	/*Number of zone bitmap blocks*/
-	int16_t		s_zbmap_blocks;
-	/*First data zone on device*/
-	uint16_t	s_first_data_zone;
-	/*Base 2 logarithm of the zone to block ratio*/
-	int16_t		s_log2_zone_size;
-	int16_t		s_pad;
-	/*Maximum file size expressed in bytes*/
-	int32_t		s_max_file_size;
-	/*Total number of zones on the device*/
-	uint32_t	s_total_zones;
-	/*
-	 *Magic number used to recognize MinixFS
-	 *and to detect on-disk endianness
-	 */
-	int16_t		s_magic;
-	int16_t		s_pad2;
-	/*Filesystem block size expressed in bytes*/
-	uint16_t	s_block_size;
-	/*Filesystem disk format version*/
-	int8_t		s_disk_version;
-} __attribute__ ((packed));
-
-typedef enum {
-	MFS_VERSION_V1 = 1,
-	MFS_VERSION_V1L,
-	MFS_VERSION_V2,
-	MFS_VERSION_V2L,
-	MFS_VERSION_V3
-} mfs_version_t;
-
-#endif
-
-/**
- * @}
- */ 
Index: uspace/srv/fs/minixfs/mfs_utils.h
===================================================================
--- uspace/srv/fs/minixfs/mfs_utils.h	(revision 55c51c2845625dfa434e5e2ae20f4c0478ee5bd0)
+++ uspace/srv/fs/minixfs/mfs_utils.h	(revision 82650385f4aa9a1d708b1c3ad49b5af9575aac32)
@@ -31,8 +31,14 @@
  */
 
-#include "mfs_const.h"
+#ifndef _MFS_UTILS_H_
+#define _MFS_UTILS_H_
+
+#include <sys/types.h>
+#include <bool.h>
 
 uint16_t conv16(bool native, uint16_t n);
 uint32_t conv32(bool native, uint32_t n);
+
+#endif
 
 /**
