diff -r 518b01b064ff -r 5b173b4ca846 hotspot/src/share/vm/memory/barrierSet.inline.hpp
--- a/hotspot/src/share/vm/memory/barrierSet.inline.hpp	Tue Nov 23 15:01:43 2010 -0500
+++ b/hotspot/src/share/vm/memory/barrierSet.inline.hpp	Tue Nov 23 13:22:55 2010 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,12 @@
  *
  */
 
+#ifndef SHARE_VM_MEMORY_BARRIERSET_INLINE_HPP
+#define SHARE_VM_MEMORY_BARRIERSET_INLINE_HPP
+
+#include "memory/barrierSet.hpp"
+#include "memory/cardTableModRefBS.hpp"
+
 // Inline functions of BarrierSet, which de-virtualize certain
 // performance-critical calls when the barrier is the most common
 // card-table kind.
@@ -77,3 +83,5 @@
     write_region_work(mr);
   }
 }
+
+#endif // SHARE_VM_MEMORY_BARRIERSET_INLINE_HPP