diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13b11112..296fd569 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
   set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
     "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
 endif()
-add_compile_options(-w)
+add_compile_options(-Wno-terminate)
 
 ###########################################################
 # Set CMAKE standards
diff --git a/config/RatpacConfig.cmake.in b/config/RatpacConfig.cmake.in
index 4a9ca622..6ca22a61 100644
--- a/config/RatpacConfig.cmake.in
+++ b/config/RatpacConfig.cmake.in
@@ -3,5 +3,6 @@ set(RATROOT @RATROOT@)
 set(RATSHARE @RATSHARE@)
 set(ROOT_INCLUDE_PATH @RATROOT@/include)
 set(Ratpac_LIBRARIES @RATROOT@/lib/libRATPAC.so)
+include_directories(SYSTEM @RATROOT@/include/stlplus)
 include_directories(@RATROOT@/include)
 link_directories(@RATROOT@/lib)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2f58d5d6..e009f844 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -56,9 +56,22 @@ add_library(RATEvent SHARED
        stlplus/src/stringio.cc
        stlplus/src/textio.cc
        util/src/ReadFile.cc)
+target_include_directories(RATEvent SYSTEM PUBLIC ${ROOT_INCLUDE_DIRS}/stlplus)
 target_include_directories(RATEvent PUBLIC ${RATPAC_INCLUDE_DIR})
 target_link_libraries(RATEvent PUBLIC 
        ${Geant4_LIBRARIES} ${ROOT_LIBRARIES} RATDict)
+set_source_files_properties(
+       stlplus/src/debug.cc
+       stlplus/src/dprintf.cc
+       stlplus/src/exceptions.cc
+       stlplus/src/file_system.cc
+       stlplus/src/fileio.cc
+       stlplus/src/multiio.cc
+       stlplus/src/string_utilities.cc
+       stlplus/src/stringio.cc
+       stlplus/src/textio.cc
+       PROPERTIES COMPILE_FLAGS -w
+)
 
 # This copies the root dict files to <build>/lib
 add_custom_command(TARGET RATEvent POST_BUILD
diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt
index eac217d7..6ad58721 100644
--- a/src/cmd/CMakeLists.txt
+++ b/src/cmd/CMakeLists.txt
@@ -20,6 +20,8 @@ add_library(cmd OBJECT
         src/TrackingMessenger.cc)
 
 # Set our include directories
+target_include_directories(cmd SYSTEM PUBLIC 
+        $<BUILD_INTERFACE:${RATPAC_INCLUDE_DIR}/stlplus>)
 target_include_directories(cmd PUBLIC
         $<BUILD_INTERFACE:${RATPAC_INCLUDE_DIR}>
         $<INSTALL_INTERFACE:include>)
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 1e8759e1..69ce6ea2 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -25,6 +25,8 @@ add_library(core OBJECT
         src/GLG4HitPMTCollection.cc)
 
 # Set our include directories
+target_include_directories(core SYSTEM PUBLIC 
+        $<BUILD_INTERFACE:${RATPAC_INCLUDE_DIR}/stlplus>)
 target_include_directories(core PUBLIC
         $<BUILD_INTERFACE:${RATPAC_INCLUDE_DIR}>
         $<INSTALL_INTERFACE:include>)
diff --git a/src/core/src/Log.cc b/src/core/src/Log.cc
index 41616c29..a6e9839f 100644
--- a/src/core/src/Log.cc
+++ b/src/core/src/Log.cc
@@ -1,6 +1,6 @@
 #include <RAT/Log.hh>
-#include <RAT/fileio.hpp>
 #include <cstdlib>
+#include <fileio.hpp>
 #include <fstream>
 #include <iostream>
 
diff --git a/src/core/src/PruneProc.cc b/src/core/src/PruneProc.cc
index b4232782..df71bb31 100644
--- a/src/core/src/PruneProc.cc
+++ b/src/core/src/PruneProc.cc
@@ -1,7 +1,7 @@
 #include <RAT/Log.hh>
 #include <RAT/PruneProc.hh>
-#include <RAT/string_utilities.hpp>
 #include <algorithm>
+#include <string_utilities.hpp>
 #include <vector>
 
 namespace RAT {
diff --git a/src/daq/CMakeLists.txt b/src/daq/CMakeLists.txt
index 7adc8c5c..2df9753e 100644
--- a/src/daq/CMakeLists.txt
+++ b/src/daq/CMakeLists.txt
@@ -20,6 +20,8 @@ add_library(daq OBJECT
   )
 
 # Set our include directories
+target_include_directories(daq SYSTEM PUBLIC 
+        $<BUILD_INTERFACE:${RATPAC_INCLUDE_DIR}/stlplus>)
 target_include_directories(daq PUBLIC
         $<BUILD_INTERFACE:${RATPAC_INCLUDE_DIR}>
         $<INSTALL_INTERFACE:include>)
diff --git a/src/daq/include/RAT/NoiseProc.hh b/src/daq/include/RAT/NoiseProc.hh
index a2bcaa07..64fb19c3 100644
--- a/src/daq/include/RAT/NoiseProc.hh
+++ b/src/daq/include/RAT/NoiseProc.hh
@@ -29,8 +29,8 @@ class NoiseProc : public Processor {
   double fLookback;
   double fLookforward;
   double fMaxTime;
-  bool fNearHits;
-  bool fNoiseFlag;
+  int fNearHits;
+  int fNoiseFlag;
   std::vector<RAT::PMTTime *> fPMTTime;
   std::vector<RAT::PMTCharge *> fPMTCharge;
   std::map<std::string, double> fModelNoiseMap;
diff --git a/src/daq/src/NoiseProc.cc b/src/daq/src/NoiseProc.cc
index 12e8e398..95306f8f 100644
--- a/src/daq/src/NoiseProc.cc
+++ b/src/daq/src/NoiseProc.cc
@@ -16,7 +16,7 @@ NoiseProc::NoiseProc() : Processor("noise") {}
 void NoiseProc::BeginOfRun(DS::Run *run) {
   DBLinkPtr lnoise = DB::Get()->GetLink("NOISEPROC");
 
-  fNoiseFlag = lnoise->GetD("noise_flag");
+  fNoiseFlag = lnoise->GetI("noise_flag");
   fDefaultNoiseRate = lnoise->GetD("default_noise_rate");
   fLookback = lnoise->GetD("noise_lookback");
   fLookforward = lnoise->GetD("noise_lookforward");
diff --git a/src/db/CMakeLists.txt b/src/db/CMakeLists.txt
index 2b1f8090..b7032e5f 100644
--- a/src/db/CMakeLists.txt
+++ b/src/db/CMakeLists.txt
@@ -11,6 +11,8 @@ add_library(db OBJECT
         src/DBTable.cc)
 
 # Set our include directories
+target_include_directories(db SYSTEM PUBLIC 
+        $<BUILD_INTERFACE:${RATPAC_INCLUDE_DIR}/stlplus>)
 target_include_directories(db PUBLIC
         $<BUILD_INTERFACE:${RATPAC_INCLUDE_DIR}>
         $<INSTALL_INTERFACE:include>)
diff --git a/src/db/include/RAT/DB.hh b/src/db/include/RAT/DB.hh
index 5af56654..a51f2fd0 100644
--- a/src/db/include/RAT/DB.hh
+++ b/src/db/include/RAT/DB.hh
@@ -86,11 +86,11 @@ double rindex = lmedia->GetD("index_of_refraction");
 #include <RAT/DBTable.hh>
 #include <RAT/HTTPDownloader.hh>
 #include <RAT/Log.hh>
-#include <RAT/smart_ptr.hpp>
 #include <deque>
 #include <list>
 #include <map>
 #include <set>
+#include <smart_ptr.hpp>
 #include <string>
 
 namespace RAT {
diff --git a/src/db/include/RAT/DBTable.hh b/src/db/include/RAT/DBTable.hh
index 1db99fe3..7ca54a08 100644
--- a/src/db/include/RAT/DBTable.hh
+++ b/src/db/include/RAT/DBTable.hh
@@ -12,8 +12,8 @@
 
 #include <RAT/DBFieldCallback.hh>
 #include <RAT/HashFunc.hh>
-#include <RAT/hash.hpp>
 #include <RAT/json.hh>
+#include <hash.hpp>
 #include <string>
 #include <vector>
 
diff --git a/src/ds/CMakeLists.txt b/src/ds/CMakeLists.txt
index fba8f445..b4e2f254 100644
--- a/src/ds/CMakeLists.txt
+++ b/src/ds/CMakeLists.txt
@@ -6,6 +6,8 @@ add_library(ds OBJECT
         src/MCPMT.cc
         src/RunStore.cc)
 # Set our include directories
+target_include_directories(ds SYSTEM PUBLIC 
+        $<BUILD_INTERFACE:${RATPAC_INCLUDE_DIR}/stlplus>)
 target_include_directories(ds PUBLIC
         $<BUILD_INTERFACE:${RATPAC_INCLUDE_DIR}>
         $<INSTALL_INTERFACE:include>)
@@ -55,6 +57,8 @@ root_generate_dictionary(G__RATDict
         DEPENDENCIES core ds db io)
 
 add_library(RATDict OBJECT G__RATDict.cxx)
+target_include_directories(RATDict SYSTEM PUBLIC 
+        $<BUILD_INTERFACE:${RATPAC_INCLUDE_DIR}/stlplus>)
 target_include_directories(RATDict PUBLIC
         $<BUILD_INTERFACE:${RATPAC_INCLUDE_DIR}>
         $<INSTALL_INTERFACE:include>)
diff --git a/src/fit/CMakeLists.txt b/src/fit/CMakeLists.txt
index c57f2c5e..01857c4b 100644
--- a/src/fit/CMakeLists.txt
+++ b/src/fit/CMakeLists.txt
@@ -10,6 +10,8 @@ add_library(fit OBJECT
 
 
 # Set our include directories
+target_include_directories(fit SYSTEM PUBLIC 
+        $<BUILD_INTERFACE:${RATPAC_INCLUDE_DIR}/stlplus>)
 target_include_directories(fit PUBLIC
   $<BUILD_INTERFACE:${RATPAC_INCLUDE_DIR}>
   $<INSTALL_INTERFACE:include>)
diff --git a/src/gen/CMakeLists.txt b/src/gen/CMakeLists.txt
index 22793002..e31c63f5 100644
--- a/src/gen/CMakeLists.txt
+++ b/src/gen/CMakeLists.txt
@@ -56,6 +56,8 @@ endif()
 add_library(gen OBJECT ${gen_sources})
 
 # Set our include directories
+target_include_directories(gen SYSTEM PUBLIC 
+        $<BUILD_INTERFACE:${RATPAC_INCLUDE_DIR}/stlplus>)
 target_include_directories(gen PUBLIC
         $<BUILD_INTERFACE:${RATPAC_INCLUDE_DIR}>
         $<INSTALL_INTERFACE:include>)
diff --git a/src/gen/src/BetaFunction.cc b/src/gen/src/BetaFunction.cc
index e88597da..386e1681 100644
--- a/src/gen/src/BetaFunction.cc
+++ b/src/gen/src/BetaFunction.cc
@@ -400,8 +400,11 @@ bool BetaFunction::ReadInputFile(const std::string dName, int iZ, int iA, int iT
     iRead = (fscanf(inputFile, "%s", dummy) > 0);
     std::string iString(dummy);
     if (iString == dProbe) {
-      fscanf(inputFile, "%s", tName);
-      fscanf(inputFile, "%d %d %f", &Z, &A, &tau);
+      bool readParseSuccess = fscanf(inputFile, "%s", tName) == 1;
+      readParseSuccess &= fscanf(inputFile, "%d %d %lf", &Z, &A, &tau) == 3;
+      if (!readParseSuccess) {
+        ThrowParsingException(inputFileName, dName);
+      }
       std::string iString2(tName);
       iFound = (dName == iString2);
       iFound = ((iFound) || ((iA == A) && (iZ == Z)));
@@ -414,17 +417,17 @@ bool BetaFunction::ReadInputFile(const std::string dName, int iZ, int iA, int iT
 
         bool iScan = true;
         while (iScan) {
-          bool parseSuccess = fscanf(inputFile, "%f %d %f %d", &iBr, &iSpin, &W0, &nP) == 4;
+          bool scanParseSuccess = fscanf(inputFile, "%lf %d %lf %d", &iBr, &iSpin, &W0, &nP) == 4;
           SetBranches((double)iBr, iSpin, (double)W0);
           for (int j = 0; j < nReadGamma; j++) {
-            parseSuccess &= fscanf(inputFile, "%f", &eP[j]) == 1;
+            scanParseSuccess &= fscanf(inputFile, "%lf", &eP[j]) == 1;
             if (eP[j] > 0.) SetGammas((double)eP[j]);
           }
-          parseSuccess &= fscanf(inputFile, "%f %f %f", &aC[0], &aC[1], &aC[2]) == 3;
+          scanParseSuccess &= fscanf(inputFile, "%lf %lf %lf", &aC[0], &aC[1], &aC[2]) == 3;
           if (iBr >= 1.) {
             iScan = false;
           }
-          if (!parseSuccess) {
+          if (!scanParseSuccess) {
             ThrowParsingException(inputFileName, dName);
           }
         }
diff --git a/src/gen/src/DecayChain.cc b/src/gen/src/DecayChain.cc
index 89efafa1..99b0f4dd 100644
--- a/src/gen/src/DecayChain.cc
+++ b/src/gen/src/DecayChain.cc
@@ -1,5 +1,7 @@
 #include <CLHEP/Vector/LorentzVector.h>
 
+#include <G4Exception.hh>
+#include <G4ExceptionSeverity.hh>
 #include <RAT/DecayChain.hh>
 #include <RAT/FermiFunction.hh>
 #include <RAT/Log.hh>
@@ -185,18 +187,27 @@ bool DecayChain::ReadInputFile(const std::string dName) {
     std::string iString(dummy);
 
     if (iString == dProbe) {
-      fscanf(inputFile, "%s", tName);
+      bool parseSuccess = fscanf(inputFile, "%s", tName) == 1;
+      if (!parseSuccess) {
+        G4Exception("DecayChain::ReadInputFile", "InvalidInput", FatalException, "Error reading input file");
+      }
       std::string iString2(tName);
       if (dName == iString2) {
         if (!fAlphaDecayStart) {
           iFound = true;
         }
-        fscanf(inputFile, "%d", &eP);
+        parseSuccess = fscanf(inputFile, "%d", &eP) == 1;
+        if (!parseSuccess) {
+          G4Exception("DecayChain::ReadInputFile", "InvalidInput", FatalException, "Error reading input file");
+        }
         if (isVerbose) {
           printf("Reading %s \n \n", tName);
         }
         for (int j = 0; j < eP; j++) {
-          fscanf(inputFile, "%s %d %f %d %f", sName, &iChain, &weight, &iDecay, &tau);
+          parseSuccess &= fscanf(inputFile, "%s %d %lf %d %lf", sName, &iChain, &weight, &iDecay, &tau) == 5;
+          if (!parseSuccess) {
+            G4Exception("DecayChain::ReadInputFile", "InvalidInput", FatalException, "Error reading input file");
+          }
           std::string iString3(sName);
           if (iDecay != NullParticle && !fAlphaDecayStart) {
             AddElement(iString3, iChain, iDecay, (double)tau, (double)weight);
diff --git a/src/geo/CMakeLists.txt b/src/geo/CMakeLists.txt
index b8409146..a5b96c3a 100644
--- a/src/geo/CMakeLists.txt
+++ b/src/geo/CMakeLists.txt
@@ -60,6 +60,8 @@ add_library(geo OBJECT
         )
 
 # Set our include directories
+target_include_directories(geo SYSTEM PUBLIC 
+        $<BUILD_INTERFACE:${RATPAC_INCLUDE_DIR}/stlplus>)
 target_include_directories(geo PUBLIC
         $<BUILD_INTERFACE:${RATPAC_INCLUDE_DIR}>
         $<INSTALL_INTERFACE:include>)
diff --git a/src/io/CMakeLists.txt b/src/io/CMakeLists.txt
index 6d0b0e12..6af5f06f 100644
--- a/src/io/CMakeLists.txt
+++ b/src/io/CMakeLists.txt
@@ -13,6 +13,8 @@ add_library(io OBJECT
         src/TrackNav.cc)
 
 # Set our include directories
+target_include_directories(io SYSTEM PUBLIC 
+        $<BUILD_INTERFACE:${RATPAC_INCLUDE_DIR}/stlplus>)
 target_include_directories(io PUBLIC
         $<BUILD_INTERFACE:${RATPAC_INCLUDE_DIR}>
         $<INSTALL_INTERFACE:include>)
diff --git a/src/io/src/OutNetProc.cc b/src/io/src/OutNetProc.cc
index 321e1439..feb09987 100644
--- a/src/io/src/OutNetProc.cc
+++ b/src/io/src/OutNetProc.cc
@@ -3,7 +3,7 @@
 #include <RAT/Config.hh>
 #include <RAT/Log.hh>
 #include <RAT/OutNetProc.hh>
-#include <RAT/string_utilities.hpp>
+#include <string_utilities.hpp>
 #include <vector>
 
 namespace RAT {
diff --git a/src/io/src/TrackCursor.cc b/src/io/src/TrackCursor.cc
index 1d8b09a4..e87979c6 100644
--- a/src/io/src/TrackCursor.cc
+++ b/src/io/src/TrackCursor.cc
@@ -3,9 +3,9 @@
 #include <RAT/Log.hh>
 #include <RAT/TrackCursor.hh>
 #include <RAT/TrackNode.hh>
-#include <RAT/dprintf.hpp>
-#include <RAT/string_utilities.hpp>
+#include <dprintf.hpp>
 #include <iostream>
+#include <string_utilities.hpp>
 
 namespace RAT {
 
diff --git a/src/physics/CMakeLists.txt b/src/physics/CMakeLists.txt
index 68edfdbc..bb07eab8 100644
--- a/src/physics/CMakeLists.txt
+++ b/src/physics/CMakeLists.txt
@@ -23,6 +23,8 @@ add_library(physics OBJECT
         )
 
 # Set our include directories
+target_include_directories(physics SYSTEM PUBLIC 
+        $<BUILD_INTERFACE:${RATPAC_INCLUDE_DIR}/stlplus>)
 target_include_directories(physics PUBLIC
         $<BUILD_INTERFACE:${RATPAC_INCLUDE_DIR}>
         $<INSTALL_INTERFACE:include>)
diff --git a/src/physics/src/GLG4Scint.cc b/src/physics/src/GLG4Scint.cc
index 666a8790..d40067eb 100644
--- a/src/physics/src/GLG4Scint.cc
+++ b/src/physics/src/GLG4Scint.cc
@@ -28,7 +28,7 @@
 #include <RAT/NaiveQuenchingCalculator.hh>
 #include <RAT/PhotonThinning.hh>
 #include <RAT/TrackInfo.hh>
-#include <RAT/fileio.hpp>
+#include <fileio.hpp>
 
 #include "G4Timer.hh"
 #include "G4TrackFastVector.hh"  // for G4TrackFastVectorSize
diff --git a/src/ratbase/CMakeLists.txt b/src/ratbase/CMakeLists.txt
index 80c10441..4cd27a79 100644
--- a/src/ratbase/CMakeLists.txt
+++ b/src/ratbase/CMakeLists.txt
@@ -6,6 +6,8 @@ add_library(ratbase OBJECT
   src/AnyParse.cc)
 
 # Set our include directories
+target_include_directories(ratbase SYSTEM PUBLIC 
+        $<BUILD_INTERFACE:${RATPAC_INCLUDE_DIR}/stlplus>)
 target_include_directories(ratbase PUBLIC
         $<BUILD_INTERFACE:${RATPAC_INCLUDE_DIR}>
         $<INSTALL_INTERFACE:include>)
diff --git a/src/stlplus/CMakeLists.txt b/src/stlplus/CMakeLists.txt
index c20deb35..217d1b3e 100644
--- a/src/stlplus/CMakeLists.txt
+++ b/src/stlplus/CMakeLists.txt
@@ -14,7 +14,10 @@ add_library(stlplus OBJECT
         src/stringio.cc
         src/textio.cc)
 
+target_compile_options(stlplus PUBLIC -w)
 # Set our include directories
+target_include_directories(stlplus SYSTEM PUBLIC 
+        $<BUILD_INTERFACE:${RATPAC_INCLUDE_DIR}/stlplus>)
 target_include_directories(stlplus PUBLIC
         $<BUILD_INTERFACE:${RATPAC_INCLUDE_DIR}>
         $<INSTALL_INTERFACE:include>)
diff --git a/src/stlplus/include/RAT/clonable.hpp b/src/stlplus/include/stlplus/clonable.hpp
similarity index 100%
rename from src/stlplus/include/RAT/clonable.hpp
rename to src/stlplus/include/stlplus/clonable.hpp
diff --git a/src/stlplus/include/RAT/debug.hpp b/src/stlplus/include/stlplus/debug.hpp
similarity index 100%
rename from src/stlplus/include/RAT/debug.hpp
rename to src/stlplus/include/stlplus/debug.hpp
diff --git a/src/stlplus/include/RAT/dprintf.hpp b/src/stlplus/include/stlplus/dprintf.hpp
similarity index 100%
rename from src/stlplus/include/RAT/dprintf.hpp
rename to src/stlplus/include/stlplus/dprintf.hpp
diff --git a/src/stlplus/include/RAT/exceptions.hpp b/src/stlplus/include/stlplus/exceptions.hpp
similarity index 100%
rename from src/stlplus/include/RAT/exceptions.hpp
rename to src/stlplus/include/stlplus/exceptions.hpp
diff --git a/src/stlplus/include/RAT/file_system.hpp b/src/stlplus/include/stlplus/file_system.hpp
similarity index 100%
rename from src/stlplus/include/RAT/file_system.hpp
rename to src/stlplus/include/stlplus/file_system.hpp
diff --git a/src/stlplus/include/RAT/fileio.hpp b/src/stlplus/include/stlplus/fileio.hpp
similarity index 100%
rename from src/stlplus/include/RAT/fileio.hpp
rename to src/stlplus/include/stlplus/fileio.hpp
diff --git a/src/stlplus/include/RAT/format_types.hpp b/src/stlplus/include/stlplus/format_types.hpp
similarity index 100%
rename from src/stlplus/include/RAT/format_types.hpp
rename to src/stlplus/include/stlplus/format_types.hpp
diff --git a/src/stlplus/include/RAT/hash.hpp b/src/stlplus/include/stlplus/hash.hpp
similarity index 99%
rename from src/stlplus/include/RAT/hash.hpp
rename to src/stlplus/include/stlplus/hash.hpp
index 75c2fc70..54e063f7 100644
--- a/src/stlplus/include/RAT/hash.hpp
+++ b/src/stlplus/include/stlplus/hash.hpp
@@ -99,8 +99,8 @@ class hash_iterator {
   hash_element<K, T>* m_element;
 
   void check_owner(const hash<K, T, H, E>* owner) const throw();
-  void check_non_null(void) const throw();
-  void check_non_end(void) const throw();
+  void check_non_null(void) const;
+  void check_non_end(void) const;
   void check_valid(void) const throw();
   void check(const hash<K, T, H, E>* owner) const throw();
 
diff --git a/src/stlplus/include/RAT/hash.tpp b/src/stlplus/include/stlplus/hash.tpp
similarity index 99%
rename from src/stlplus/include/RAT/hash.tpp
rename to src/stlplus/include/stlplus/hash.tpp
index 242608a9..c3a1ee82 100644
--- a/src/stlplus/include/RAT/hash.tpp
+++ b/src/stlplus/include/stlplus/hash.tpp
@@ -41,7 +41,6 @@ void hash_iterator<K,T,H,E,V>::check_owner(const hash<K,T,H,E>* _owner) const
 
 template<typename K, typename T, class H, class E, typename V>
 void hash_iterator<K,T,H,E,V>::check_non_null(void) const
-  throw()
 {
   if (null())
     throw null_dereference("hash iterator");
@@ -49,7 +48,6 @@ void hash_iterator<K,T,H,E,V>::check_non_null(void) const
 
 template<typename K, typename T, class H, class E, typename V>
 void hash_iterator<K,T,H,E,V>::check_non_end(void) const
-  throw()
 {
   if (end())
     throw end_dereference("hash iterator");
diff --git a/src/stlplus/include/RAT/multiio.hpp b/src/stlplus/include/stlplus/multiio.hpp
similarity index 100%
rename from src/stlplus/include/RAT/multiio.hpp
rename to src/stlplus/include/stlplus/multiio.hpp
diff --git a/src/stlplus/include/RAT/os_fixes.hpp b/src/stlplus/include/stlplus/os_fixes.hpp
similarity index 100%
rename from src/stlplus/include/RAT/os_fixes.hpp
rename to src/stlplus/include/stlplus/os_fixes.hpp
diff --git a/src/stlplus/include/RAT/persistent.hpp b/src/stlplus/include/stlplus/persistent.hpp
similarity index 100%
rename from src/stlplus/include/RAT/persistent.hpp
rename to src/stlplus/include/stlplus/persistent.hpp
diff --git a/src/stlplus/include/RAT/persistent.tpp b/src/stlplus/include/stlplus/persistent.tpp
similarity index 100%
rename from src/stlplus/include/RAT/persistent.tpp
rename to src/stlplus/include/stlplus/persistent.tpp
diff --git a/src/stlplus/include/RAT/smart_ptr.hpp b/src/stlplus/include/stlplus/smart_ptr.hpp
similarity index 100%
rename from src/stlplus/include/RAT/smart_ptr.hpp
rename to src/stlplus/include/stlplus/smart_ptr.hpp
diff --git a/src/stlplus/include/RAT/smart_ptr.tpp b/src/stlplus/include/stlplus/smart_ptr.tpp
similarity index 100%
rename from src/stlplus/include/RAT/smart_ptr.tpp
rename to src/stlplus/include/stlplus/smart_ptr.tpp
diff --git a/src/stlplus/include/RAT/string_utilities.hpp b/src/stlplus/include/stlplus/string_utilities.hpp
similarity index 100%
rename from src/stlplus/include/RAT/string_utilities.hpp
rename to src/stlplus/include/stlplus/string_utilities.hpp
diff --git a/src/stlplus/include/RAT/string_utilities.tpp b/src/stlplus/include/stlplus/string_utilities.tpp
similarity index 100%
rename from src/stlplus/include/RAT/string_utilities.tpp
rename to src/stlplus/include/stlplus/string_utilities.tpp
diff --git a/src/stlplus/include/RAT/stringio.hpp b/src/stlplus/include/stlplus/stringio.hpp
similarity index 100%
rename from src/stlplus/include/RAT/stringio.hpp
rename to src/stlplus/include/stlplus/stringio.hpp
diff --git a/src/stlplus/include/RAT/textio.hpp b/src/stlplus/include/stlplus/textio.hpp
similarity index 100%
rename from src/stlplus/include/RAT/textio.hpp
rename to src/stlplus/include/stlplus/textio.hpp
diff --git a/src/stlplus/src/debug.cc b/src/stlplus/src/debug.cc
index 3c312173..bbf29cfd 100644
--- a/src/stlplus/src/debug.cc
+++ b/src/stlplus/src/debug.cc
@@ -5,12 +5,12 @@
   License:   BSD License, see ../docs/license.html
 
   ------------------------------------------------------------------------------*/
-#include "RAT/debug.hpp"
+#include "debug.hpp"
 
 #include <stdlib.h>
 
-#include "RAT/file_system.hpp"
-#include "RAT/string_utilities.hpp"
+#include "file_system.hpp"
+#include "string_utilities.hpp"
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/stlplus/src/dprintf.cc b/src/stlplus/src/dprintf.cc
index 6d5d5aa2..5d120fa4 100644
--- a/src/stlplus/src/dprintf.cc
+++ b/src/stlplus/src/dprintf.cc
@@ -5,15 +5,15 @@
   License:   BSD License, see ../docs/license.html
 
   ------------------------------------------------------------------------------*/
-#include "RAT/dprintf.hpp"
+#include "dprintf.hpp"
 
 #include <ctype.h>
 #include <float.h>
 #include <limits.h>
 #include <stdio.h>
 
-#include "RAT/debug.hpp"
-#include "RAT/string_utilities.hpp"
+#include "debug.hpp"
+#include "string_utilities.hpp"
 
 /*--------------------------------------------------------------------------------
 
diff --git a/src/stlplus/src/exceptions.cc b/src/stlplus/src/exceptions.cc
index e4bf7db0..27bf0220 100644
--- a/src/stlplus/src/exceptions.cc
+++ b/src/stlplus/src/exceptions.cc
@@ -6,10 +6,10 @@
 
   ------------------------------------------------------------------------------*/
 
-#include "RAT/exceptions.hpp"
+#include "exceptions.hpp"
 
-#include "RAT/debug.hpp"
-#include "RAT/fileio.hpp"
+#include "debug.hpp"
+#include "fileio.hpp"
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/stlplus/src/file_system.cc b/src/stlplus/src/file_system.cc
index eeaed4ef..5dbc8503 100644
--- a/src/stlplus/src/file_system.cc
+++ b/src/stlplus/src/file_system.cc
@@ -16,7 +16,7 @@
   version
 
   ------------------------------------------------------------------------------*/
-#include "RAT/file_system.hpp"
+#include "file_system.hpp"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -24,10 +24,10 @@
 
 #include <algorithm>
 
-#include "RAT/debug.hpp"
-#include "RAT/fileio.hpp"
-#include "RAT/os_fixes.hpp"
-#include "RAT/string_utilities.hpp"
+#include "debug.hpp"
+#include "fileio.hpp"
+#include "os_fixes.hpp"
+#include "string_utilities.hpp"
 
 #ifdef _WIN32
 #include <direct.h>
diff --git a/src/stlplus/src/fileio.cc b/src/stlplus/src/fileio.cc
index 513b2e42..93d561af 100644
--- a/src/stlplus/src/fileio.cc
+++ b/src/stlplus/src/fileio.cc
@@ -5,12 +5,12 @@
   License:   BSD License, see ../docs/license.html
 
   ------------------------------------------------------------------------------*/
-#include "RAT/fileio.hpp"
+#include "fileio.hpp"
 
 #include <errno.h>
 
-#include "RAT/debug.hpp"
-#include "RAT/os_fixes.hpp"
+#include "debug.hpp"
+#include "os_fixes.hpp"
 ////////////////////////////////////////////////////////////////////////////////
 // Output
 
diff --git a/src/stlplus/src/multiio.cc b/src/stlplus/src/multiio.cc
index b168823a..f24022ef 100644
--- a/src/stlplus/src/multiio.cc
+++ b/src/stlplus/src/multiio.cc
@@ -5,11 +5,11 @@
   License:   BSD License, see ../docs/license.html
 
 ------------------------------------------------------------------------------*/
-#include "RAT/multiio.hpp"
+#include "multiio.hpp"
 
 #include <algorithm>
 
-#include "RAT/debug.hpp"
+#include "debug.hpp"
 
 ////////////////////////////////////////////////////////////////////////////////
 // Output
diff --git a/src/stlplus/src/os_fixes.cc b/src/stlplus/src/os_fixes.cc
index 013731b9..0799095b 100644
--- a/src/stlplus/src/os_fixes.cc
+++ b/src/stlplus/src/os_fixes.cc
@@ -5,10 +5,10 @@
   License:   BSD License, see ../docs/license.html
 
   ------------------------------------------------------------------------------*/
-#include "RAT/os_fixes.hpp"
+#include "os_fixes.hpp"
 
-#include "RAT/debug.hpp"
-#include "RAT/string_utilities.hpp"
+#include "debug.hpp"
+#include "string_utilities.hpp"
 
 #if defined(_MSC_VER)
 #include "windows.h"
diff --git a/src/stlplus/src/persistent.cc b/src/stlplus/src/persistent.cc
index 4d083086..6c983509 100644
--- a/src/stlplus/src/persistent.cc
+++ b/src/stlplus/src/persistent.cc
@@ -5,12 +5,12 @@
   License:   BSD License, see ../docs/license.html
 
   ------------------------------------------------------------------------------*/
-#include "RAT/persistent.hpp"
+#include "persistent.hpp"
 
-#include "RAT/os_fixes.hpp"
-#include "RAT/smart_ptr.hpp"
-#include "RAT/string_utilities.hpp"
-#include "RAT/textio.hpp"
+#include "os_fixes.hpp"
+#include "smart_ptr.hpp"
+#include "string_utilities.hpp"
+#include "textio.hpp"
 
 ////////////////////////////////////////////////////////////////////////////////
 // File format version
diff --git a/src/stlplus/src/string_utilities.cc b/src/stlplus/src/string_utilities.cc
index 1487c0c3..03b3b965 100644
--- a/src/stlplus/src/string_utilities.cc
+++ b/src/stlplus/src/string_utilities.cc
@@ -5,14 +5,14 @@
   License:   BSD License, see ../docs/license.html
 
 ------------------------------------------------------------------------------*/
-#include "RAT/string_utilities.hpp"
+#include "string_utilities.hpp"
 
 #include <ctype.h>
 #include <stdlib.h>
 
-#include "RAT/debug.hpp"
-#include "RAT/dprintf.hpp"
-#include "RAT/textio.hpp"
+#include "debug.hpp"
+#include "dprintf.hpp"
+#include "textio.hpp"
 
 ////////////////////////////////////////////////////////////////////////////////
 // character mappings
diff --git a/src/stlplus/src/stringio.cc b/src/stlplus/src/stringio.cc
index ecdc03cf..a77585e5 100644
--- a/src/stlplus/src/stringio.cc
+++ b/src/stlplus/src/stringio.cc
@@ -5,10 +5,10 @@
   License:   BSD License, see ../docs/license.html
 
   ------------------------------------------------------------------------------*/
-#include "RAT/stringio.hpp"
+#include "stringio.hpp"
 
-#include "RAT/debug.hpp"
-#include "RAT/os_fixes.hpp"
+#include "debug.hpp"
+#include "os_fixes.hpp"
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/stlplus/src/textio.cc b/src/stlplus/src/textio.cc
index 0ba361e2..7423c773 100644
--- a/src/stlplus/src/textio.cc
+++ b/src/stlplus/src/textio.cc
@@ -5,13 +5,13 @@
   License:   BSD License, see ../docs/license.html
 
   ------------------------------------------------------------------------------*/
-#include "RAT/textio.hpp"
+#include "textio.hpp"
 
 #include <ctype.h>
 
-#include "RAT/dprintf.hpp"
-#include "RAT/os_fixes.hpp"
-#include "RAT/string_utilities.hpp"
+#include "dprintf.hpp"
+#include "os_fixes.hpp"
+#include "string_utilities.hpp"
 
 ////////////////////////////////////////////////////////////////////////////////
 // error codes
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index d8804e72..10cbec80 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -17,6 +17,8 @@ add_library(util OBJECT
         src/quadrature/AdaptiveSimpsonQuadrature.cc 
         )
 # Set our include directories
+target_include_directories(util SYSTEM PUBLIC 
+        $<BUILD_INTERFACE:${RATPAC_INCLUDE_DIR}/stlplus>)
 target_include_directories(util PUBLIC
         $<BUILD_INTERFACE:${RATPAC_INCLUDE_DIR}>
         $<INSTALL_INTERFACE:include>)
diff --git a/src/util/include/RAT/GLG4StringUtil.hh b/src/util/include/RAT/GLG4StringUtil.hh
index 2a1901da..e7a73acc 100644
--- a/src/util/include/RAT/GLG4StringUtil.hh
+++ b/src/util/include/RAT/GLG4StringUtil.hh
@@ -13,7 +13,7 @@
 #include <string>
 #include <vector>
 
-#include "RAT/format_types.hpp"
+#include "format_types.hpp"
 
 ////////////////////////////////////////////////////////////////////////////////
 // Conversions of Integer types to string
diff --git a/src/util/include/RAT/LinearInterp.hh b/src/util/include/RAT/LinearInterp.hh
index 6a8d0f47..5cb7f894 100644
--- a/src/util/include/RAT/LinearInterp.hh
+++ b/src/util/include/RAT/LinearInterp.hh
@@ -42,7 +42,7 @@ class LinearInterp {
   std::vector<NumType> x, y;
 };
 
-#include "../LinearInterp.icc"
+#include "LinearInterp.icc"
 
 }  // namespace RAT
 
diff --git a/src/util/include/LinearInterp.icc b/src/util/include/RAT/LinearInterp.icc
similarity index 100%
rename from src/util/include/LinearInterp.icc
rename to src/util/include/RAT/LinearInterp.icc
diff --git a/src/util/src/MultiChargeDist.cc b/src/util/src/MultiChargeDist.cc
index b96a397b..09c8646c 100644
--- a/src/util/src/MultiChargeDist.cc
+++ b/src/util/src/MultiChargeDist.cc
@@ -7,8 +7,8 @@
 #include <RAT/MiniCleanPMTCharge.hh>
 #include <RAT/MultiChargeDist.hh>
 #include <RAT/PDFPMTCharge.hh>
-#include <RAT/string_utilities.hpp>
 #include <cassert>
+#include <string_utilities.hpp>
 
 namespace RAT {