diff --git a/headers/build/os/storage/Mime.h b/headers/build/os/storage/Mime.h
index e79f33acff..109c5384c4 100644
--- a/headers/build/os/storage/Mime.h
+++ b/headers/build/os/storage/Mime.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright 2004-2006, Haiku Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  */
@@ -31,7 +31,6 @@ status_t create_app_meta_mime(const char *path, int recursive, int synchronous,
 
 status_t get_device_icon(const char *dev, void *icon, int32 size);
 
-static const uint32 B_MIME_STRING_TYPE	= 'MIMS';
 
 enum icon_size {
 	B_LARGE_ICON	= 32,
diff --git a/headers/os/storage/Mime.h b/headers/os/storage/Mime.h
index d7b8f38c0a..bf810aee75 100644
--- a/headers/os/storage/Mime.h
+++ b/headers/os/storage/Mime.h
@@ -10,10 +10,9 @@
 
 #include <SupportDefs.h>
 #include <StorageDefs.h>
+#include <TypeConstants.h>
 
 
-static const uint32 B_MIME_STRING_TYPE = 'MIMS';
-
 enum icon_size {
 	B_LARGE_ICON	= 32,
 	B_MINI_ICON		= 16
diff --git a/headers/os/support/TypeConstants.h b/headers/os/support/TypeConstants.h
index 7b9eb9935a..67cd0de4a6 100644
--- a/headers/os/support/TypeConstants.h
+++ b/headers/os/support/TypeConstants.h
@@ -60,6 +60,7 @@ enum {
 	B_VECTOR_ICON_TYPE				= 'VICN',
 	B_XATTR_TYPE					= 'XATR',
 	B_NETWORK_ADDRESS_TYPE			= 'NWAD',
+	B_MIME_STRING_TYPE				= 'MIMS',
 
 	// deprecated, do not use
 	B_ASCII_TYPE					= 'TEXT'	// use B_STRING_TYPE instead
diff --git a/headers/private/file_systems/QueryParser.h b/headers/private/file_systems/QueryParser.h
index fcb1ded513..beb6f703d6 100644
--- a/headers/private/file_systems/QueryParser.h
+++ b/headers/private/file_systems/QueryParser.h
@@ -111,13 +111,6 @@ union value {
 };
 
 
-// B_MIME_STRING_TYPE is defined in storage/Mime.h, but we
-// don't need the whole file here; the type can't change anyway
-#ifndef _MIME_H
-#	define B_MIME_STRING_TYPE 'MIMS'
-#endif
-
-
 template<typename QueryPolicy>
 class Query {
 public:
diff --git a/headers/private/fs_shell/fssh_api_wrapper.h b/headers/private/fs_shell/fssh_api_wrapper.h
index fabc9ea33c..18fb61bc4b 100644
--- a/headers/private/fs_shell/fssh_api_wrapper.h
+++ b/headers/private/fs_shell/fssh_api_wrapper.h
@@ -1471,6 +1471,9 @@
 #define B_UINT8_TYPE					FSSH_B_UINT8_TYPE
 #define B_VECTOR_ICON_TYPE				FSSH_B_VECTOR_ICON_TYPE
 #define B_ASCII_TYPE					FSSH_B_ASCII_TYPE
+#define B_XATTR_TYPE					FSSH_B_XATTR_TYPE
+#define B_NETWORK_ADDRESS_TYPE			FSSH_B_NETWORK_ADDRESS_TYPE
+#define B_MIME_STRING_TYPE				FSSH_B_MIME_STRING_TYPE
 
 //----- System-wide MIME types for handling URL's ------------------------------
 
diff --git a/headers/private/fs_shell/fssh_type_constants.h b/headers/private/fs_shell/fssh_type_constants.h
index 6d93de93a4..9b0e13a8c1 100644
--- a/headers/private/fs_shell/fssh_type_constants.h
+++ b/headers/private/fs_shell/fssh_type_constants.h
@@ -55,6 +55,9 @@ enum {
 	FSSH_B_UINT64_TYPE					= 'ULLG',
 	FSSH_B_UINT8_TYPE					= 'UBYT',
 	FSSH_B_VECTOR_ICON_TYPE				= 'VICN',
+	FSSH_B_XATTR_TYPE					= 'XATR',
+	FSSH_B_NETWORK_ADDRESS_TYPE			= 'NWAD',
+	FSSH_B_MIME_STRING_TYPE				= 'MIMS',
 
 	// deprecated, do not use
 	FSSH_B_ASCII_TYPE					= 'TEXT'	// use B_STRING_TYPE instead
diff --git a/src/add-ons/kernel/file_systems/bfs/Index.cpp b/src/add-ons/kernel/file_systems/bfs/Index.cpp
index f86b37328f..abdcb86f60 100644
--- a/src/add-ons/kernel/file_systems/bfs/Index.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/Index.cpp
@@ -14,13 +14,6 @@
 #include "BPlusTree.h"
 
 
-// B_MIME_STRING_TYPE is defined in storage/Mime.h, but we
-// don't need the whole file here; the type can't change anyway
-#ifndef _MIME_H
-#	define B_MIME_STRING_TYPE 'MIMS'
-#endif
-
-
 Index::Index(Volume* volume)
 	:
 	fVolume(volume),
diff --git a/src/add-ons/kernel/file_systems/bfs/Query.cpp b/src/add-ons/kernel/file_systems/bfs/Query.cpp
index 6cb628e78e..d3742ba3cd 100644
--- a/src/add-ons/kernel/file_systems/bfs/Query.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/Query.cpp
@@ -79,11 +79,6 @@ union value {
 	char	String[INODE_FILE_NAME_LENGTH];
 };
 
-// B_MIME_STRING_TYPE is defined in storage/Mime.h, but we
-// don't need the whole file here; the type can't change anyway
-#ifndef _MIME_H
-#	define B_MIME_STRING_TYPE 'MIMS'
-#endif
 
 /*!	Abstract base class for the operator/equation classes.
 */