diff --git a/examples/glEvalLimit/particles.cpp b/examples/glEvalLimit/particles.cpp
index 72676a6c..a07b9572 100644
--- a/examples/glEvalLimit/particles.cpp
+++ b/examples/glEvalLimit/particles.cpp
@@ -27,6 +27,8 @@
 #include <far/ptexIndices.h>
 #include <far/patchMap.h>
 
+#include <cmath>
+
 #ifdef OPENSUBDIV_HAS_TBB
 #include <tbb/parallel_for.h>
 #include <tbb/atomic.h>
diff --git a/opensubdiv/far/patchParam.h b/opensubdiv/far/patchParam.h
index 166e38e3..60ca2090 100644
--- a/opensubdiv/far/patchParam.h
+++ b/opensubdiv/far/patchParam.h
@@ -29,8 +29,6 @@
 
 #include "../far/types.h"
 
-#include <cassert>
-
 namespace OpenSubdiv {
 namespace OPENSUBDIV_VERSION {
 
diff --git a/opensubdiv/far/patchTable.h b/opensubdiv/far/patchTable.h
index eadef275..98dbd015 100644
--- a/opensubdiv/far/patchTable.h
+++ b/opensubdiv/far/patchTable.h
@@ -34,10 +34,7 @@
 #include "../sdc/options.h"
 
 #include <cstdlib>
-#include <cassert>
-#include <algorithm>
 #include <vector>
-#include <map>
 
 namespace OpenSubdiv {
 namespace OPENSUBDIV_VERSION {
diff --git a/opensubdiv/far/patchTableFactory.cpp b/opensubdiv/far/patchTableFactory.cpp
index 5f257719..af95041d 100644
--- a/opensubdiv/far/patchTableFactory.cpp
+++ b/opensubdiv/far/patchTableFactory.cpp
@@ -26,6 +26,7 @@
 #include "../far/ptexIndices.h"
 #include "../far/topologyRefiner.h"
 #include "../vtr/level.h"
+#include "../vtr/fvarLevel.h"
 #include "../vtr/refinement.h"
 #include "../far/endCapBSplineBasisPatchFactory.h"
 #include "../far/endCapGregoryBasisPatchFactory.h"
diff --git a/opensubdiv/far/topologyRefiner.cpp b/opensubdiv/far/topologyRefiner.cpp
index 5872a8c6..107b5b82 100644
--- a/opensubdiv/far/topologyRefiner.cpp
+++ b/opensubdiv/far/topologyRefiner.cpp
@@ -23,6 +23,7 @@
 //
 #include "../far/topologyRefiner.h"
 #include "../far/error.h"
+#include "../vtr/fvarLevel.h"
 #include "../vtr/sparseSelector.h"
 #include "../vtr/quadRefinement.h"
 #include "../vtr/triRefinement.h"
diff --git a/opensubdiv/far/topologyRefiner.h b/opensubdiv/far/topologyRefiner.h
index 9693dc14..20ce652d 100644
--- a/opensubdiv/far/topologyRefiner.h
+++ b/opensubdiv/far/topologyRefiner.h
@@ -28,24 +28,11 @@
 
 #include "../sdc/types.h"
 #include "../sdc/options.h"
-#include "../vtr/level.h"
-#include "../vtr/refinement.h"
 #include "../far/types.h"
-#include "../far/error.h"
 #include "../far/topologyLevel.h"
 
 #include <vector>
-#include <cassert>
-#include <cstdio>
 
-//  No longer necessary -- remove once we verify nothing implicitly relies on them:
-#include "../sdc/bilinearScheme.h"
-#include "../sdc/catmarkScheme.h"
-#include "../sdc/loopScheme.h"
-#include "../vtr/fvarLevel.h"
-#include "../vtr/fvarRefinement.h"
-#include "../vtr/stackBuffer.h"
-#include "../vtr/componentInterfaces.h"
 
 namespace OpenSubdiv {
 namespace OPENSUBDIV_VERSION {
diff --git a/opensubdiv/far/topologyRefinerFactory.cpp b/opensubdiv/far/topologyRefinerFactory.cpp
index cbeb19ca..3555aceb 100644
--- a/opensubdiv/far/topologyRefinerFactory.cpp
+++ b/opensubdiv/far/topologyRefinerFactory.cpp
@@ -25,6 +25,12 @@
 #include "../far/topologyRefiner.h"
 #include "../vtr/level.h"
 
+#include <cstdio>
+#ifdef _MSC_VER
+    #define snprintf _snprintf
+#endif
+
+
 namespace OpenSubdiv {
 namespace OPENSUBDIV_VERSION {
 
diff --git a/opensubdiv/far/topologyRefinerFactory.h b/opensubdiv/far/topologyRefinerFactory.h
index 539b9216..546dfb69 100644
--- a/opensubdiv/far/topologyRefinerFactory.h
+++ b/opensubdiv/far/topologyRefinerFactory.h
@@ -31,10 +31,6 @@
 
 #include <cassert>
 
-#ifdef _MSC_VER
-    #define snprintf _snprintf
-#endif
-
 namespace OpenSubdiv {
 namespace OPENSUBDIV_VERSION {
 
diff --git a/regression/common/far_utils.h b/regression/common/far_utils.h
index ff5d7c5f..4d8a5e36 100644
--- a/regression/common/far_utils.h
+++ b/regression/common/far_utils.h
@@ -29,6 +29,8 @@
 #include <far/primvarRefiner.h>
 #include <far/types.h>
 
+#include <cstdio>
+
 #include "shape_utils.h"
 
 //------------------------------------------------------------------------------
diff --git a/tutorials/far/tutorial_1/far_tutorial_1.cpp b/tutorials/far/tutorial_1/far_tutorial_1.cpp
index 7778509e..13c76c35 100644
--- a/tutorials/far/tutorial_1/far_tutorial_1.cpp
+++ b/tutorials/far/tutorial_1/far_tutorial_1.cpp
@@ -41,10 +41,11 @@
 // rebuilding them redundantly.
 //
 
-
 #include <opensubdiv/far/topologyRefinerFactory.h>
 #include <opensubdiv/far/primvarRefiner.h>
 
+#include <cstdio>
+
 //------------------------------------------------------------------------------
 
 using namespace OpenSubdiv;