diff --git a/configure.ac b/configure.ac
index 5739739..6ed9f7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,18 +4,17 @@
 AC_PREREQ([2.69])
 AC_INIT([quark-kernel], [pre-alpha])
 AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
-AC_CONFIG_SRCDIR([src/allocator.cpp])
+AC_CONFIG_SRCDIR([src/kernel.c])
 AC_CONFIG_HEADERS([src/config.h])
 
 # Checks for programs.
-AC_PROG_CXX
 AC_PROG_CC
 AM_PROG_AS 
 AM_PROG_AR
 AC_PROG_RANLIB
 
 # Checks for header files.
-AC_CHECK_HEADERS([stddef.h stdint.h])
+AC_CHECK_HEADERS([stddef.h stdint.h stdarg.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_CHECK_HEADER_STDBOOL
diff --git a/src/Makefile.am b/src/Makefile.am
index b4709fc..ef5ae17 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,15 +1,13 @@
 noinst_PROGRAMS = quark-kernel
-quark_kernel_SOURCES = module.cpp util.cpp memorymap.cpp memoryregion.cpp pageallocator.cpp allocator.cpp scheduler.cpp
+quark_kernel_SOURCES = kernel.c memorymap.c pageallocator.c priorityqueue.c stdio.c string.c
 quark_kernel_LDADD = -lgcc
-quark_kernel_CPPFLAGS = -ffreestanding -mgeneral-regs-only -O0 -Wall -fno-exceptions -fno-rtti -ggdb
+quark_kernel_CFLAGS = -ffreestanding -mgeneral-regs-only -O0 -Wall -ggdb
 quark_kernel_LDFLAGS = -nostdlib
 
 if x86
-quark_kernel_SOURCES += x86/mmap.cpp \
-                        x86/tty.cpp \
-                        x86/interrupts.cpp \
-                        x86/multiboot2.cpp \
-                        x86/initialize.cpp \
+quark_kernel_SOURCES += x86/mmgr.c \
+                        x86/putc.c \
+                        x86/quark_x86.c \
                         x86/entry.S 
 quark_kernel_LDFLAGS += -T x86/linker.ld
 quark_kernel_DEPENDENCIES = x86/linker.ld