diff --git a/daemon.cc b/daemon.cc
index 838c407..64f3775 100644
--- a/daemon.cc
+++ b/daemon.cc
@@ -25,9 +25,9 @@
 #include <binderwrapper/binder_wrapper.h>
 #endif  // USE_WEAVE || USE_BINDER
 
-#ifdef __BRILLO__
+#if defined(__BRILLO__) || defined(USE_DBUS)
 #include "update_engine/update_attempter.h"
-#endif  // __BRILLO__
+#endif  // __BRILLO__ || USE_DBUS
 
 #if USE_DBUS
 namespace {
@@ -67,7 +67,7 @@
   CHECK(bus->SetUpAsyncOperations());
 #endif // USE_DBUS
 
-#ifdef __BRILLO__
+#if defined(__BRILLO__) || defined(USE_DBUS)
   // Initialize update engine global state but continue if something fails.
   real_system_state_.reset(new RealSystemState(bus));
   LOG_IF(ERROR, !real_system_state_->Initialize())
diff --git a/daemon.h b/daemon.h
index 89137ed..5050f38 100644
--- a/daemon.h
+++ b/daemon.h
@@ -39,7 +39,7 @@
 #if USE_DBUS
 #include "update_engine/dbus_service.h"
 #endif  // USE_DBUS
-#ifdef __BRILLO__
+#if defined(__BRILLO__) || defined(USE_DBUS)
 #include "update_engine/real_system_state.h"
 #endif  // defined(__BRILLO__)
 
@@ -81,7 +81,7 @@
 #endif  // defined(__BRILLO__)
 #endif  // USE_BINDER
 
-#ifdef __BRILLO__
+#if defined(__BRILLO__) || defined(USE_DBUS)
   // The RealSystemState uses the previous classes so it should be defined last.
   std::unique_ptr<RealSystemState> real_system_state_;
 #else  // !defined(__BRILLO__)