diff --git a/examples/H5Block/Makefile.am b/examples/H5Block/Makefile.am
index 95d3c55..23cac64 100644
--- a/examples/H5Block/Makefile.am
+++ b/examples/H5Block/Makefile.am
@@ -6,6 +6,7 @@ LDADD =
 
 if ENABLE_FORTRAN
 LDADD += -lH5hutF
+AM_LDFLAGS += -L${abs_top_builddir}/src/Fortran/.libs
 endif
 
 LDADD += -lH5hut
diff --git a/examples/H5Part/H5testF.f90 b/examples/H5Part/H5testF.f90
index 71e1a19..3ba08e4 100644
--- a/examples/H5Part/H5testF.f90
+++ b/examples/H5Part/H5testF.f90
@@ -38,6 +38,7 @@ PROGRAM H5PartExampleF
       CALL EXIT (1)
    END IF
    DO i = 1, num_args
+      PRINT *, "Loop..."
       if (skip .EQV. .TRUE.) THEN
          CYCLE
       END IF
@@ -103,13 +104,16 @@ PROGRAM H5PartExampleF
   IF (h5_err < 0) THEN
      PRINT "('[proc ', I3, ']: Error closing file ...')", myproc
   ENDIF
+  PRINT "('[proc ', I3, ']: File closed.')", myproc
 
   h5_err = h5_finalize ()
   IF (h5_err < 0) THEN
      PRINT "('[proc ', I3, ']: Error closing H5hut library ...')", myproc
   ENDIF
+  PRINT "('[proc ', I3, ']: H5hut finalized.')", myproc
 
   CALL MPI_Finalize (mpi_error)
+  PRINT "('[proc ', I3, ']: MPI finalized.')", myproc
 
 #else
   !! SERIAL CODE
diff --git a/examples/H5Part/Makefile.am b/examples/H5Part/Makefile.am
index 3735b2d..9db0b0b 100644
--- a/examples/H5Part/Makefile.am
+++ b/examples/H5Part/Makefile.am
@@ -10,6 +10,7 @@ endif
 
 if ENABLE_FORTRAN
 LDADD += -lH5hutF
+AM_LDFLAGS += -L${abs_top_builddir}/src/Fortran/.libs
 endif
 
 LDADD += -lH5hut
diff --git a/src/Fortran/H5.c b/src/Fortran/H5.c
index 8243660..0c6817b 100644
--- a/src/Fortran/H5.c
+++ b/src/Fortran/H5.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2012, The Regents of the University of California,
+  Copyright (c) 2006-2013, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -8,6 +8,9 @@
 */
 
 #include "h5_private.h"
+
+#include "h5core/h5.h"
+#include "h5core/h5_debug.h"
 #include "h5core/h5_model.h"
 
 /* file handling interface */
diff --git a/src/Fortran/H5Block.c b/src/Fortran/H5Block.c
index 60a797b..fcf089b 100755
--- a/src/Fortran/H5Block.c
+++ b/src/Fortran/H5Block.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2012, The Regents of the University of California,
+  Copyright (c) 2006-2013, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -8,6 +8,7 @@
 */
 
 #include "h5_private.h"
+#include "h5core/h5_debug.h"
 #include "h5core/h5b_model.h"
 
 #define h5bl_3d_setview F77_NAME (					\
diff --git a/src/Fortran/H5Block_attribs.c b/src/Fortran/H5Block_attribs.c
index bac8064..ddfd4ce 100644
--- a/src/Fortran/H5Block_attribs.c
+++ b/src/Fortran/H5Block_attribs.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2012, The Regents of the University of California,
+  Copyright (c) 2006-2013, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -8,6 +8,7 @@
 */
 
 #include "h5_private.h"
+#include "h5core/h5_debug.h"
 #include "h5core/h5b_attribs.h"
 
 #define H5_R8_T H5_FLOAT64_T
diff --git a/src/Fortran/H5Block_io.c b/src/Fortran/H5Block_io.c
index 3a2c1c7..b5076b5 100644
--- a/src/Fortran/H5Block_io.c
+++ b/src/Fortran/H5Block_io.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2012, The Regents of the University of California,
+  Copyright (c) 2006-2013, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -8,6 +8,7 @@
 */
 
 #include "h5_private.h"
+#include "h5core/h5_debug.h"
 #include "h5core/h5b_io.h"
 
 #define h5bl_3d_write_scalar_field_r8 F77_NAME ( \
diff --git a/src/Fortran/H5Part.c b/src/Fortran/H5Part.c
index 4beabba..6dfe367 100755
--- a/src/Fortran/H5Part.c
+++ b/src/Fortran/H5Part.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2012, The Regents of the University of California,
+  Copyright (c) 2006-2013, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -8,8 +8,11 @@
 */
 
 #include "h5_private.h"
+#include "h5core/h5_debug.h"
 #include "h5core/h5u_model.h"
 
+#include "h5core/h5_syscall.h"
+
 /*==============Reading Data Characteristics============*/
 
 #define h5pt_getndatasets F77_NAME (					\
diff --git a/src/Fortran/H5Part_io.c b/src/Fortran/H5Part_io.c
index b5d7c3b..1a9f849 100644
--- a/src/Fortran/H5Part_io.c
+++ b/src/Fortran/H5Part_io.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2012, The Regents of the University of California,
+  Copyright (c) 2006-2013, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -8,6 +8,8 @@
 */
 
 #include "h5_private.h"
+#include "h5core/h5_debug.h"
+
 #include "h5core/h5u_io.h"
 
 /*==================Writing data ============*/
diff --git a/src/Fortran/H5_attribs.c b/src/Fortran/H5_attribs.c
index 57bedca..4d11314 100644
--- a/src/Fortran/H5_attribs.c
+++ b/src/Fortran/H5_attribs.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2012, The Regents of the University of California,
+  Copyright (c) 2006-2013, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -8,6 +8,8 @@
 */
 
 #include "h5_private.h"
+
+#include "h5core/h5_debug.h"
 #include "h5core/h5_attribs.h"
 
 /*
diff --git a/src/Fortran/h5_private.h b/src/Fortran/h5_private.h
index cab385a..444e9f8 100644
--- a/src/Fortran/h5_private.h
+++ b/src/Fortran/h5_private.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2012, The Regents of the University of California,
+  Copyright (c) 2006-2013, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.