diff --git a/db/managed_iterator.h b/db/managed_iterator.h
index 3a551dff9..00f56aea4 100644
--- a/db/managed_iterator.h
+++ b/db/managed_iterator.h
@@ -81,4 +81,4 @@ class ManagedIterator : public Iterator {
 };
 
 }  // namespace rocksdb
-#endif  // ROCKSDB_LITE
+#endif  // !ROCKSDB_LITE
diff --git a/util/options.cc b/util/options.cc
index ad5eecea3..2aa1d8b66 100644
--- a/util/options.cc
+++ b/util/options.cc
@@ -654,6 +654,8 @@ DBOptions* DBOptions::IncreaseParallelism(int total_threads) {
   return this;
 }
 
+#endif  // !ROCKSDB_LITE
+
 ReadOptions::ReadOptions()
     : verify_checksums(true),
       fill_cache(true),
@@ -680,6 +682,4 @@ ReadOptions::ReadOptions(bool cksum, bool cache)
              reinterpret_cast<ReadOptions*>(this));
 }
 
-#endif  // ROCKSDB_LITE
-
 }  // namespace rocksdb
diff --git a/util/xfunc.cc b/util/xfunc.cc
index aadc8974e..c5d6b5afd 100644
--- a/util/xfunc.cc
+++ b/util/xfunc.cc
@@ -3,13 +3,13 @@
 //  LICENSE file in the root directory of this source tree. An additional grant
 //  of patent rights can be found in the PATENTS file in the same directory.
 
+#ifdef XFUNC
 #include <string>
 #include "db/db_impl.h"
 #include "db/managed_iterator.h"
 #include "rocksdb/options.h"
 #include "util/xfunc.h"
 
-#ifdef XFUNC
 
 namespace rocksdb {
 
diff --git a/util/xfunc.h b/util/xfunc.h
index 87daa824a..78004cbe0 100644
--- a/util/xfunc.h
+++ b/util/xfunc.h
@@ -17,13 +17,15 @@ namespace rocksdb {
  *   with XFUNC only being set for debug builds.
  */
 #if defined(ROCKSDB_XFTEST_FORCE)
+#ifndef ROCKSDB_LITE
 #if (ROCKSDB_XFTEST_FORCE == 1)
 #define XFUNC
-#endif
+#endif  // ROCKSDB_XFTEST_FORCE == 1
 #elif defined(NDEBUG)
 #else
 #define XFUNC
-#endif
+#endif  // defined(ROCKSDB_XFTEST_FORCE)
+#endif  // !ROCKSDB_LITE
 
 #ifndef XFUNC
 #define XFUNC_TEST(condition, location, lfname, fname, ...)