diff --git a/init/builtins.cpp b/init/builtins.cpp
index e0a98f50a..7298dff4f 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -33,6 +33,7 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/syscall.h>
+#include <sys/system_properties.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/init/property_service.cpp b/init/property_service.cpp
index 985722312..2aa89ff96 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -24,6 +24,7 @@
 #include <limits.h>
 #include <netinet/in.h>
 #include <stdarg.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/init/property_service.h b/init/property_service.h
index 585cd0f22..9a5b6f69c 100644
--- a/init/property_service.h
+++ b/init/property_service.h
@@ -17,9 +17,7 @@
 #ifndef _INIT_PROPERTY_H
 #define _INIT_PROPERTY_H
 
-#include <stddef.h>
 #include <sys/socket.h>
-#include <sys/system_properties.h>
 
 #include <string>
 
diff --git a/init/service.cpp b/init/service.cpp
index 8cb8dc1ec..4adbbf0c0 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -24,6 +24,7 @@
 #include <sys/prctl.h>
 #include <sys/resource.h>
 #include <sys/stat.h>
+#include <sys/system_properties.h>
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <termios.h>