diff --git a/headers/build/private/app/MessageField.h b/headers/build/private/app/MessageField.h
index 9b20d8677c..6e958f457f 100644
--- a/headers/build/private/app/MessageField.h
+++ b/headers/build/private/app/MessageField.h
@@ -29,6 +29,7 @@
 #define MESSAGEFIELD_H
 
 // Standard Includes -----------------------------------------------------------
+#include <new>
 #include <cstdio>
 #include <cstdlib>
 #include <vector>
@@ -58,6 +59,8 @@
 
 #define MSG_LAST_ENTRY			0x0
 
+using namespace std;
+
 // Globals ---------------------------------------------------------------------
 namespace BPrivate {
 
diff --git a/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile
index f79eed8121..189c2ba466 100644
--- a/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile
@@ -64,8 +64,9 @@ SYSHDRS = $(HAIKU_HDRS) ;
 		$(malloc_debug_defines)
 		$(buildPlatformDefines)
 	] ;
-	SubDirCcFlags $(defines) $(malloc_debug_flags) ;
+	SubDirCcFlags $(defines) $(malloc_debug_flags) -nostdinc ;
 	SubDirC++Flags $(defines) -fno-exceptions -fno-rtti $(malloc_debug_flags)
+		-nostdinc
 		-include [ FDirName $(SUBDIR) Debug.h ] ;
 }
 
diff --git a/src/tests/add-ons/kernel/file_systems/bfs/r5/Inode.cpp b/src/tests/add-ons/kernel/file_systems/bfs/r5/Inode.cpp
index 71a8cf761a..1c60d1714a 100644
--- a/src/tests/add-ons/kernel/file_systems/bfs/r5/Inode.cpp
+++ b/src/tests/add-ons/kernel/file_systems/bfs/r5/Inode.cpp
@@ -1605,8 +1605,11 @@ Inode::ShrinkStream(Transaction *transaction, off_t size)
 	data_stream *data = &Node()->data;
 
 	if (data->MaxDoubleIndirectRange() > size) {
+		off_t *maxDoubleIndirect = &data->max_double_indirect_range;
+			// gcc 4 work-around: "error: cannot bind packed field
+			// 'data->data_stream::max_double_indirect_range' to 'off_t&'"
 		FreeStaticStreamArray(transaction, 0, data->double_indirect, size,
-			data->MaxIndirectRange(), data->max_double_indirect_range);
+			data->MaxIndirectRange(), *maxDoubleIndirect);
 
 		if (size <= data->MaxIndirectRange()) {
 			fVolume->Free(transaction, data->double_indirect);
@@ -1624,8 +1627,11 @@ Inode::ShrinkStream(Transaction *transaction, off_t size)
 			if (array == NULL)
 				break;
 
+			off_t *maxIndirect = &data->max_indirect_range;
+				// gcc 4 work-around: "error: cannot bind packed field
+				// 'data->data_stream::max_indirect_range' to 'off_t&'"
 			if (FreeStreamArray(transaction, array, fVolume->BlockSize() / sizeof(block_run),
-					size, offset, data->max_indirect_range) == B_OK)
+					size, offset, *maxIndirect) == B_OK)
 				cached.WriteBack(transaction);
 		}
 		if (data->max_direct_range == data->max_indirect_range) {
@@ -1636,8 +1642,11 @@ Inode::ShrinkStream(Transaction *transaction, off_t size)
 	}
 	if (data->MaxDirectRange() > size) {
 		off_t offset = 0;
+		off_t *maxDirect = &data->max_direct_range;
+			// gcc 4 work-around: "error: cannot bind packed field
+			// 'data->data_stream::max_indirect_range' to 'off_t&'"
 		FreeStreamArray(transaction, data->direct, NUM_DIRECT_BLOCKS, size, offset,
-			data->max_direct_range);
+			*maxDirect);
 	}
 
 	data->size = HOST_ENDIAN_TO_BFS_INT64(size);