diff --git a/.cproject b/.cproject
index fb3afd4..0c0add5 100644
--- a/.cproject
+++ b/.cproject
@@ -18,16 +18,16 @@
-
+
-
-
@@ -46,15 +46,16 @@
+
-
-
@@ -68,7 +69,7 @@
-
+
diff --git a/include/machine/_types.h b/include/machine/_types.h
index eac6680..7c3fdfb 100644
--- a/include/machine/_types.h
+++ b/include/machine/_types.h
@@ -1,6 +1,84 @@
/*-
- * This file is in the public domain.
+ * Copyright (c) 2002-2018 The UbixOS Project.
+ * All rights reserved.
+ *
+ * This was developed by Christopher W. Olsen for the UbixOS Project.
+ *
+ * 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, the following disclaimer and the list of authors.
+ * 2) Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions, the following disclaimer and the list of authors in the documentation and/or
+ * other materials provided with the distribution.
+ * 3) Neither the name of the UbixOS Project nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS
+ * 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: releng/11.2/sys/i386/include/_types.h 232261 2012-02-28 18:15:28Z tijl $ */
-#include
+#ifndef _MACHINE__TYPES_H_
+#define _MACHINE__TYPES_H_
+
+/* Basic types upon which most other types are built */
+
+typedef __signed char __int8_t;
+typedef unsigned char __uint8_t;
+typedef short __int16_t;
+typedef unsigned short __uint16_t;
+typedef int __int32_t;
+typedef unsigned int __uint32_t;
+typedef long long __int64_t;
+typedef unsigned long long __uint64_t;
+
+// Standard type definitions.
+
+typedef unsigned long __clock_t; /* clock()... */
+typedef __int32_t __critical_t;
+typedef double __double_t;
+typedef double __float_t;
+typedef __int32_t __intfptr_t;
+typedef __int64_t __intmax_t;
+typedef __int32_t __intptr_t;
+typedef __int32_t __int_fast8_t;
+typedef __int32_t __int_fast16_t;
+typedef __int32_t __int_fast32_t;
+typedef __int64_t __int_fast64_t;
+typedef __int8_t __int_least8_t;
+typedef __int16_t __int_least16_t;
+typedef __int32_t __int_least32_t;
+typedef __int64_t __int_least64_t;
+typedef __int32_t __ptrdiff_t; /* ptr1 - ptr2 */
+typedef __int32_t __register_t;
+typedef __int32_t __segsz_t; /* segment size (in pages) */
+typedef __uint32_t __size_t; /* sizeof() */
+typedef __int32_t __ssize_t; /* byte count or error */
+typedef __int32_t __time_t; /* time()... */
+typedef __uint32_t __uintfptr_t;
+typedef __uint64_t __uintmax_t;
+typedef __uint32_t __uintptr_t;
+typedef __uint32_t __uint_fast8_t;
+typedef __uint32_t __uint_fast16_t;
+typedef __uint32_t __uint_fast32_t;
+typedef __uint64_t __uint_fast64_t;
+typedef __uint8_t __uint_least8_t;
+typedef __uint16_t __uint_least16_t;
+typedef __uint32_t __uint_least32_t;
+typedef __uint64_t __uint_least64_t;
+typedef __uint32_t __u_register_t;
+typedef __uint32_t __vm_offset_t;
+typedef __int64_t __vm_ooffset_t;
+typedef __uint32_t __vm_paddr_t;
+typedef __uint64_t __vm_pindex_t;
+typedef __uint32_t __vm_size_t;
+
+#endif /* !_MACHINE__TYPES_H_ */
diff --git a/include/sys/_types.h b/include/sys/_types.h
index f9ea7b9..e5ed18e 100644
--- a/include/sys/_types.h
+++ b/include/sys/_types.h
@@ -33,15 +33,15 @@
#include
typedef __uint32_t __ino_t;
-typedef __uint32_t __dev_t;/* device number */
+typedef __uint32_t __dev_t; /* device number */
typedef __uint16_t __mode_t;
-typedef __uint16_t __nlink_t;/* link count */
+typedef __uint16_t __nlink_t; /* link count */
typedef __uint32_t __uid_t;
typedef __uint32_t __gid_t;
typedef __int32_t __time_t;
-typedef __int64_t __blkcnt_t;/* file block count */
-typedef __uint32_t __blksize_t;/* file block size */
-typedef __uint32_t __fflags_t;/* file flags */
+typedef __int64_t __blkcnt_t; /* file block count */
+typedef __uint32_t __blksize_t; /* file block size */
+typedef __uint32_t __fflags_t; /* file flags */
typedef int ___wchar_t;
typedef long __suseconds_t; /* microseconds (signed) */
diff --git a/include/ubixos/init.h b/include/ubixos/init.h
index 2754672..e52f026 100644
--- a/include/ubixos/init.h
+++ b/include/ubixos/init.h
@@ -33,32 +33,32 @@
#include
#include
#include
-#include
+#include
#include
#include
-#include
+#include
#include
#include
#include
#include
#include
#include
-#include
+#include
#include
-#include
+#include
#include
#include
-#include
-#include
+#include
+#include
#include
typedef int (*intFunctionPTR)(void);
intFunctionPTR init_tasks[] = { static_constructors, i8259_init, idt_init, vitals_init, sysctl_init, vfs_init, sched_init, pit_init, atkbd_init, time_init, pci_init, devfs_init, tty_init, ufs_init, initHardDisk, initLNC, net_init };
-//ne2k_init,
-//ubixfs_init,
-//fdc_init,
+/* ne2k_init, */
+/* ubixfs_init, */
+/* fdc_init, */
int init_tasksTotal = sizeof(init_tasks) / sizeof(intFunctionPTR);
diff --git a/sys/init/main.c b/sys/init/main.c
index 471624a..939622e 100644
--- a/sys/init/main.c
+++ b/sys/init/main.c
@@ -26,14 +26,14 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include
+#include
#include
#include
#include
#include
-#include
-#include
-#include
+#include
+#include
+#include
#include
#include
#include
@@ -109,8 +109,8 @@
union descriptorTableUnion *gdt __attribute__ ((packed));
} loadGDT = { (11 * sizeof(union descriptorTableUnion) - 1), ubixGDT };
-static char *argv_init[2] = { "init", NULL, }; // ARGV For Initial Proccess
-static char *envp_init[6] = { "HOME=/", "PWD=/", "PATH=/bin:/sbin:/usr/bin:/usr/sbin", "USER=root", "GROUP=admin", NULL, }; //ENVP For Initial Proccess
+static char *argv_init[2] = { "init", NULL, }; /* ARGV For Initial Proccess */
+static char *envp_init[6] = { "HOME=/", "PWD=/", "PATH=/bin:/sbin:/usr/bin:/usr/sbin", "USER=root", "GROUP=admin", NULL, }; /* ENVP For Initial Proccess */
struct bootinfo _bootinfo;
char _kernelname[512];