diff --git a/cxx/Makefile.am b/cxx/Makefile.am
index 04c0233c1..2f50e97a8 100644
--- a/cxx/Makefile.am
+++ b/cxx/Makefile.am
@@ -61,7 +61,7 @@ endif
 endif
 
 AM_CPPFLAGS += -I${top_srcdir}/liblib
-AM_LDFLAGS += ${top_builddir}/liblib/libnetcdf.la @EXTERN_LDFLAGS@
+AM_LDFLAGS += ${top_builddir}/liblib/libnetcdf.la # @EXTERN_LDFLAGS@
 LDADD = $(top_builddir)/cxx/libnetcdf_c++.la  ${AM_LDFLAGS}
 
 # These headers will be installed in the users header directory.
diff --git a/examples/CXX/Makefile.am b/examples/CXX/Makefile.am
index 1d98e81f3..ab0133ceb 100644
--- a/examples/CXX/Makefile.am
+++ b/examples/CXX/Makefile.am
@@ -13,7 +13,7 @@ LDADD =
 
 AM_CPPFLAGS += -I$(top_builddir)/liblib
 AM_CXXFLAGS += -I$(top_builddir)/liblib
-AM_LDFLAGS += ${top_builddir}/cxx/libnetcdf_c++.la ${top_builddir}/liblib/libnetcdf.la @EXTERN_LDFLAGS@
+AM_LDFLAGS += ${top_builddir}/cxx/libnetcdf_c++.la ${top_builddir}/liblib/libnetcdf.la # @EXTERN_LDFLAGS@
 
 # These are the example programs.
 TESTPROGRAMS = simple_xy_wr simple_xy_rd sfc_pres_temp_wr	\
diff --git a/h5_test/tst_h_files.c b/h5_test/tst_h_files.c
index e04e932fe..dad915cd2 100644
--- a/h5_test/tst_h_files.c
+++ b/h5_test/tst_h_files.c
@@ -34,6 +34,9 @@ main()
       H5T_class_t class;
       size_t type_size;
       int j, k;
+      hid_t tmp1;
+
+      H5open();
 
       /* Initialize some data. */
       for (j = 0; j < DIM_LEN; j++)
@@ -42,7 +45,8 @@ main()
 
       /* Set the access list so that closes will fail if something is
        * still open in the file. */
-      if ((access_plist = H5Pcreate(H5P_FILE_ACCESS)) < 0) ERR;
+      tmp1 = H5P_FILE_ACCESS;
+      if ((access_plist = H5Pcreate(tmp1)) < 0) ERR;
       if (H5Pset_fclose_degree(access_plist, H5F_CLOSE_SEMI)) ERR;
 
       /* Create file. */
diff --git a/libsrc4/Makefile.am b/libsrc4/Makefile.am
index 573c7b12c..210aeac80 100644
--- a/libsrc4/Makefile.am
+++ b/libsrc4/Makefile.am
@@ -7,8 +7,6 @@
 
 include $(top_srcdir)/lib_flags.am
 
-# Initialize
-LDADD =
 libnetcdf4_la_CPPFLAGS = ${AM_CPPFLAGS}
 
 # Netcdf-4 source.
diff --git a/ncdump/Makefile.am b/ncdump/Makefile.am
index eb9671b8b..4c24c33c5 100644
--- a/ncdump/Makefile.am
+++ b/ncdump/Makefile.am
@@ -6,7 +6,7 @@
 
 # Put together AM_CPPFLAGS and AM_LDFLAGS.
 include $(top_srcdir)/lib_flags.am
-LDADD = ${top_builddir}/liblib/libnetcdf.la @EXTERN_LDFLAGS@
+LDADD = ${top_builddir}/liblib/libnetcdf.la #@EXTERN_LDFLAGS@
 
 # This is the program we're building, and it's sources.
 bin_PROGRAMS = ncdump 
diff --git a/ncdump/nccopy.c b/ncdump/nccopy.c
index c008e0640..fb119abed 100644
--- a/ncdump/nccopy.c
+++ b/ncdump/nccopy.c
@@ -1194,3 +1194,4 @@ main(int argc, char**argv)
         exit(1);
     return 0;
 }
+END_OF_MAIN();
diff --git a/ncdump/ncdump.c b/ncdump/ncdump.c
index 518a0271b..198f4f4e2 100644
--- a/ncdump/ncdump.c
+++ b/ncdump/ncdump.c
@@ -2189,3 +2189,4 @@ main(int argc, char *argv[])
     return EXIT_SUCCESS;
 #endif
 }
+END_OF_MAIN();
diff --git a/ncgen/Makefile.am b/ncgen/Makefile.am
index a90b11100..ec9c0b134 100644
--- a/ncgen/Makefile.am
+++ b/ncgen/Makefile.am
@@ -4,7 +4,7 @@
 
 # Put together AM_CPPFLAGS and AM_LDFLAGS.
 include $(top_srcdir)/lib_flags.am
-LDADD = ${top_builddir}/liblib/libnetcdf.la @EXTERN_LDFLAGS@
+LDADD = ${top_builddir}/liblib/libnetcdf.la
 
 # Build ncgen from the listed sources.
 bin_PROGRAMS = ncgen
diff --git a/ncgen/main.c b/ncgen/main.c
index 9408178ce..d1da4d241 100644
--- a/ncgen/main.c
+++ b/ncgen/main.c
@@ -376,6 +376,7 @@ main(
 
     return 0;
 }
+END_OF_MAIN();
 
 void
 init_netcdf(void) /* initialize global counts, flags */
diff --git a/ncgen3/Makefile.am b/ncgen3/Makefile.am
index 9feefd7b2..05ba5ddab 100644
--- a/ncgen3/Makefile.am
+++ b/ncgen3/Makefile.am
@@ -6,7 +6,7 @@
 include $(top_srcdir)/lib_flags.am
 
 # Link to the netCDF library.
-LDADD = ${top_builddir}/liblib/libnetcdf.la @EXTERN_LDFLAGS@
+ncgen3_LDADD = ${top_builddir}/liblib/libnetcdf.la 
 
 # Build ncgen from the listed sources.
 bin_PROGRAMS = ncgen3
diff --git a/ncgen3/main.c b/ncgen3/main.c
index e9b650872..3a28bc101 100644
--- a/ncgen3/main.c
+++ b/ncgen3/main.c
@@ -233,3 +233,4 @@ main(
 	return 1;
     return 0;
 }
+END_OF_MAIN();