diff --git a/NPLib/Makefile b/NPLib/Makefile
index 9f8f51ce312e4f58a50b7f9e357f44a75f6c91bb..a4dd0f88fcbcf92b67baad70464986185855b165 100644
--- a/NPLib/Makefile
+++ b/NPLib/Makefile
@@ -273,14 +273,17 @@ SHARELIB      =	CalibManager Vdetec InputOutputRoot InitCond	InterCoord \
 		AnnularS1Data	PlasticData	DummyDetectorData SSSDData \
 		Reaction	EnergyLoss
 
-FILLINCLIB	= fillinclib
+FILLINC		= fillinc
+FILLLIB		= filllib
 LIBLIST		= liblistfile
 
-all:         $(SHARELIB) $(FILLINCLIB) $(LIBLIST)
+all:	$(FILLINC) $(SHARELIB) $(FILLLIB) $(LIBLIST)
 #------------------------------------------------------------------------------
 ############### fillinclib ##############
-fillinclib:
+fillinc:
 		./scripts/fillincdir.sh
+
+filllib:
 		./scripts/filllibdir.sh
 ifeq ($(ARCH),macosx)
 		./scripts/filllibmacdir.sh
@@ -295,12 +298,10 @@ liblistfile:
 ## CalibrationManager ##
 CalibManager:
 		make -C ./CalibrationManager
-		cp ./CalibrationManager/*.h ./include
 
 ############### Detector ##############
 ## VDetector ##
 Vdetec:
-		cp ./VDetector/*.h ./include
 		make -C ./VDetector
 		
 ## MUST2 ##