diff --git a/NPLib/GASPARD/TGaspardTrackerPhysics.cxx b/NPLib/GASPARD/TGaspardTrackerPhysics.cxx
index 69340326c2729b8bce3648219ee9ec5a21d2e900..921d309472482a8956561905ab4ae80bfdf59c60 100644
--- a/NPLib/GASPARD/TGaspardTrackerPhysics.cxx
+++ b/NPLib/GASPARD/TGaspardTrackerPhysics.cxx
@@ -23,6 +23,7 @@
 
 #include "TGaspardTrackerPhysics.h"
 #include <iostream>
+#include <cstdlib>
 
 
 ClassImp(TGaspardTrackerPhysics)
diff --git a/NPSimulation/src/DetectorConstruction.cc b/NPSimulation/src/DetectorConstruction.cc
index a09b3a79a8d1aa753634ca3f6ec0af70961bb97b..40f19eadb7511b1c660fe7e035f46dc7bad007da 100644
--- a/NPSimulation/src/DetectorConstruction.cc
+++ b/NPSimulation/src/DetectorConstruction.cc
@@ -288,7 +288,7 @@ void DetectorConstruction::ReadAllSensitive(const G4Event* event)
    if(m_Detectors.size()>0)
    m_Detectors[0]->GetInterCoordPointer()->Clear();
 
-   for (ushort i = 0 ; i < m_Detectors.size() ; i++) {
+   for (unsigned short i = 0 ; i < m_Detectors.size() ; i++) {
       m_Detectors[i]->ReadSensitive(event);
    }
 }
diff --git a/NPSimulation/src/Plastic.cc b/NPSimulation/src/Plastic.cc
index 1f95f4954904a6055597a8824e5b59dead0cba56..eaca6cdf4edfe662519be027e12f9400f3b9eb5f 100644
--- a/NPSimulation/src/Plastic.cc
+++ b/NPSimulation/src/Plastic.cc
@@ -241,7 +241,7 @@ void Plastic::ConstructDetector(G4LogicalVolume* world)
 {
    	G4ThreeVector Det_pos = G4ThreeVector(0, 0, 0)  ;
 	
-   for (ushort i = 0 ; i < m_R.size() ; i++) 
+   for (unsigned short i = 0 ; i < m_R.size() ; i++) 
    	{
          G4double wX = m_R[i] * sin(m_Theta[i] ) * cos(m_Phi[i] )   ;
          G4double wY = m_R[i] * sin(m_Theta[i] ) * sin(m_Phi[i] )   ;