diff --git a/kernel-src/include/kernel/file.h b/kernel-src/include/kernel/file.h
index 4e032e64..922ec13e 100644
--- a/kernel-src/include/kernel/file.h
+++ b/kernel-src/include/kernel/file.h
@@ -3,6 +3,7 @@
 
 #include <kernel/vfs.h>
 #include <mutex.h>
+#include <kernel/scheduler.h>
 
 typedef struct file_t {
 	vnode_t *vnode;
diff --git a/kernel-src/include/semaphore.h b/kernel-src/include/semaphore.h
index e55d32dc..681023e5 100644
--- a/kernel-src/include/semaphore.h
+++ b/kernel-src/include/semaphore.h
@@ -3,16 +3,15 @@
 
 #include <stdbool.h>
 #include <spinlock.h>
-#include <kernel/scheduler.h>
 
 #define SEM_TAIL 0
 #define SEM_HEAD 1
 
-typedef struct {
+typedef struct semaphore_t{
 	int i;
 	spinlock_t lock;
-	thread_t *tail;
-	thread_t *head;
+	struct thread_t *tail;
+	struct thread_t *head;
 } semaphore_t;
 
 #define SEMAPHORE_INIT(x, v) { \
@@ -26,4 +25,6 @@ int semaphore_wait(semaphore_t *sem, bool interruptible);
 void semaphore_signal(semaphore_t *sem);
 bool semaphore_test(semaphore_t *sem);
 
+#include <kernel/scheduler.h>
+
 #endif