Index: kernel/generic/include/smp/smp.h
===================================================================
--- kernel/generic/include/smp/smp.h	(revision d19b3fcc8f46d58029778b0ba79ad3d796f39697)
+++ kernel/generic/include/smp/smp.h	(revision e994898da769c2fefc731de899af8f1370cd52f4)
@@ -36,7 +36,7 @@
 #define KERN_SMP_H_
 
-#include <synch/waitq.h>
+#include <synch/semaphore.h>
 
-extern waitq_t ap_completion_wq;
+extern semaphore_t ap_completion_semaphore;
 
 #ifdef CONFIG_SMP