diff --git a/src/lam/os/lam_system.h b/src/lam/os/lam_system.h
new file mode 100644
index 0000000000..d63356ab8a
--- /dev/null
+++ b/src/lam/os/lam_system.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2002-2003. The Regents of the University of California. This material
+ * was produced under U.S. Government contract W-7405-ENG-36 for Los Alamos
+ * National Laboratory, which is operated by the University of California for
+ * the U.S. Department of Energy. The Government is granted for itself and
+ * others acting on its behalf a paid-up, nonexclusive, irrevocable worldwide
+ * license in this material to reproduce, prepare derivative works, and
+ * perform publicly and display publicly. Beginning five (5) years after
+ * October 10,2002 subject to additional five-year worldwide renewals, the
+ * Government is granted for itself and others acting on its behalf a paid-up,
+ * nonexclusive, irrevocable worldwide license in this material to reproduce,
+ * prepare derivative works, distribute copies to the public, perform publicly
+ * and display publicly, and to permit others to do so. NEITHER THE UNITED
+ * STATES NOR THE UNITED STATES DEPARTMENT OF ENERGY, NOR THE UNIVERSITY OF
+ * CALIFORNIA, NOR ANY OF THEIR EMPLOYEES, MAKES ANY WARRANTY, EXPRESS OR
+ * IMPLIED, OR ASSUMES ANY LEGAL LIABILITY OR RESPONSIBILITY FOR THE ACCURACY,
+ * COMPLETENESS, OR USEFULNESS OF ANY INFORMATION, APPARATUS, PRODUCT, OR
+ * PROCESS DISCLOSED, OR REPRESENTS THAT ITS USE WOULD NOT INFRINGE PRIVATELY
+ * OWNED RIGHTS.
+ 
+ * Additionally, this program is free software; you can distribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2 of the License,
+ * or any later version.  Accordingly, this program is distributed in the hope
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
+
+
+#ifndef LAM_SYSTEM_H
+#define LAM_SYSTEM_H
+
+/* conditionally include system dependent stuff here */
+
+#if defined (__mips)
+
+#include "lam/os/IRIX/ulm_os.h"
+
+#elif defined (__linux__)
+
+#include "lam/os/LINUX/ulm_os.h"
+
+#elif defined (__osf__)
+
+#include "lam/os/TRU64/ulm_os.h"
+
+#elif defined (__APPLE__)
+
+#include "lam/os/DARWIN/ulm_os.h"
+
+#elif defined (__CYGWIN__)
+
+#include "lam/os/CYGWIN/ulm_os.h"
+
+#else
+# error
+#endif
+
+
+#endif  /* LAM_SYSTEM_H */
diff --git a/src/lam/os/numa.h b/src/lam/os/numa.h
index 98a4229416..6cb31564c8 100644
--- a/src/lam/os/numa.h
+++ b/src/lam/os/numa.h
@@ -32,6 +32,7 @@
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 #include "lam/base/object.h"
+#include "lam_constants.h"
 
 typedef int     affinity_t;