diff --git a/src/kits/storage/Directory.cpp b/src/kits/storage/Directory.cpp
index fc8b6cb439..2629d42086 100644
--- a/src/kits/storage/Directory.cpp
+++ b/src/kits/storage/Directory.cpp
@@ -998,28 +998,37 @@ create_directory(const char* path, mode_t mode)
 
 
 #ifdef HAIKU_TARGET_PLATFORM_LIBBE_TEST
+#	if __GNUC__ == 2	// gcc 2
 
-B_DEFINE_SYMBOL_VERSION("_GetStatFor__C10BDirectoryPCcP4stat",
-	"GetStatFor__C10BDirectoryPCcP4stat@@LIBBE_TEST");
+	B_DEFINE_SYMBOL_VERSION("_GetStatFor__C10BDirectoryPCcP4stat",
+		"GetStatFor__C10BDirectoryPCcP4stat@@LIBBE_TEST");
 
-#elif __GNUC__ == 2	// gcc 2
+#	else	// gcc 4
 
-// BeOS compatible GetStatFor()
-B_DEFINE_SYMBOL_VERSION("_GetStatFor__C10BDirectoryPCcP9stat_beos",
-	"GetStatFor__C10BDirectoryPCcP4stat@LIBBE_BASE");
+	B_DEFINE_SYMBOL_VERSION("_ZNK10BDirectory11_GetStatForEPKcP4stat",
+		"_ZNK10BDirectory10GetStatForEPKcP4stat@@LIBBE_TEST");
 
-// Haiku GetStatFor()
-B_DEFINE_SYMBOL_VERSION("_GetStatFor__C10BDirectoryPCcP4stat",
-	"GetStatFor__C10BDirectoryPCcP4stat@@LIBBE_1_ALPHA1");
+#	endif	// gcc 4
+#else	// !HAIKU_TARGET_PLATFORM_LIBBE_TEST
+#	if __GNUC__ == 2	// gcc 2
 
-#else	// gcc 4
+	// BeOS compatible GetStatFor()
+	B_DEFINE_SYMBOL_VERSION("_GetStatFor__C10BDirectoryPCcP9stat_beos",
+		"GetStatFor__C10BDirectoryPCcP4stat@LIBBE_BASE");
 
-// BeOS compatible GetStatFor()
-B_DEFINE_SYMBOL_VERSION("_ZNK10BDirectory11_GetStatForEPKcP9stat_beos",
-	"_ZNK10BDirectory10GetStatForEPKcP4stat@LIBBE_BASE");
+	// Haiku GetStatFor()
+	B_DEFINE_SYMBOL_VERSION("_GetStatFor__C10BDirectoryPCcP4stat",
+		"GetStatFor__C10BDirectoryPCcP4stat@@LIBBE_1_ALPHA1");
 
-// Haiku GetStatFor()
-B_DEFINE_SYMBOL_VERSION("_ZNK10BDirectory11_GetStatForEPKcP4stat",
-	"_ZNK10BDirectory10GetStatForEPKcP4stat@@LIBBE_1_ALPHA1");
+#	else	// gcc 4
 
-#endif	// gcc 4
+	// BeOS compatible GetStatFor()
+	B_DEFINE_SYMBOL_VERSION("_ZNK10BDirectory11_GetStatForEPKcP9stat_beos",
+		"_ZNK10BDirectory10GetStatForEPKcP4stat@LIBBE_BASE");
+
+	// Haiku GetStatFor()
+	B_DEFINE_SYMBOL_VERSION("_ZNK10BDirectory11_GetStatForEPKcP4stat",
+		"_ZNK10BDirectory10GetStatForEPKcP4stat@@LIBBE_1_ALPHA1");
+
+#	endif	// gcc 4
+#endif	// !HAIKU_TARGET_PLATFORM_LIBBE_TEST
diff --git a/src/kits/storage/Entry.cpp b/src/kits/storage/Entry.cpp
index 172994e8f3..e132ae831d 100644
--- a/src/kits/storage/Entry.cpp
+++ b/src/kits/storage/Entry.cpp
@@ -1131,28 +1131,38 @@ operator<(const entry_ref & a, const entry_ref & b)
 
 
 #ifdef HAIKU_TARGET_PLATFORM_LIBBE_TEST
+#	if __GNUC__ == 2	// gcc 2
 
-B_DEFINE_SYMBOL_VERSION("_GetStat__C6BEntryP4stat",
-	"GetStat__C6BEntryP4stat@@LIBBE_TEST");
+	B_DEFINE_SYMBOL_VERSION("_GetStat__C6BEntryP4stat",
+		"GetStat__C6BEntryP4stat@@LIBBE_TEST");
 
-#elif __GNUC__ == 2	// gcc 2
+#	else	// gcc 4
 
-// BeOS compatible GetStat()
-B_DEFINE_SYMBOL_VERSION("_GetStat__C6BEntryP9stat_beos",
-	"GetStat__C6BEntryP4stat@LIBBE_BASE");
+	// Haiku GetStat()
+	B_DEFINE_SYMBOL_VERSION("_ZNK6BEntry8_GetStatEP4stat",
+		"_ZNK6BEntry7GetStatEP4stat@@LIBBE_TEST");
 
-// Haiku GetStat()
-B_DEFINE_SYMBOL_VERSION("_GetStat__C6BEntryP4stat",
-	"GetStat__C6BEntryP4stat@@LIBBE_1_ALPHA1");
+#	endif	// gcc 4
+#else	// !HAIKU_TARGET_PLATFORM_LIBBE_TEST
+#	if __GNUC__ == 2	// gcc 2
 
-#else	// gcc 4
+	// BeOS compatible GetStat()
+	B_DEFINE_SYMBOL_VERSION("_GetStat__C6BEntryP9stat_beos",
+		"GetStat__C6BEntryP4stat@LIBBE_BASE");
 
-// BeOS compatible GetStat()
-B_DEFINE_SYMBOL_VERSION("_ZNK6BEntry8_GetStatEP9stat_beos",
-	"_ZNK6BEntry7GetStatEP4stat@LIBBE_BASE");
+	// Haiku GetStat()
+	B_DEFINE_SYMBOL_VERSION("_GetStat__C6BEntryP4stat",
+		"GetStat__C6BEntryP4stat@@LIBBE_1_ALPHA1");
 
-// Haiku GetStat()
-B_DEFINE_SYMBOL_VERSION("_ZNK6BEntry8_GetStatEP4stat",
-	"_ZNK6BEntry7GetStatEP4stat@@LIBBE_1_ALPHA1");
+#	else	// gcc 4
 
-#endif	// gcc 4
+	// BeOS compatible GetStat()
+	B_DEFINE_SYMBOL_VERSION("_ZNK6BEntry8_GetStatEP9stat_beos",
+		"_ZNK6BEntry7GetStatEP4stat@LIBBE_BASE");
+
+	// Haiku GetStat()
+	B_DEFINE_SYMBOL_VERSION("_ZNK6BEntry8_GetStatEP4stat",
+		"_ZNK6BEntry7GetStatEP4stat@@LIBBE_1_ALPHA1");
+
+#	endif	// gcc 4
+#endif	// !HAIKU_TARGET_PLATFORM_LIBBE_TEST