diff --git a/init/builtins.c b/init/builtins.c
index b4af700..8e5eed8 100644
--- a/init/builtins.c
+++ b/init/builtins.c
@@ -35,6 +35,7 @@
 #include "keywords.h"
 #include "property_service.h"
 #include "devices.h"
+#include "parser.h"
 
 #include <private/android_filesystem_config.h>
 
diff --git a/init/init.c b/init/init.c
index 4e1accf..b45fcc5 100755
--- a/init/init.c
+++ b/init/init.c
@@ -45,6 +45,7 @@
 #include "property_service.h"
 #include "bootchart.h"
 #include "keychords.h"
+#include "parser.h"
 
 static int property_triggers_enabled = 0;
 
diff --git a/init/init.h b/init/init.h
index f92a4d7..2d18b9e 100644
--- a/init/init.h
+++ b/init/init.h
@@ -168,14 +168,6 @@
 void service_start(struct service *svc, const char *dynamic_args);
 void property_changed(const char *name, const char *value);
 
-void drain_action_queue(void);
-struct action *action_remove_queue_head(void);
-void action_add_queue_tail(struct action *act);
-void action_for_each_trigger(const char *trigger,
-                             void (*func)(struct action *act));
-void queue_property_triggers(const char *name, const char *value);
-void queue_all_property_triggers();
-
 #define INIT_IMAGE_FILE	"/initlogo.rle"
 
 int load_565rle_image( char *file_name );
diff --git a/init/parser.c b/init/parser.c
index 7da0d19..9ea9274 100644
--- a/init/parser.c
+++ b/init/parser.c
@@ -9,6 +9,7 @@
 
 #include "init.h"
 #include "property_service.h"
+#include "parser.h"
 
 #include <cutils/iosched_policy.h>
 
diff --git a/init/parser.h b/init/parser.h
new file mode 100644
index 0000000..cec848d
--- /dev/null
+++ b/init/parser.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef PARSER_H_
+#define PARSER_H_
+
+struct action;
+
+void drain_action_queue(void);
+struct action *action_remove_queue_head(void);
+void action_add_queue_tail(struct action *act);
+void action_for_each_trigger(const char *trigger,
+                             void (*func)(struct action *act));
+int action_queue_empty(void);
+void queue_property_triggers(const char *name, const char *value);
+void queue_all_property_triggers();
+
+#endif /* PARSER_H_ */