diff -r e33f46fc48ed -r f95d63e2154a src/share/vm/opto/matcher.hpp
--- a/src/share/vm/opto/matcher.hpp	Tue Nov 23 15:01:43 2010 -0500
+++ b/src/share/vm/opto/matcher.hpp	Tue Nov 23 13:22:55 2010 -0800
@@ -22,6 +22,15 @@
  *
  */
 
+#ifndef SHARE_VM_OPTO_MATCHER_HPP
+#define SHARE_VM_OPTO_MATCHER_HPP
+
+#include "libadt/vectset.hpp"
+#include "memory/resourceArea.hpp"
+#include "opto/node.hpp"
+#include "opto/phaseX.hpp"
+#include "opto/regmask.hpp"
+
 class Compile;
 class Node;
 class MachNode;
@@ -447,3 +456,5 @@
   }
 #endif
 };
+
+#endif // SHARE_VM_OPTO_MATCHER_HPP