diff --git a/src/sys/Makefile.inc b/src/sys/Makefile.inc
index 1deafc3..3c7aede 100644
--- a/src/sys/Makefile.inc
+++ b/src/sys/Makefile.inc
@@ -1,6 +1,6 @@
 # $Id:
 # global 'sys' options
 
-INCLUDES = -I../include
+INCLUDES = -I../include -I./include
 CFLAGS = -Wall -nostdlib -nostdinc -fno-builtin -fno-exceptions -O
 KERNEL = ubix.elf
diff --git a/src/sys/include/ubixos/sched.h b/src/sys/include/ubixos/sched.h
index 5027a30..69427a1 100644
--- a/src/sys/include/ubixos/sched.h
+++ b/src/sys/include/ubixos/sched.h
@@ -30,12 +30,13 @@
 #ifndef _SCHED_H
 #define _SCHED_H
 
+#include <vmm/vmm.h>
+#include <vmm/paging.h>
 #include <ubixos/types.h>
 #include <ubixos/elf.h>
 #include <ubixos/tty.h>
 #include <vfs/file.h>
 #include <sys/tss.h>
-#include <vmm/vmm.h>
 
 typedef enum { PLACEHOLDER=-2,DEAD=-1,NEW=0,READY=1,RUNNING=2,IDLE=3,FORK=4,WAIT=5 } tState;
 
diff --git a/src/sys/include/vmm/paging.h b/src/sys/include/vmm/paging.h
index 96cf548..52f3415 100644
--- a/src/sys/include/vmm/paging.h
+++ b/src/sys/include/vmm/paging.h
@@ -31,6 +31,7 @@
 #define _PAGING_H
 
 #include <ubixos/sched.h>
+#include <ubixos/vmm.h>
 #include <ubixos/types.h>
 
 #define pageLength        0x00000400
@@ -49,8 +50,6 @@
 #define KERNEL_PAGE_DEFAULT (PAGE_PRESENT|PAGE_WRITE)
 
 int vmmClearVirtualPage(uInt32 pageAddr);
-void *vmmGetFreePage2(kTask_t *task);
-
 void vmmUnmapPage(uInt32,int);
 void vmmUnmapPages(void *,uInt32);
 void *vmmMapFromTask(pidType,void *,uInt32);
@@ -68,12 +67,17 @@
 void   vmm_pageFault(uInt32,uInt32,uInt32);
 void  _vmm_pageFault();
 
+void * vmmGetFreePage2(kTask_t);
 extern uInt32 *kernelPageDirectory;
 
 #endif
 
 /***
  $Log$
+ Revision 1.10  2005/08/10 04:14:04  fsdfs
+ reworking memory management and WTF is with all the errors in the headers
+ it won't let me add anything!?
+
  Revision 1.9  2005/08/08 21:33:44  fsdfs
  new scheduler!
 
diff --git a/src/sys/include/vmm/vmm.h b/src/sys/include/vmm/vmm.h
index ac29f5b..bc3d74c 100644
--- a/src/sys/include/vmm/vmm.h
+++ b/src/sys/include/vmm/vmm.h
@@ -40,7 +40,6 @@
 #define vmmMemoryMapAddr 0xE6667000
 
 typedef struct _mMap mMap;
-
 struct _mMap
 {
 	uInt32	pageAddr;
@@ -74,6 +73,10 @@
 
 /***
  $Log$
+ Revision 1.7  2005/08/10 04:14:04  fsdfs
+ reworking memory management and WTF is with all the errors in the headers
+ it won't let me add anything!?
+
  Revision 1.6  2004/07/21 17:39:04  reddawg
  removed device
 
diff --git a/src/sys/vmm/getfreepage.c b/src/sys/vmm/getfreepage.c
index 05ca224..4ff366e 100644
--- a/src/sys/vmm/getfreepage.c
+++ b/src/sys/vmm/getfreepage.c
@@ -28,6 +28,7 @@
 *****************************************************************************************/
 
 #include <vmm/vmm.h>
+#include <vmm/paging.h>
 #include <ubixos/kpanic.h>
 #include <ubixos/spinlock.h>
 #include <ubixos/sched.h>
@@ -46,8 +47,7 @@
 
 ************************************************************************/
 
-void *
-vmmGetFreePage2(kTask_t *task)
+void * vmmGetFreePage2(kTask_t *task)
 {
 	mMap *tmp;
 
@@ -99,6 +99,10 @@
 
 /***
  $Log$
+ Revision 1.9  2005/08/10 04:14:04  fsdfs
+ reworking memory management and WTF is with all the errors in the headers
+ it won't let me add anything!?
+
  Revision 1.8  2005/08/09 08:45:40  fsdfs
  reverting to old vmm. i may have modified something accidently when i wasted time indenting the code.