diff --git a/liblog/Android.mk b/liblog/Android.mk
index 9353546dc..ea179fac5 100644
--- a/liblog/Android.mk
+++ b/liblog/Android.mk
@@ -40,7 +40,6 @@ endif
 
 ifndef WITH_MINGW
     liblog_sources += \
-        logprint.c \
         event_tag_map.c
 else
     liblog_sources += \
@@ -49,6 +48,9 @@ endif
 
 liblog_host_sources := $(liblog_sources) fake_log_device.c event.logtags
 liblog_target_sources := $(liblog_sources) log_time.cpp log_is_loggable.c
+ifndef WITH_MINGW
+liblog_target_sources += logprint.c
+endif
 ifneq ($(TARGET_USES_LOGD),false)
 liblog_target_sources += log_read.c
 else
diff --git a/liblog/logd_write.c b/liblog/logd_write.c
index c8a6162b7..cd0a2161b 100644
--- a/liblog/logd_write.c
+++ b/liblog/logd_write.c
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#if (FAKE_LOG_DEVICE == 0)
 #include <endian.h>
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #if !defined(_WIN32)