diff --git a/headers/os/storage/Directory.h b/headers/os/storage/Directory.h
index 5e71e40336..f74f5bf647 100644
--- a/headers/os/storage/Directory.h
+++ b/headers/os/storage/Directory.h
@@ -7,8 +7,8 @@
 	BDirectory interface declaration.
 */
 
-#ifndef __sk_directory_h__
-#define __sk_directory_h__
+#ifndef _DIRECTORY_H
+#define _DIRECTORY_H
 
 #include <Node.h>
 #include <EntryList.h>
@@ -106,4 +106,4 @@ status_t create_directory(const char *path, mode_t mode);
 };		// namespace OpenBeOS
 #endif
 
-#endif	// __sk_directory_h__
+#endif	// _DIRECTORY_H
diff --git a/headers/os/storage/Entry.h b/headers/os/storage/Entry.h
index ac25dbf2c6..89c48a57e4 100644
--- a/headers/os/storage/Entry.h
+++ b/headers/os/storage/Entry.h
@@ -6,8 +6,8 @@
 	\file Entry.h
 	BEntry and entry_ref interface declarations.
 */
-#ifndef __sk_entry_h__
-#define __sk_entry_h__
+#ifndef _ENTRY_H
+#define _ENTRY_H
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -117,4 +117,4 @@ bool operator<(const entry_ref &a, const entry_ref &b);
 };		// namespace OpenBeOS
 #endif
 
-#endif	// __sk_entry_h__
+#endif	// _ENTRY_H
diff --git a/headers/os/storage/EntryList.h b/headers/os/storage/EntryList.h
index 19afca2c9e..d8285842ad 100644
--- a/headers/os/storage/EntryList.h
+++ b/headers/os/storage/EntryList.h
@@ -7,8 +7,8 @@
 	BEntryList interface declaration.
 */
 
-#ifndef __sk_entry_list_h__
-#define __sk_entry_list_h__
+#ifndef _ENTRY_LIST_H
+#define _ENTRY_LIST_H
 
 #include <dirent.h>
 #include <SupportDefs.h>
@@ -57,4 +57,4 @@ private:
 };		// namespace OpenBeOS
 #endif
 
-#endif	// __sk_entry_list_h__
+#endif	// _ENTRY_LIST_H
diff --git a/headers/os/storage/File.h b/headers/os/storage/File.h
index c01dd63306..ef2d14388d 100644
--- a/headers/os/storage/File.h
+++ b/headers/os/storage/File.h
@@ -6,8 +6,8 @@
 	\file File.h
 	BFile interface declaration.
 */
-#ifndef __sk_file_h__
-#define __sk_file_h__
+#ifndef _FILE_H
+#define _FILE_H
 
 #include <DataIO.h>
 #include <Node.h>
@@ -82,4 +82,4 @@ private:
 };		// namespace OpenBeOS
 #endif
 
-#endif	// __sk_file_h__
+#endif	// _FILE_H
diff --git a/headers/os/storage/FindDirectory.h b/headers/os/storage/FindDirectory.h
index 41fc2d5089..3ccff86cc5 100644
--- a/headers/os/storage/FindDirectory.h
+++ b/headers/os/storage/FindDirectory.h
@@ -7,8 +7,8 @@
 	Declarations of find_directory() functions and associated types.	
 */
 
-#ifndef __sk_find_directory_h__
-#define __sk_find_directory_h__
+#ifndef _FIND_DIRECTORY_H
+#define _FIND_DIRECTORY_H
 
 #include <SupportDefs.h>
 
@@ -132,4 +132,4 @@ status_t find_directory(directory_which which, BPath *path,
 };		// namespace OpenBeOS
 #endif
 
-#endif	// __sk_find_directory_h__
+#endif	// _FIND_DIRECTORY_H
diff --git a/headers/os/storage/Mime.h b/headers/os/storage/Mime.h
index bfb1c79ad9..25064d7f81 100644
--- a/headers/os/storage/Mime.h
+++ b/headers/os/storage/Mime.h
@@ -6,8 +6,8 @@
 	\file Mime.h
 	Mime type C functions interface declarations.
 */
-#ifndef _sk_mime_h_
-#define _sk_mime_h_
+#ifndef _MIME_H
+#define _MIME_H
 
 #include <SupportDefs.h>
 #include <StorageDefs.h>
@@ -42,4 +42,4 @@ enum icon_size {
 #include <MimeType.h>
 #endif
 
-#endif	// _sk_mime_h_
+#endif	// _MIME_H
diff --git a/headers/os/storage/MimeType.h b/headers/os/storage/MimeType.h
index 92bd918675..97d38b30e7 100644
--- a/headers/os/storage/MimeType.h
+++ b/headers/os/storage/MimeType.h
@@ -6,8 +6,8 @@
 	\file MimeType.h
 	BMimeType interface declarations.
 */
-#ifndef _sk_mime_type_h_
-#define _sk_mime_type_h_
+#ifndef _MIME_TYPE_H
+#define _MIME_TYPE_H
 
 #include <SupportDefs.h>
 #include <StorageDefs.h>
@@ -190,4 +190,4 @@ private:
 };
 
 
-#endif	// _sk_mime_type_h_
+#endif	// _MIME_TYPE_H
diff --git a/headers/os/storage/Node.h b/headers/os/storage/Node.h
index a1384caee0..457cc6ee38 100644
--- a/headers/os/storage/Node.h
+++ b/headers/os/storage/Node.h
@@ -7,8 +7,8 @@
 	BNode and node_ref interface declarations.
 */
 
-#ifndef __sk_node_h__
-#define __sk_node_h__
+#ifndef _NODE_H
+#define _NODE_H
 
 #include <Statable.h>
 #include <StorageDefs.Private.h>
@@ -134,4 +134,4 @@ private:
 };		// namespace OpenBeOS
 #endif
 
-#endif	// __sk_node_h__
+#endif	// _NODE_H
diff --git a/headers/os/storage/NodeInfo.h b/headers/os/storage/NodeInfo.h
index 49d9d8e1d3..dbf323f950 100644
--- a/headers/os/storage/NodeInfo.h
+++ b/headers/os/storage/NodeInfo.h
@@ -7,8 +7,8 @@
 	BNodeInfo interface declaration.
 */
 
-#ifndef __sk_node_info_h__
-#define __sk_node_info_h__
+#ifndef _NODE_INFO_H
+#define _NODE_INFO_H
 
 #ifndef _BE_BUILD_H
 #include <BeBuild.h>
@@ -86,4 +86,4 @@ private:
 }
 #endif // USE_OPENBEOS_NAMESPACE
 
-#endif // __sk_node_info_h__
+#endif // _NODE_INFO_H
diff --git a/headers/os/storage/Path.h b/headers/os/storage/Path.h
index 562aca0631..9a2e883687 100644
--- a/headers/os/storage/Path.h
+++ b/headers/os/storage/Path.h
@@ -7,8 +7,8 @@
 	BPath interface declaration.
 */
 
-#ifndef __sk_path_h__
-#define __sk_path_h__
+#ifndef _PATH_H
+#define _PATH_H
 
 #include <Flattenable.h>
 #include <SupportDefs.h>
@@ -97,4 +97,4 @@ private:
 };		// namespace OpenBeOS
 #endif
 
-#endif	// __sk_path_h__
+#endif	// _PATH_H
diff --git a/headers/os/storage/Query.h b/headers/os/storage/Query.h
index d1d96b9287..7361e4b45d 100644
--- a/headers/os/storage/Query.h
+++ b/headers/os/storage/Query.h
@@ -7,8 +7,8 @@
 	BQuery interface declaration.
 */
 
-#ifndef _sk_query_h_
-#define _sk_query_h_
+#ifndef _QUERY_H
+#define _QUERY_H
 
 #include <EntryList.h>
 #include <Messenger.h>
@@ -120,4 +120,4 @@ private:
 	StorageKit::FileDescriptor fQueryFd;
 };
 
-#endif	// _sk_query_h_
+#endif	// _QUERY_H
diff --git a/headers/os/storage/ResourceStrings.h b/headers/os/storage/ResourceStrings.h
index 27a7702b0a..5e99699600 100644
--- a/headers/os/storage/ResourceStrings.h
+++ b/headers/os/storage/ResourceStrings.h
@@ -7,8 +7,8 @@
 	BResourceStrings interface declaration.
 */
 
-#ifndef _sk_resource_strings_h_
-#define _sk_resource_strings_h_
+#ifndef _RESOURCE_STRINGS_H
+#define _RESOURCE_STRINGS_H
 
 #include <Entry.h>
 #include <Locker.h>
@@ -87,4 +87,4 @@ private:
 	virtual	void _ReservedResourceStrings5();
 };
 
-#endif	// _sk_resource_strings_h_
+#endif	// _RESOURCE_STRINGS_H
diff --git a/headers/os/storage/Resources.h b/headers/os/storage/Resources.h
index 4162af69ac..ae42e97c16 100644
--- a/headers/os/storage/Resources.h
+++ b/headers/os/storage/Resources.h
@@ -7,8 +7,8 @@
 	BResources interface declaration.
 */
 
-#ifndef _sk_resources_h_
-#define _sk_resources_h_
+#ifndef _RESOURCES_H
+#define _RESOURCES_H
 
 #include <File.h>
 
@@ -111,4 +111,4 @@ private:
 };		// namespace OpenBeOS
 #endif
 
-#endif	// _sk_resources_h_
+#endif	// _RESOURCES_H
diff --git a/headers/os/storage/Statable.h b/headers/os/storage/Statable.h
index 36c9da6528..80817167bb 100644
--- a/headers/os/storage/Statable.h
+++ b/headers/os/storage/Statable.h
@@ -7,8 +7,8 @@
 	BStatable interface declaration.
 */
 
-#ifndef __sk_statable_h__
-#define __sk_statable_h__
+#ifndef _STATABLE_H
+#define _STATABLE_H
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -80,4 +80,4 @@ public:
 }
 #endif // USE_OPENBEOS_NAMESPACE
 
-#endif // __sk_statable_h__
+#endif // _STATABLE_H
diff --git a/headers/os/storage/StorageDefs.Private.h b/headers/os/storage/StorageDefs.Private.h
index 18434d7167..653b2c68f1 100644
--- a/headers/os/storage/StorageDefs.Private.h
+++ b/headers/os/storage/StorageDefs.Private.h
@@ -7,11 +7,11 @@
 	Private Storage Kit declarations needed in public headers.
 */
 
-#ifndef __sk_def_storage_private_h__
-#define __sk_def_storage_private_h__
+#ifndef _DEF_STORAGE_PRIVATE_H
+#define _DEF_STORAGE_PRIVATE_H
 
 namespace StorageKit {
 	typedef int FileDescriptor;
 };
 
-#endif // __sk_def_storage_private_h__
+#endif // _DEF_STORAGE_PRIVATE_H
diff --git a/headers/os/storage/StorageDefs.h b/headers/os/storage/StorageDefs.h
index 30f4af5031..693c534fd7 100644
--- a/headers/os/storage/StorageDefs.h
+++ b/headers/os/storage/StorageDefs.h
@@ -7,8 +7,8 @@
 	Miscellaneous Storage Kit definitions and includes.
 */
 
-#ifndef __sk_def_storage_h__
-#define __sk_def_storage_h__
+#ifndef _DEF_STORAGE_H
+#define _DEF_STORAGE_H
 
 #include <fcntl.h>
 #include <sys/param.h>
@@ -53,4 +53,4 @@ enum node_flavor {
 #endif	// USE_OPENBEOS_NAMESPACE
 
 
-#endif __sk_def_storage_h__
+#endif // _DEF_STORAGE_H
diff --git a/headers/os/storage/SymLink.h b/headers/os/storage/SymLink.h
index c681fda6a2..edff0d9215 100644
--- a/headers/os/storage/SymLink.h
+++ b/headers/os/storage/SymLink.h
@@ -9,8 +9,8 @@
 	BSymLink interface declaration.
 */
 
-#ifndef __sk_sym_link_h__
-#define __sk_sym_link_h__
+#ifndef _SYM_LINK_H
+#define _SYM_LINK_H
 
 #include <Node.h>
 #include <StorageDefs.h>
@@ -83,4 +83,4 @@ private:
 };		// namespace OpenBeOS
 #endif
 
-#endif	// __sk_sym_link_h__
+#endif	// _SYM_LINK_H
diff --git a/headers/os/storage/Volume.h b/headers/os/storage/Volume.h
index 607f428676..ae44514e70 100644
--- a/headers/os/storage/Volume.h
+++ b/headers/os/storage/Volume.h
@@ -7,8 +7,8 @@
 //	Description:	BVolume class
 // ----------------------------------------------------------------------
 
-#ifndef __sk_volume_h__
-#define __sk_volume_h__
+#ifndef _VOLUME_H
+#define _VOLUME_H
 
 #ifndef _BE_BUILD_H
 #include <BeBuild.h>
@@ -104,4 +104,4 @@ class BVolume {
 }
 #endif
 
-#endif	// __sk_volume_h__
+#endif	// _VOLUME_H
diff --git a/headers/os/storage/VolumeRoster.h b/headers/os/storage/VolumeRoster.h
index 8f4352cc87..49b42e0be5 100644
--- a/headers/os/storage/VolumeRoster.h
+++ b/headers/os/storage/VolumeRoster.h
@@ -8,8 +8,8 @@
 // ----------------------------------------------------------------------
 
 
-#ifndef __sk_volumeroster_h__
-#define __sk_volumeroster_h__
+#ifndef _VOLUME_ROSTER_H
+#define _VOLUME_ROSTER_H
 
 #ifndef _BE_BUILD_H
 #include <BeBuild.h>
@@ -61,4 +61,4 @@ class BVolumeRoster {
 }
 #endif
 
-#endif	// __sk_volumeroster_h__
+#endif	// _VOLUME_ROSTER_H
diff --git a/headers/private/storage/Elf.h b/headers/private/storage/Elf.h
index 9373f0945d..ede0a05866 100644
--- a/headers/private/storage/Elf.h
+++ b/headers/private/storage/Elf.h
@@ -1,7 +1,7 @@
 // Elf.h
 
-#ifndef _sk_elf_h_
-#define _sk_elf_h_
+#ifndef _ELF_H
+#define _ELF_H
 
 // types
 typedef uint32		Elf32_Addr;
@@ -102,4 +102,4 @@ typedef struct {
 #define SHT_LOUSER		0x80000000
 #define SHT_HIUSER		0xffffffff
 
-#endif	// _sk_elf_h_
+#endif	// _ELF_H
diff --git a/headers/private/storage/Exception.h b/headers/private/storage/Exception.h
index d59c298621..ec0714e5b1 100644
--- a/headers/private/storage/Exception.h
+++ b/headers/private/storage/Exception.h
@@ -1,7 +1,7 @@
 // Exception
 
-#ifndef _sk_exception_
-#define _sk_exception_
+#ifndef _EXCEPTION_H
+#define _EXCEPTION_H
 
 #include <stdarg.h>
 #include <stdio.h>
@@ -108,4 +108,4 @@ private:
 
 };	// namespace StorageKit
 
-#endif	// _sk_exception_
+#endif	// _EXCEPTION_H
diff --git a/headers/private/storage/LibBeAdapter.h b/headers/private/storage/LibBeAdapter.h
index c027d67184..bc21f5f7d3 100644
--- a/headers/private/storage/LibBeAdapter.h
+++ b/headers/private/storage/LibBeAdapter.h
@@ -1,7 +1,7 @@
 // LibBeAdapter.h
 
-#ifndef _sk_lib_be_adapter_h_
-#define _sk_lib_be_adapter_h_
+#ifndef _LIB_BE_ADAPTER_H
+#define _LIB_BE_ADAPTER_H
 
 #include <SupportDefs.h>
 
@@ -16,4 +16,4 @@ extern status_t swap_data_adapter(type_code type, void *data, size_t length,
 
 extern bool is_type_swapped_adapter(type_code type);
 
-#endif	// _sk_lib_be_adapter_h_
+#endif	// _LIB_BE_ADAPTER_H
diff --git a/headers/private/storage/OffsetFile.h b/headers/private/storage/OffsetFile.h
index e71cc65bd9..18fcefd554 100644
--- a/headers/private/storage/OffsetFile.h
+++ b/headers/private/storage/OffsetFile.h
@@ -7,8 +7,8 @@
 	OffsetFile interface declaration.
 */
 
-#ifndef _sk_offset_file_h_
-#define _sk_offset_file_h_
+#ifndef _OFFSET_FILE_H
+#define _OFFSET_FILE_H
 
 #include <DataIO.h>
 #include <File.h>
@@ -60,4 +60,4 @@ private:
 
 };	// namespace StorageKit
 
-#endif	// _sk_offset_file_h_
+#endif	// _OFFSET_FILE_H
diff --git a/headers/private/storage/Pef.h b/headers/private/storage/Pef.h
index a54e5da2ce..d7569de112 100644
--- a/headers/private/storage/Pef.h
+++ b/headers/private/storage/Pef.h
@@ -1,7 +1,7 @@
 // Pef.h
 
-#ifndef _sk_pef_h_
-#define _sk_pef_h_
+#ifndef _PEF_H
+#define _PEF_H
 
 #include <SupportDefs.h>
 
@@ -43,4 +43,4 @@ struct PEFSectionHeader {
 
 const uint32 kPEFSectionHeaderSize		= 28;
 
-#endif	// _sk_pef_h_
+#endif	// _PEF_H
diff --git a/headers/private/storage/QueryPredicate.h b/headers/private/storage/QueryPredicate.h
index 12bf02b0df..300f347ead 100644
--- a/headers/private/storage/QueryPredicate.h
+++ b/headers/private/storage/QueryPredicate.h
@@ -6,8 +6,8 @@
 	\file QueryPredicate.h
 	BQuery predicate helper classes interface declaration.
 */
-#ifndef _sk_query_predicate_h_
-#define _sk_query_predicate_h_
+#ifndef _QUERY_PREDICATE_H
+#define _QUERY_PREDICATE_H
 
 #include <stdio.h>
 
@@ -203,4 +203,4 @@ private:
 
 };	// namespace StorageKit
 
-#endif	// _sk_query_predicate_h_
+#endif	// _QUERY_PREDICATE_H
diff --git a/headers/private/storage/ResourceFile.h b/headers/private/storage/ResourceFile.h
index 9e7cfc4a7a..9b336d133e 100644
--- a/headers/private/storage/ResourceFile.h
+++ b/headers/private/storage/ResourceFile.h
@@ -7,8 +7,8 @@
 	ResourceFile interface declaration.
 */
 
-#ifndef _sk_resource_file_h_
-#define _sk_resource_file_h_
+#ifndef _RESOURCE_FILE_H
+#define _RESOURCE_FILE_H
 
 #include <ByteOrder.h>
 
@@ -125,4 +125,4 @@ ResourceFile::_GetUInt32(uint32 value)
 
 };	// namespace StorageKit
 
-#endif	// _sk_resource_file_h_
+#endif	// _RESOURCE_FILE_H
diff --git a/headers/private/storage/ResourceItem.h b/headers/private/storage/ResourceItem.h
index 4ee79b32f7..4f95f9339a 100644
--- a/headers/private/storage/ResourceItem.h
+++ b/headers/private/storage/ResourceItem.h
@@ -7,8 +7,8 @@
 	ResourceItem interface declaration.
 */
 
-#ifndef _sk_resource_item_h_
-#define _sk_resource_item_h_
+#ifndef _RESOURCE_ITEM_H
+#define _RESOURCE_ITEM_H
 
 #include <DataIO.h>
 #include <String.h>
@@ -84,4 +84,4 @@ private:
 
 };	// namespace StorageKit
 
-#endif	// _sk_resource_item_h_
+#endif	// _RESOURCE_ITEM_H
diff --git a/headers/private/storage/ResourcesContainer.h b/headers/private/storage/ResourcesContainer.h
index 2a0c025390..90055cad7c 100644
--- a/headers/private/storage/ResourcesContainer.h
+++ b/headers/private/storage/ResourcesContainer.h
@@ -7,8 +7,8 @@
 	ResourcesContainer interface declaration.
 */
 
-#ifndef _sk_resources_container_h_
-#define _sk_resources_container_h_
+#ifndef _RESOURCES_CONTAINER_H
+#define _RESOURCES_CONTAINER_H
 
 #include <List.h>
 
@@ -72,4 +72,4 @@ private:
 
 };	// namespace StorageKit
 
-#endif	// _sk_resources_container_h_
+#endif	// _RESOURCES_CONTAINER_H
diff --git a/headers/private/storage/ResourcesDefs.h b/headers/private/storage/ResourcesDefs.h
index 3f90c774dc..47dd2e0415 100644
--- a/headers/private/storage/ResourcesDefs.h
+++ b/headers/private/storage/ResourcesDefs.h
@@ -1,7 +1,7 @@
 // ResourcesDefs.h
 
-#ifndef _sk_resources_defs_h_
-#define _sk_resources_defs_h_
+#ifndef _DEF_RESOURCES_H
+#define _DEF_RESOURCES_H
 
 #include <SupportDefs.h>
 
@@ -102,4 +102,4 @@ struct resource_info_table_end {
 const uint32	kResourceInfoTableEndSize		= 8;
 
 
-#endif	// _sk_resources_defs_h_
+#endif	// _DEF_RESOURCES_H
diff --git a/headers/private/storage/kernel_interface.h b/headers/private/storage/kernel_interface.h
index 45edf7c4e2..d30170c4b5 100644
--- a/headers/private/storage/kernel_interface.h
+++ b/headers/private/storage/kernel_interface.h
@@ -8,8 +8,8 @@
 	to communicate with the kernel
 */
 
-#ifndef _sk_kernel_interface_h_
-#define _sk_kernel_interface_h_
+#ifndef _STORAGE_KIT_KERNEL_INTERFACE_H
+#define _STORAGE_KIT_KERNEL_INTERFACE_H
 
 #include <SupportKit.h>
 #include <StorageDefs.Private.h>
@@ -331,4 +331,4 @@ status_t remove(const char *path);
 
 } // namespace StorageKit
 
-#endif
+#endif	// _STORAGE_KIT_KERNEL_INTERFACE_H
diff --git a/headers/private/storage/sniffer/DisjList.h b/headers/private/storage/sniffer/DisjList.h
index c5744d083c..212bd559e7 100644
--- a/headers/private/storage/sniffer/DisjList.h
+++ b/headers/private/storage/sniffer/DisjList.h
@@ -6,8 +6,8 @@
 	\file sniffer/DisjList.h
 	Mime Sniffer Disjunction List declarations
 */
-#ifndef _sk_sniffer_disj_list_h_
-#define _sk_sniffer_disj_list_h_
+#ifndef _SNIFFER_DISJ_LIST_H
+#define _SNIFFER_DISJ_LIST_H
 
 class BPositionIO;
 
@@ -28,4 +28,4 @@ protected:
 
 }
 
-#endif	// _sk_sniffer_disj_list_h_
\ No newline at end of file
+#endif	// _SNIFFER_DISJ_LIST_H
\ No newline at end of file
diff --git a/headers/private/storage/sniffer/Err.h b/headers/private/storage/sniffer/Err.h
index 40448939ba..911e167676 100644
--- a/headers/private/storage/sniffer/Err.h
+++ b/headers/private/storage/sniffer/Err.h
@@ -6,8 +6,8 @@
 	\file sniffer/Err.h
 	Mime Sniffer Error class declarations
 */
-#ifndef _sk_sniffer_err_h_
-#define _sk_sniffer_err_h_
+#ifndef _SNIFFER_ERR_H
+#define _SNIFFER_ERR_H
 
 #include <SupportDefs.h>
 #include <string>
@@ -49,4 +49,4 @@ private:
 
 }
 
-#endif	// _sk_sniffer_err_h_
\ No newline at end of file
+#endif	// _SNIFFER_ERR_H
\ No newline at end of file
diff --git a/headers/private/storage/sniffer/Parser.h b/headers/private/storage/sniffer/Parser.h
index 385882e165..4078c52e9e 100644
--- a/headers/private/storage/sniffer/Parser.h
+++ b/headers/private/storage/sniffer/Parser.h
@@ -6,8 +6,8 @@
 	\file sniffer/Parser.h
 	MIME sniffer rule parser declarations
 */
-#ifndef _sk_sniffer_parser_h_
-#define _sk_sniffer_parser_h_
+#ifndef _SNIFFER_PARSER_H
+#define _SNIFFER_PARSER_H
 
 #include <SupportDefs.h>
 #include <sniffer/Err.h>
@@ -326,5 +326,5 @@ private:
 }	// namespace Sniffer
 
 
-#endif	// _sk_sniffer_parser_h_
+#endif	// _SNIFFER_PARSER_H
 
diff --git a/headers/private/storage/sniffer/Pattern.h b/headers/private/storage/sniffer/Pattern.h
index 9addfbb163..eddf68769e 100644
--- a/headers/private/storage/sniffer/Pattern.h
+++ b/headers/private/storage/sniffer/Pattern.h
@@ -6,8 +6,8 @@
 	\file sniffer/Pattern.h
 	Mime Sniffer Pattern declarations
 */
-#ifndef _sk_sniffer_pattern_h_
-#define _sk_sniffer_pattern_h_
+#ifndef _SNIFFER_PATTERN_H
+#define _SNIFFER_PATTERN_H
 
 #include <SupportDefs.h>
 #include <string>
@@ -48,4 +48,4 @@ private:
 
 }
 
-#endif	// _sk_sniffer_pattern_h_
\ No newline at end of file
+#endif	// _SNIFFER_PATTERN_H
\ No newline at end of file
diff --git a/headers/private/storage/sniffer/PatternList.h b/headers/private/storage/sniffer/PatternList.h
index 5d96dfd89b..a4d5b94c51 100644
--- a/headers/private/storage/sniffer/PatternList.h
+++ b/headers/private/storage/sniffer/PatternList.h
@@ -6,8 +6,8 @@
 	\file sniffer/PatternList.h
 	MIME sniffer pattern list declarations
 */
-#ifndef _sk_sniffer_pattern_list_h_
-#define _sk_sniffer_pattern_list_h_
+#ifndef _SNIFFER_PATTERN_LIST_H
+#define _SNIFFER_PATTERN_LIST_H
 
 #include <sniffer/DisjList.h>
 #include <sniffer/Range.h>
@@ -40,4 +40,4 @@ private:
 
 }
 
-#endif	// _sk_sniffer_pattern_list_h_
\ No newline at end of file
+#endif	// _SNIFFER_PATTERN_LIST_H
\ No newline at end of file
diff --git a/headers/private/storage/sniffer/RPattern.h b/headers/private/storage/sniffer/RPattern.h
index b8837c2e23..d808c0020d 100644
--- a/headers/private/storage/sniffer/RPattern.h
+++ b/headers/private/storage/sniffer/RPattern.h
@@ -6,8 +6,8 @@
 	\file sniffer/RPattern.h
 	Mime Sniffer RPattern declarations
 */
-#ifndef _sk_sniffer_r_pattern_h_
-#define _sk_sniffer_r_pattern_h_
+#ifndef _SNIFFER_R_PATTERN_H
+#define _SNIFFER_R_PATTERN_H
 
 #include <sniffer/Range.h>
 
@@ -35,4 +35,4 @@ private:
 
 }
 
-#endif	// _sk_sniffer_r_pattern_h_
\ No newline at end of file
+#endif	// _SNIFFER_R_PATTERN_H
\ No newline at end of file
diff --git a/headers/private/storage/sniffer/RPatternList.h b/headers/private/storage/sniffer/RPatternList.h
index 7024a26b3c..32bfc782b9 100644
--- a/headers/private/storage/sniffer/RPatternList.h
+++ b/headers/private/storage/sniffer/RPatternList.h
@@ -6,8 +6,8 @@
 	\file sniffer/RPatternList.h
 	MIME sniffer rpattern list declarations
 */
-#ifndef _sk_sniffer_r_pattern_list_h_
-#define _sk_sniffer_r_pattern_list_h_
+#ifndef _SNIFFER_R_PATTERN_LIST_H
+#define _SNIFFER_R_PATTERN_LIST_H
 
 #include <sniffer/DisjList.h>
 #include <vector>
@@ -36,4 +36,4 @@ private:
 
 }
 
-#endif	// _sk_sniffer_r_pattern_list_h_
\ No newline at end of file
+#endif	// _SNIFFER_R_PATTERN_LIST_H
\ No newline at end of file
diff --git a/headers/private/storage/sniffer/Range.h b/headers/private/storage/sniffer/Range.h
index 449c7462d9..0031b48fff 100644
--- a/headers/private/storage/sniffer/Range.h
+++ b/headers/private/storage/sniffer/Range.h
@@ -6,8 +6,8 @@
 	\file sniffer/Range.h
 	MIME sniffer range declarations
 */
-#ifndef _sk_sniffer_range_h_
-#define _sk_sniffer_range_h_
+#ifndef _SNIFFER_RANGE_H
+#define _SNIFFER_RANGE_H
 
 #include <SupportDefs.h>
 
@@ -35,4 +35,4 @@ private:
 
 }
 
-#endif	// _sk_sniffer_range_h_
\ No newline at end of file
+#endif	// _SNIFFER_RANGE_H
\ No newline at end of file
diff --git a/headers/private/storage/sniffer/Rule.h b/headers/private/storage/sniffer/Rule.h
index 51bd96204a..d873b541bc 100644
--- a/headers/private/storage/sniffer/Rule.h
+++ b/headers/private/storage/sniffer/Rule.h
@@ -6,8 +6,8 @@
 	\file sniffer/Rule.h
 	Mime sniffer rule declarations
 */
-#ifndef _sk_sniffer_rule_h_
-#define _sk_sniffer_rule_h_
+#ifndef _SNIFFER_RULE_H
+#define _SNIFFER_RULE_H
 
 #include <SupportDefs.h>
 #include <vector>
@@ -42,4 +42,4 @@ private:
 
 }
 
-#endif	// _sk_sniffer_rule_h_
\ No newline at end of file
+#endif	// _SNIFFER_RULE_H
\ No newline at end of file
diff --git a/headers/private/storage/storage_support.h b/headers/private/storage/storage_support.h
index af659304cb..15459ad6bc 100644
--- a/headers/private/storage/storage_support.h
+++ b/headers/private/storage/storage_support.h
@@ -8,8 +8,8 @@
 	Storage Kit support functions.
 */
 
-#ifndef _sk_storage_support_h_
-#define _sk_storage_support_h_
+#ifndef _STORAGE_SUPPORT_H
+#define _STORAGE_SUPPORT_H
 
 
 namespace StorageKit {
@@ -39,4 +39,4 @@ status_t check_path_name(const char *path);
 
 } // namespace StorageKit
 
-#endif	// _sk_storage_support_h_
+#endif	// _STORAGE_SUPPORT_H