diff --git a/acinclude.m4 b/acinclude.m4
index 5ca37d757f..9d825ed332 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,19 +1,26 @@
 dnl -*- shell-script -*-
 dnl
-dnl Copyright (c) 2003 The Trustees of Indiana University.  
-dnl                    All rights reserved.
-dnl 
-dnl This file is part of the LAM/MPI software package.  For license
-dnl information, see the LICENSE file in the top level directory of the
-dnl LAM/MPI source distribution.
+dnl $HEADER$
 dnl
-dnl $Id: acinclude.m4,v 1.2 2003/12/22 16:29:11 twoodall Exp $
+dnl $Id: acinclude.m4,v 1.3 2004/01/07 07:49:52 jsquyres Exp $
 dnl
 
 #
-# CMPI-specific tests
+# LAM/MPI-specific tests
 #
 
+sinclude(config/cxx_find_template_parameters.m4)
+sinclude(config/cxx_find_template_repository.m4)
+
+sinclude(config/lam_check_optflags.m4)
+sinclude(config/lam_configure_options.m4)
 sinclude(config/lam_functions.m4)
 sinclude(config/lam_get_version.m4)
+sinclude(config/lam_setup_cc.m4)
+sinclude(config/lam_setup_cxx.m4)
+
+#
+# Contributed tests
+#
+
 sinclude(config/ax_create_stdint_h.m4)