diff --git a/src/EvtGenBase/EvtGenKine.cpp b/src/EvtGenBase/EvtGenKine.cpp
--- a/src/EvtGenBase/EvtGenKine.cpp
+++ b/src/EvtGenBase/EvtGenKine.cpp
@@ -21,14 +21,15 @@
 #include "EvtGenBase/EvtGenKine.hh"
 
 #include "EvtGenBase/EvtConst.hh"
+#include "EvtGenBase/EvtParticle.hh"
 #include "EvtGenBase/EvtPatches.hh"
 #include "EvtGenBase/EvtRandom.hh"
 #include "EvtGenBase/EvtReport.hh"
 #include "EvtGenBase/EvtVector4R.hh"
-#include "EvtGenBase/EvtParticle.hh"
 
+#include <cmath>
 #include <iostream>
-#include <math.h>
+
 using std::endl;
 
 double EvtPawt( double a, double b, double c )
diff --git a/src/EvtGenExternal/EvtExternalGenFactory.cpp b/src/EvtGenExternal/EvtExternalGenFactory.cpp
--- a/src/EvtGenExternal/EvtExternalGenFactory.cpp
+++ b/src/EvtGenExternal/EvtExternalGenFactory.cpp
@@ -65,13 +65,12 @@
     return theFactory;
 }
 
+// Only define the generator if we have the external ifdef variable set
+#ifdef EVTGEN_PYTHIA
 void EvtExternalGenFactory::definePythiaGenerator( std::string xmlDir,
                                                    bool convertPhysCodes,
                                                    bool useEvtGenRandom )
 {
-    // Only define the generator if we have the external ifdef variable set
-#ifdef EVTGEN_PYTHIA
-
     int genId = EvtExternalGenFactory::PythiaGenId;
 
     EvtGenReport( EVTGEN_INFO, "EvtGen" )
@@ -93,15 +92,17 @@
     EvtAbsExternalGen* pythiaGenerator =
         new EvtPythiaEngine( xmlDir, convertPhysCodes, useEvtGenRandom );
     _extGenMap[genId] = pythiaGenerator;
-
-#endif
 }
+#else
+void EvtExternalGenFactory::definePythiaGenerator( std::string, bool, bool )
+{
+}
+#endif
 
+#ifdef EVTGEN_PHOTOS
 void EvtExternalGenFactory::definePhotosGenerator( std::string photonType,
                                                    bool useEvtGenRandom )
 {
-#ifdef EVTGEN_PHOTOS
-
     int genId = EvtExternalGenFactory::PhotosGenId;
 
     EvtGenReport( EVTGEN_INFO, "EvtGen" )
@@ -110,23 +111,28 @@
     EvtAbsExternalGen* photosGenerator = new EvtPhotosEngine( photonType,
                                                               useEvtGenRandom );
     _extGenMap[genId] = photosGenerator;
-
-#endif
 }
+#else
+void EvtExternalGenFactory::definePhotosGenerator( std::string, bool )
+{
+}
+#endif
 
+#ifdef EVTGEN_TAUOLA
 void EvtExternalGenFactory::defineTauolaGenerator( bool useEvtGenRandom )
 {
-#ifdef EVTGEN_TAUOLA
-
     int genId = EvtExternalGenFactory::TauolaGenId;
 
     EvtGenReport( EVTGEN_INFO, "EvtGen" ) << "Defining EvtTauolaEngine." << endl;
 
     EvtAbsExternalGen* tauolaGenerator = new EvtTauolaEngine( useEvtGenRandom );
     _extGenMap[genId] = tauolaGenerator;
-
-#endif
 }
+#else
+void EvtExternalGenFactory::defineTauolaGenerator( bool )
+{
+}
+#endif
 
 EvtAbsExternalGen* EvtExternalGenFactory::getGenerator( int genId )
 {
diff --git a/src/EvtGenModels/EvtFlatSqDalitz.cpp b/src/EvtGenModels/EvtFlatSqDalitz.cpp
--- a/src/EvtGenModels/EvtFlatSqDalitz.cpp
+++ b/src/EvtGenModels/EvtFlatSqDalitz.cpp
@@ -28,11 +28,8 @@
 #include "EvtGenBase/EvtRandom.hh"
 #include "EvtGenBase/EvtReport.hh"
 
-#include <fstream>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
 #include <string>
-using std::fstream;
 
 EvtFlatSqDalitz::~EvtFlatSqDalitz()
 {