diff --git a/src/MAKE/Makefile.altix b/src/MAKE/Makefile.altix
index 65fc1522d3..e2d4d561e3 100644
--- a/src/MAKE/Makefile.altix
+++ b/src/MAKE/Makefile.altix
@@ -82,7 +82,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.bgl b/src/MAKE/Makefile.bgl
index 866bffe6f0..bf114b93af 100644
--- a/src/MAKE/Makefile.bgl
+++ b/src/MAKE/Makefile.bgl
@@ -88,7 +88,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.cygwin b/src/MAKE/Makefile.cygwin
index f9a7a8280b..e788bc3c4b 100644
--- a/src/MAKE/Makefile.cygwin
+++ b/src/MAKE/Makefile.cygwin
@@ -82,7 +82,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.encanto b/src/MAKE/Makefile.encanto
index b227d8eba8..78df96df17 100644
--- a/src/MAKE/Makefile.encanto
+++ b/src/MAKE/Makefile.encanto
@@ -82,7 +82,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.fink b/src/MAKE/Makefile.fink
index 32061ac035..24ab4aaae6 100644
--- a/src/MAKE/Makefile.fink
+++ b/src/MAKE/Makefile.fink
@@ -82,7 +82,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.g++3 b/src/MAKE/Makefile.g++3
index cf03e9ab30..de39da68a8 100755
--- a/src/MAKE/Makefile.g++3
+++ b/src/MAKE/Makefile.g++3
@@ -82,7 +82,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.glory b/src/MAKE/Makefile.glory
index c72f12562a..f037b08c3f 100644
--- a/src/MAKE/Makefile.glory
+++ b/src/MAKE/Makefile.glory
@@ -100,7 +100,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.jaguar b/src/MAKE/Makefile.jaguar
index 9be8df31c4..87682a4326 100644
--- a/src/MAKE/Makefile.jaguar
+++ b/src/MAKE/Makefile.jaguar
@@ -90,7 +90,7 @@ user-awpwpmd_SYSPATH =
 
 include	Makefawpmd.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.lam b/src/MAKE/Makefile.lam
index b0b5cd46d6..59854a772a 100644
--- a/src/MAKE/Makefile.lam
+++ b/src/MAKE/Makefile.lam
@@ -82,7 +82,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.linux b/src/MAKE/Makefile.linux
index b27b905039..9cff2f0703 100755
--- a/src/MAKE/Makefile.linux
+++ b/src/MAKE/Makefile.linux
@@ -82,7 +82,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.mac b/src/MAKE/Makefile.mac
index 2c28eaac74..476987fa63 100755
--- a/src/MAKE/Makefile.mac
+++ b/src/MAKE/Makefile.mac
@@ -82,7 +82,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.mac_mpi b/src/MAKE/Makefile.mac_mpi
index 5c44775a54..cdcb780fd1 100755
--- a/src/MAKE/Makefile.mac_mpi
+++ b/src/MAKE/Makefile.mac_mpi
@@ -85,7 +85,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.mingw b/src/MAKE/Makefile.mingw
index 827a97786a..b94009f764 100644
--- a/src/MAKE/Makefile.mingw
+++ b/src/MAKE/Makefile.mingw
@@ -83,7 +83,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.mkl b/src/MAKE/Makefile.mkl
index 500bb332b6..60da45d4de 100644
--- a/src/MAKE/Makefile.mkl
+++ b/src/MAKE/Makefile.mkl
@@ -88,7 +88,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.odin b/src/MAKE/Makefile.odin
index 1187825619..60a2eb6cc6 100755
--- a/src/MAKE/Makefile.odin
+++ b/src/MAKE/Makefile.odin
@@ -82,7 +82,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.openmpi b/src/MAKE/Makefile.openmpi
index cf19059253..b167030e3f 100644
--- a/src/MAKE/Makefile.openmpi
+++ b/src/MAKE/Makefile.openmpi
@@ -83,7 +83,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.pgi b/src/MAKE/Makefile.pgi
index 1fd9d06a00..ccdfb3b684 100644
--- a/src/MAKE/Makefile.pgi
+++ b/src/MAKE/Makefile.pgi
@@ -82,7 +82,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.power5 b/src/MAKE/Makefile.power5
index 90fdaa7cff..97630af0e3 100644
--- a/src/MAKE/Makefile.power5
+++ b/src/MAKE/Makefile.power5
@@ -83,7 +83,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.qed b/src/MAKE/Makefile.qed
index 5727aafd2a..2d7ec293d3 100644
--- a/src/MAKE/Makefile.qed
+++ b/src/MAKE/Makefile.qed
@@ -82,7 +82,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.redsky b/src/MAKE/Makefile.redsky
index 718f767ceb..aa66dbeb81 100644
--- a/src/MAKE/Makefile.redsky
+++ b/src/MAKE/Makefile.redsky
@@ -111,7 +111,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.sdsc b/src/MAKE/Makefile.sdsc
index 25241b8533..d4e9fb975e 100644
--- a/src/MAKE/Makefile.sdsc
+++ b/src/MAKE/Makefile.sdsc
@@ -87,7 +87,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.seaborg b/src/MAKE/Makefile.seaborg
index 9f47b9f0ee..8aea5a88fa 100644
--- a/src/MAKE/Makefile.seaborg
+++ b/src/MAKE/Makefile.seaborg
@@ -83,7 +83,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.serial b/src/MAKE/Makefile.serial
index 96ddd3e17d..f02fb6849b 100755
--- a/src/MAKE/Makefile.serial
+++ b/src/MAKE/Makefile.serial
@@ -83,7 +83,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.serial_debug b/src/MAKE/Makefile.serial_debug
index 3457321e93..3f42e3c31d 100644
--- a/src/MAKE/Makefile.serial_debug
+++ b/src/MAKE/Makefile.serial_debug
@@ -82,7 +82,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.sgi b/src/MAKE/Makefile.sgi
index 8f6c829a88..e60848cb80 100644
--- a/src/MAKE/Makefile.sgi
+++ b/src/MAKE/Makefile.sgi
@@ -82,7 +82,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.solaris b/src/MAKE/Makefile.solaris
index 20c4c80aea..d97eb61b40 100644
--- a/src/MAKE/Makefile.solaris
+++ b/src/MAKE/Makefile.solaris
@@ -82,7 +82,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.spirit b/src/MAKE/Makefile.spirit
index 7d182c5120..7af8ad9d7e 100644
--- a/src/MAKE/Makefile.spirit
+++ b/src/MAKE/Makefile.spirit
@@ -90,7 +90,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.storm b/src/MAKE/Makefile.storm
index c04b3f2336..f43c674773 100644
--- a/src/MAKE/Makefile.storm
+++ b/src/MAKE/Makefile.storm
@@ -83,7 +83,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.tacc b/src/MAKE/Makefile.tacc
index 0c2ba7217e..62e2015895 100644
--- a/src/MAKE/Makefile.tacc
+++ b/src/MAKE/Makefile.tacc
@@ -85,7 +85,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.tbird b/src/MAKE/Makefile.tbird
index 4df0651496..8cd72d106c 100644
--- a/src/MAKE/Makefile.tbird
+++ b/src/MAKE/Makefile.tbird
@@ -101,7 +101,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.tesla b/src/MAKE/Makefile.tesla
index 5fb0c7cecb..a01bdc5e5c 100755
--- a/src/MAKE/Makefile.tesla
+++ b/src/MAKE/Makefile.tesla
@@ -82,7 +82,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.tunnison b/src/MAKE/Makefile.tunnison
index 6feabf33ba..f98730a27f 100644
--- a/src/MAKE/Makefile.tunnison
+++ b/src/MAKE/Makefile.tunnison
@@ -93,7 +93,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
 
diff --git a/src/MAKE/Makefile.xt3 b/src/MAKE/Makefile.xt3
index f9b53d9ab9..9a71b6edd3 100644
--- a/src/MAKE/Makefile.xt3
+++ b/src/MAKE/Makefile.xt3
@@ -84,7 +84,7 @@ user-awpmd_SYSPATH =
 
 include	Makefile.package
 
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) ${PKG_SYSINC)
+EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
 EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
 EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)