-#ifndef HEADER_THREAD_H
-#define HEADER_THREAD_H 1
+#ifndef THREADS_THREAD_H
+#define THREADS_THREAD_H
+#include <debug.h>
+#include <list.h>
#include <stdint.h>
-#include "debug.h"
-#include "list.h"
#ifdef USERPROG
-#include "addrspace.h"
+#include "userprog/addrspace.h"
#endif
/* States in a thread's life cycle. */
void thread_yield (void);
void thread_block (void);
-#endif /* thread.h */
+#endif /* threads/thread.h */