diff --git a/sys/arch/i386/bioscall.c b/sys/arch/i386/bioscall.c
index e3d3094..2c6d0a4 100644
--- a/sys/arch/i386/bioscall.c
+++ b/sys/arch/i386/bioscall.c
@@ -26,6 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/_null.h>
 #include <sys/tss.h>
 #include <ubixos/sched.h>
 #include <vmm/vmm.h>
diff --git a/sys/arch/i386/fork.c b/sys/arch/i386/fork.c
index 3e222f8..60f2b07 100644
--- a/sys/arch/i386/fork.c
+++ b/sys/arch/i386/fork.c
@@ -56,6 +56,9 @@
   /* Set PGRP */
   newProcess->pgrp = _current->pgrp;
 
+  /* Copy File Descriptor Table */
+  memcpy(newProcess->files, _current->files, sizeof(fileDescriptor_t *) * MAX_OFILES);
+
   /* Set Up Task State */
   newProcess->tss.eip = td->frame->tf_eip;
   newProcess->oInfo.vmStart = _current->oInfo.vmStart;
@@ -183,7 +186,7 @@
     sched_yield();
   /* Return Id of Proccess */
   kprintf("Returning! [%i]", _current->id);
-  
+
   return (newProcess->id);
 }
 
diff --git a/sys/arch/i386/i386_exec.c b/sys/arch/i386/i386_exec.c
index ae96533..5495d94 100644
--- a/sys/arch/i386/i386_exec.c
+++ b/sys/arch/i386/i386_exec.c
@@ -26,6 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/_null.h>
 #include <sys/types.h>
 #include <sys/elf.h>
 #include <sys/gdt.h>
@@ -881,7 +882,7 @@
   struct gdtDescriptor *taskLDT = 0x0;
 
   taskLDT = (struct gdtDescriptor *)(VMM_USER_LDT + sizeof(struct gdtDescriptor));
- 
+
   //data_addr = 0x0; //TEMP
 
   taskLDT->limitLow = (0xFFFFF & 0xFFFF);
diff --git a/sys/arch/i386/kpanic.c b/sys/arch/i386/kpanic.c
index 4b6ce22..b0824b4 100644
--- a/sys/arch/i386/kpanic.c
+++ b/sys/arch/i386/kpanic.c
@@ -26,6 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/_null.h>
 #include <ubixos/kpanic.h>
 #include <lib/kprintf.h>
 #include <isa/8259.h>
diff --git a/sys/arch/i386/sched.c b/sys/arch/i386/sched.c
index 069868d..ea043df 100644
--- a/sys/arch/i386/sched.c
+++ b/sys/arch/i386/sched.c
@@ -26,6 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/_null.h>
 #include <ubixos/sched.h>
 #include <ubixos/kpanic.h>
 #include <ubixos/spinlock.h>
diff --git a/sys/arch/i386/spinlock.c b/sys/arch/i386/spinlock.c
index db6653d..d713cb9 100644
--- a/sys/arch/i386/spinlock.c
+++ b/sys/arch/i386/spinlock.c
@@ -26,6 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/_null.h>
 #include <ubixos/spinlock.h>
 #include <ubixos/sched.h>
 #include <string.h>