diff --git a/src/lib/libc/uuid/Makefile b/src/lib/libc/uuid/Makefile
new file mode 100644
index 0000000..c38e65c
--- /dev/null
+++ b/src/lib/libc/uuid/Makefile
@@ -0,0 +1,34 @@
+# $Id$
+# The System Makefile (C) 2002 The UbixOS Project
+
+# Include Global 'Source' Options
+include ../../../Makefile.inc
+include ../../Makefile.inc
+include ../Makefile.inc
+#Objects
+OBJS = uuid_compare.o uuid_create.o uuid_create_nil.o uuid_equal.o uuid_from_string.o uuid_hash.o uuid_is_nil.o uuid_to_string.o
+
+#Output
+OUTPUT = libc.so
+
+$(OUTPUT): $(OBJS)
+
+# Compile the source files
+.cc.o:
+	$(CXX) $(CFLAGS) -Wall -nostdinc -O -I../include -c -o $@ $<
+ 
+.cc.s:
+	$(CXX) $(CFLAGS) -Wall -nostdinc -O -I../include -S -o $@ $<
+ 
+.c.o:
+	$(CC) $(CFLAGS) -Wall -nostdinc -O $(INCLUDES) -c $<
+
+.c.s:
+	$(CC) $(CFLAGS) -Wall -nostdinc -O -I../include -S -o $@ $<
+ 
+.S.o:
+	$(CC) $(CFLAGS) -Wall -nostdinc -c -o $@ $<
+ 
+# Clean up the junk
+clean:
+	$(REMOVE) $(OBJS) $(OUTPUT)
diff --git a/src/lib/libc/uuid/Makefile.inc b/src/lib/libc/uuid/Makefile.inc
deleted file mode 100644
index 2f9ee04..0000000
--- a/src/lib/libc/uuid/Makefile.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD: src/lib/libc/uuid/Makefile.inc,v 1.3 2002/11/18 09:50:57 ru Exp $
-
-# DCE 1.1 UUID implementation sources
-
-.PATH: ${.CURDIR}/uuid
-
-SRCS+=	uuid_compare.c uuid_create.c uuid_create_nil.c uuid_equal.c \
-	uuid_from_string.c uuid_hash.c uuid_is_nil.c uuid_to_string.c
-
-MAN+=	uuid.3
-MLINKS+=uuid.3 uuid_compare.3
-MLINKS+=uuid.3 uuid_create.3
-MLINKS+=uuid.3 uuid_create_nil.3
-MLINKS+=uuid.3 uuid_equal.3
-MLINKS+=uuid.3 uuid_from_string.3
-MLINKS+=uuid.3 uuid_hash.3
-MLINKS+=uuid.3 uuid_is_nil.3
-MLINKS+=uuid.3 uuid_to_string.3
diff --git a/src/lib/libc/uuid/uuid.3 b/src/lib/libc/uuid/uuid.3
deleted file mode 100644
index 044ecc3..0000000
--- a/src/lib/libc/uuid/uuid.3
+++ /dev/null
@@ -1,100 +0,0 @@
-.\" Copyright (c) 2002 Marcel Moolenaar
-.\" Copyright (c) 2002 Hiten Mahesh Pandya
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-.\" BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-.\" AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $FreeBSD: src/lib/libc/uuid/uuid.3,v 1.4 2003/08/08 19:12:28 marcel Exp $
-.\"
-.Dd October 29, 2002
-.Dt UUID 3
-.Os
-.Sh NAME
-.Nm uuid_compare , uuid_create , uuid_create_nil , uuid_equal ,
-.Nm uuid_from_string , uuid_hash , uuid_is_nil , uuid_to_string
-.Nd DCE 1.1 compliant UUID functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In uuid.h
-.Ft int32_t
-.Fn uuid_compare "uuid_t *uuid1" "uuid_t *uuid2" "uint32_t *status"
-.Ft void
-.Fn uuid_create "uuid_t *uuid" "uint32_t *status"
-.Ft void
-.Fn uuid_create_nil "uuid_t *uuid" "uint32_t *status"
-.Ft int32_t
-.Fn uuid_equal "uuid_t *uuid1" "uuid_t *uuid2" "uint32_t *status"
-.Ft void
-.Fn uuid_from_string "const char *str" "uuid_t *uuid" "uint32_t *status"
-.Ft uint16_t
-.Fn uuid_hash "uuid_t *uuid" "uint32_t *status"
-.Ft int32_t
-.Fn uuid_is_nil "uuid_t *uuid" "uint32_t *status"
-.Ft void
-.Fn uuid_to_string "uuid_t *uuid" "char **str" "uint32_t *status"
-.Sh DESCRIPTION
-The family of DCE 1.1 compliant UUID functions allow applications to operate
-on universally unique identifiers, or UUIDs.
-The
-.Fn uuid_create
-and
-.Fn uuid_create_nil
-functions create UUIDs.
-The
-.Fn uuid_compare ,
-.Fn uuid_equal
-and
-.Fn uuid_is_nil
-functions can be used to test UUIDs.
-To convert from the binary representation to the string representation or
-vice versa, use
-.Fn uuid_to_string
-or
-.Fn uuid_from_string
-respectively.
-A 16-bit hash value can be obtained by calling
-.Fn uuid_hash .
-.Sh RETURN VALUES
-The successful or unsuccessful completion of the function is returned in
-the
-.Fa status
-argument.
-Possible values are:
-.Pp
-.Bl -tag -width ".Dv uuid_s_invalid_string_uuid"
-.It Dv uuid_s_ok
-The function completed successfully.
-.It Dv uuid_s_bad_version
-The UUID does not have a known version.
-.It Dv uuid_s_invalid_string_uuid
-The string representation of an UUID is not valid.
-.It Dv uuid_s_no_memory
-The meaning of the code escaped the writers mind.
-.El
-.Sh SEE ALSO
-.Xr uuidgen 1 ,
-.Xr uuidgen 2
-.Sh BUGS
-This manpage can be improved.
-.Sh STANDARDS
-The UUID functions conform to the DCE 1.1 RPC specification.