diff --git a/src/bin/Makefile.inc b/src/bin/Makefile.inc
index e87d490..be938e2 100644
--- a/src/bin/Makefile.inc
+++ b/src/bin/Makefile.inc
@@ -1,6 +1,6 @@
 # 'bin' options
 
-CFLAGS = -fno-builtin -nostdlib -nostdinc
+CFLAGS = -nostdlib -nostdinc
 
 INCLUDES = -I../../include 
 
diff --git a/src/bin/launcher/Makefile b/src/bin/launcher/Makefile
index fb1d570..c0ea8e0 100644
--- a/src/bin/launcher/Makefile
+++ b/src/bin/launcher/Makefile
@@ -5,7 +5,8 @@
 include ../../Makefile.inc
 include ../Makefile.inc
 
-INCLUDES += -I./include -I../../lib/views/sunlight/include
+INCLUDES += -I./include -I../../lib/views/sunlight/include -I../../lib/libcpp/include -I../../lib/objgfx40/objgfx40
+CFLAGS = -nostdlib -fno-exceptions
 
 #Linker
 LD = ld
@@ -29,10 +30,10 @@
 
 # Compile the source files
 .cpp.o:
-	$(CXX)  -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
+	$(CXX)  -Wall -O -DNOBOOL $(CFLAGS) $(INCLUDES) -c -o $@ $<
 
 .cc.o:
-	$(CXX)  -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
+	$(CXX)  -Wall -O -DNOBOOL $(CFLAGS) $(INCLUDES) -c -o $@ $<
 
 .cc.s:
 	$(CXX)  -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $<
diff --git a/src/include/string.h b/src/include/string.h
index c5fb9a3..5bbd235 100644
--- a/src/include/string.h
+++ b/src/include/string.h
@@ -47,6 +47,8 @@
 char *strrchr(const char *s, int c);
 char *strerror(int errnum);
 int strerror_r(int errnum, char *strerrbuf, size_t buflen);
+void *memmove(void *dst, const void *src, size_t len);
+
 
 /**** END ****/
 
diff --git a/src/lib/libc_old/string/Makefile b/src/lib/libc_old/string/Makefile
index 5843e57..ecd8e6d 100644
--- a/src/lib/libc_old/string/Makefile
+++ b/src/lib/libc_old/string/Makefile
@@ -5,7 +5,7 @@
 include ../../../Makefile.inc
 include ../../Makefile.inc
 #Objects
-OBJS = strrchr.o strlcat.o strlcpy.o strerror.o strtok.o memcpy.o memset.o memcmp.o strlen.o strcmp.o
+OBJS = memmove.o strrchr.o strlcat.o strlcpy.o strerror.o strtok.o memcpy.o memset.o memcmp.o strlen.o strcmp.o
 
 #Output
 OUTPUT = libc.so
diff --git a/src/lib/libc_old/string/memmove.c b/src/lib/libc_old/string/memmove.c
new file mode 100644
index 0000000..ca1dfe1
--- /dev/null
+++ b/src/lib/libc_old/string/memmove.c
@@ -0,0 +1,18 @@
+#include <sys/types.h>
+#include <string.h>
+
+void * memmove(void * dst, const void * src, size_t length)
+{
+    size_t x = length >> 2;
+    size_t y = length & 0xf;
+    size_t i;
+
+    for (i = 0; i < x; i++)
+	((unsigned long *)dst)[i] = ((unsigned long *)src)[i];
+
+    for (i = 0; i < y; i++)
+	((char *) dst)[length-y+i] = ((char *) src)[length-y+i];
+    
+    return dst;
+}
+
diff --git a/src/lib/objgfx40/objgfx40/ogTypes.h b/src/lib/objgfx40/objgfx40/ogTypes.h
index c90c43a..952e6d6 100644
--- a/src/lib/objgfx40/objgfx40/ogTypes.h
+++ b/src/lib/objgfx40/objgfx40/ogTypes.h
@@ -7,7 +7,7 @@
 typedef signed long long int   int64;
 typedef unsigned char          uInt8;
 typedef unsigned short int     uInt16;
-typedef unsigned long int      uInt32;
+typedef unsigned int           uInt32;
 typedef unsigned long long int uInt64;
 
 enum ogDataState { ogNone, ogOwner, ogAliasing };
diff --git a/src/sys/include/ubixos/types.h b/src/sys/include/ubixos/types.h
index 9fb8bcd..24999ef 100644
--- a/src/sys/include/ubixos/types.h
+++ b/src/sys/include/ubixos/types.h
@@ -38,7 +38,7 @@
 
 typedef unsigned char  uInt8;
 typedef unsigned short uInt16;
-typedef unsigned long  uInt32;
+typedef unsigned int   uInt32;
 typedef unsigned int   uInt;
 typedef char Int8;
 typedef short Int16;
@@ -56,6 +56,9 @@
 
 /***
  $Log$
+ Revision 1.3  2004/05/21 15:20:00  reddawg
+ Cleaned up
+
 
  END
  ***/