From f94853f294059efc49ee5a057833cf8bc2b6c5df Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Wed, 14 May 2014 16:51:09 -0700
Subject: [PATCH] Clean up some unnecessary system_properties cruft.

Bug: 14970171
Change-Id: I6f54c35e265b849be914120f795c9f8e0cec34bb
---
 init/builtins.c   | 1 -
 init/init.c       | 2 --
 toolbox/getprop.c | 3 ---
 3 files changed, 6 deletions(-)

diff --git a/init/builtins.c b/init/builtins.c
index d973a6b64..d9f7bbe71 100644
--- a/init/builtins.c
+++ b/init/builtins.c
@@ -33,7 +33,6 @@
 #include <linux/loop.h>
 #include <cutils/partition_utils.h>
 #include <cutils/android_reboot.h>
-#include <sys/system_properties.h>
 #include <fs_mgr.h>
 
 #include <selinux/selinux.h>
diff --git a/init/init.c b/init/init.c
index fc201982e..1538aa639 100644
--- a/init/init.c
+++ b/init/init.c
@@ -46,8 +46,6 @@
 #include <private/android_filesystem_config.h>
 #include <termios.h>
 
-#include <sys/system_properties.h>
-
 #include "devices.h"
 #include "init.h"
 #include "log.h"
diff --git a/toolbox/getprop.c b/toolbox/getprop.c
index c001fda72..7fd694d2f 100644
--- a/toolbox/getprop.c
+++ b/toolbox/getprop.c
@@ -3,7 +3,6 @@
 
 #include <cutils/properties.h>
 
-#include <sys/system_properties.h>
 #include "dynarray.h"
 
 static void record_prop(const char* key, const char* name, void* opaque)
@@ -31,8 +30,6 @@ static void list_properties(void)
     strlist_done(list);
 }
 
-int __system_property_wait(prop_info *pi);
-
 int getprop_main(int argc, char *argv[])
 {
     int n = 0;