-#ifndef HEADER_ADDRSPACE_H
-#define HEADER_ADDRSPACE_H 1
+#ifndef USERPROG_ADDRSPACE_H
+#define USERPROG_ADDRSPACE_H
-#include <stdbool.h>
+#include "threads/thread.h"
-struct thread;
-bool addrspace_load (struct thread *, const char *, void (**start) (void));
+tid_t addrspace_execute (const char *filename);
void addrspace_destroy (struct thread *);
-void addrspace_activate (struct thread *);
+void addrspace_activate (void);
-#endif /* addrspace.h */
+#endif /* userprog/addrspace.h */