diff --git a/OpenEXR/IlmImfTest/testMultiPartFileMixingBasic.cpp b/OpenEXR/IlmImfTest/testMultiPartFileMixingBasic.cpp
index 1ede4d2733..26c7bf4728 100644
--- a/OpenEXR/IlmImfTest/testMultiPartFileMixingBasic.cpp
+++ b/OpenEXR/IlmImfTest/testMultiPartFileMixingBasic.cpp
@@ -65,7 +65,7 @@
 #include <ImfDeepTiledInputPart.h>
 #include <ImfDeepScanLineInputPart.h>
 #include <ImfPartType.h>
-//#include <ImfMisc.h>
+#include <ImfMisc.h>
 #include <ImfSystemSpecific.h>
 
 namespace IMF = OPENEXR_IMF_NAMESPACE;
diff --git a/OpenEXR/exrmaketiled/makeTiled.cpp b/OpenEXR/exrmaketiled/makeTiled.cpp
index 575ca69761..fcf95db7cd 100644
--- a/OpenEXR/exrmaketiled/makeTiled.cpp
+++ b/OpenEXR/exrmaketiled/makeTiled.cpp
@@ -56,7 +56,7 @@
 #include "ImfStandardAttributes.h"
 #include "ImathFun.h"
 #include "Iex.h"
-//#include "ImfMisc.h"
+#include "ImfMisc.h"
 
 #include <map>
 #include <algorithm>
diff --git a/PyIlmBase/PyImath/PyImathStringTable.h b/PyIlmBase/PyImath/PyImathStringTable.h
index b67da68d4b..b5f0bc6f88 100644
--- a/PyIlmBase/PyImath/PyImathStringTable.h
+++ b/PyIlmBase/PyImath/PyImathStringTable.h
@@ -112,7 +112,7 @@ struct StringTableEntry
     T                s;
 };
 
-namespace PyImath {
+namespace {
 
 using boost::multi_index_container;
 using namespace boost::multi_index;