Updated .am files to include needed header files