diff --git AmberTools/src/pbsa/Makefile AmberTools/src/pbsa/Makefile
index 111d200..4906bf6 100644
--- AmberTools/src/pbsa/Makefile
+++ AmberTools/src/pbsa/Makefile
@@ -29,9 +29,9 @@ LIBPBSAOBJS=interface.o pbsaapi.o \
         pb_direct.o pb_list.o pb_write.o pb_mpfrc.o \
         decomp.o rgroup.o rfree.o
 
-SANDERPBSAOBJS= dsvdc.o sa_driver.SANDER.o pb_nlsolver.SANDER.o \
-        pb_lsolver.SANDER.o pb_force.SANDER.o np_force.SANDER.o \
-        pb_exmol.o pb_mpfrc.SANDER.o pb_direct.SANDER.o \
+SANDERPBSAOBJS= dsvdc.o sa_driver.o pb_nlsolver.o \
+        pb_lsolver.o pb_force.SANDER.o np_force.SANDER.o \
+        pb_exmol.SANDER.o pb_mpfrc.SANDER.o pb_direct.SANDER.o \
         pb_list.SANDER.o pb_read.SANDER.o pb_write.SANDER.o pb_init.SANDER.o
 
 all: pbsa$(SFX)
@@ -190,7 +190,7 @@ pb_read.SANDER.o: \
                     dynph.h\
                     pb_force.SANDER.o\
                     np_force.SANDER.o\
-                    sa_driver.SANDER.o
+                    sa_driver.o
 pb_read.LIBPBSA.o: \
                     copyright.h\
                     box.h\
@@ -211,10 +211,6 @@ sa_driver.o: \
                     copyright.h\
                     pb_constants.h\
                     pb_def.h
-sa_driver.SANDER.o: \
-                    copyright.h\
-                    pb_constants.h\
-                    pb_def.h
 np_force.o: \
                     copyright.h\
                     pb_def.h\
@@ -261,21 +257,25 @@ pb_force.o: \
 pb_force.SANDER.o: \
                     copyright.h\
                     pb_def.h\
-                    timer.h\
                     md.h\
                     pb_md.h\
                     box.h\
                     pb_constants.h\
                     pb_dbfrc_fld.h\
                     pb_dbfrc_fld2.h\
-		    sa_driver.SANDER.o\
-                    pb_nlsolver.SANDER.o\
-                    pb_lsolver.SANDER.o
+		    sa_driver.o\
+                    pb_nlsolver.o\
+                    pb_lsolver.o
 pb_exmol.o: \
                     copyright.h\
                     pb_def.h\
                     pb_force.o\
                     sa_driver.o
+pb_exmol.o: \
+                    copyright.h\
+                    pb_def.h\
+                    pb_force.SANDER.o\
+                    sa_driver.o
 pb_mpfrc.o: \
                     copyright.h\
                     pb_constants.h\
@@ -306,24 +306,12 @@ pb_list.SANDER.o: \
                     pb_def.h\
                     pb_constants.h\
                     pb_force.SANDER.o\
-                    sa_driver.SANDER.o
+                    sa_driver.o
 pb_nlsolver.o: \
                     copyright.h\
-                    timer.h\
-                    timer.o\
-                    pb_constants.h
-pb_nlsolver.SANDER.o: \
-                    copyright.h\
-                    timer.h\
-                    timer.o\
                     pb_constants.h
 pb_lsolver.o: \
                     copyright.h\
-                    timer.h\
-                    pb_constants.h
-pb_lsolver.SANDER.o: \
-                    copyright.h\
-                    timer.h\
                     pb_constants.h
 pb_init.o: \
                     copyright.h\
@@ -344,7 +332,7 @@ pb_init.SANDER.o: \
                     pb_md.h\
                     parms.h\
                     pb_constants.h\
-                    sa_driver.SANDER.o\
+                    sa_driver.o\
                     pb_force.SANDER.o\
                     np_force.SANDER.o
 runmd.o: \
diff --git AmberTools/src/pbsa/pb_lsolver.f AmberTools/src/pbsa/pb_lsolver.f
index cef03fa..b9dc329 100644
--- AmberTools/src/pbsa/pb_lsolver.f
+++ AmberTools/src/pbsa/pb_lsolver.f
@@ -1,8 +1,8 @@
 #include "copyright.h"
 #  define _REAL_ double precision
-#ifdef PBSA
-#include "timer.h"
-#endif
+!#ifdef PBSA
+!#include "timer.h"
+!#endif
 
 module pb_lsolver
 
diff --git AmberTools/src/pbsa/pb_nlsolver.f AmberTools/src/pbsa/pb_nlsolver.f
index ba93c9b..aac6152 100644
--- AmberTools/src/pbsa/pb_nlsolver.f
+++ AmberTools/src/pbsa/pb_nlsolver.f
@@ -1,8 +1,8 @@
 #include "copyright.h"
 #  define _REAL_ double precision
-#ifdef PBSA
-#include "timer.h"
-#endif
+!#ifdef PBSA
+!#include "timer.h"
+!#endif
 
 module pb_nlsolver