diff --git a/Makefile b/Makefile
index 93f49dadee..72c25fb40a 100644
--- a/Makefile
+++ b/Makefile
@@ -8,12 +8,11 @@ export TOP = $(shell pwd)
 export FWDIR=$(TOP)/vboot_firmware
 export INCLUDES = \
 	-I$(FWDIR)/include \
-	-I$(TOP)/misclibs/include \
-	-I$(TOP)/cgptlib
+	-I$(TOP)/misclibs/include
 
 export FWLIB=$(FWDIR)/vboot_fw.a
 
-SUBDIRS=vboot_firmware cgptlib misclibs vfirmware vkernel utility tests
+SUBDIRS=vboot_firmware misclibs vfirmware vkernel utility tests
 
 all:
 	set -e; \
diff --git a/cgptlib/Makefile b/cgptlib/Makefile
deleted file mode 100644
index 5b37af5610..0000000000
--- a/cgptlib/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-CFLAGS += -Wall -Werror -ansi
-INCLUDES += -Itests
-SUBDIRS = tests
-
-all: libcgpt.a
-	set -e; \
-	for i in $(SUBDIRS); do \
-		$(MAKE) -C $$i; \
-	done
-
-.c.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
-
-libcgpt.a: cgptlib.o quick_sort.o crc32.o
-	$(AR) rs $@ $^
-
-clean:
-	set -e; \
-	for i in $(SUBDIRS); do \
-		$(MAKE) -C $$i clean; \
-	done
-	rm -f *.o *~ *.a
diff --git a/cgptlib/tests/Makefile b/cgptlib/tests/Makefile
deleted file mode 100644
index ca2a170ce0..0000000000
--- a/cgptlib/tests/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-TOP ?= ../../
-CFLAGS += -Wall -DNDEBUG -Werror -ansi
-LIBS = $(TOP)/cgptlib/libcgpt.a $(FWLIB)
-OBJS = cgptlib_test.o quick_sort_test.o crc32_test.o
-OUT = cgptlib_test
-
-all: $(OUT)
-
-$(OUT): $(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) -o $@ $^
-
-.c.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
-
-clean:
-	rm -rf $(OUT) $(OBJS)
diff --git a/tests/Makefile b/tests/Makefile
index 3b26005c86..7381d42717 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -6,6 +6,7 @@ TOP ?= ../
 CC ?= gcc
 CFLAGS ?= -Wall -DNDEBUG -O3 -Werror
 INCLUDES += -I./include \
+		-I$(FWDIR)/lib/cgptlib/include \
 		-I$(FWDIR)/lib/cryptolib/include \
 		-I../misclibs/include \
 		-I../vfirmware/include\
@@ -17,6 +18,7 @@ LIBS = $(IMAGE_LIBS) $(UTIL_LIBS) $(FWLIB) -lcrypto
 
 TEST_BINS = big_firmware_tests \
 		big_kernel_tests \
+		cgptlib_test \
 		firmware_image_tests \
 		firmware_rollback_tests \
 		firmware_splicing_tests \
@@ -40,6 +42,9 @@ big_firmware_tests: big_firmware_tests.c rollback_index_mock.c test_common.c
 big_kernel_tests: big_kernel_tests.c rollback_index_mock.c test_common.c
 	$(CC) $(CFLAGS) $(INCLUDES) $^ -o $@ $(LIBS)
 
+cgptlib_test: cgptlib_test.c quick_sort_test.c crc32_test.c
+	$(CC) $(CFLAGS) -ansi $(INCLUDES) $^ -o $@ $(LIBS)
+
 firmware_image_tests: firmware_image_tests.c rollback_index_mock.c test_common.c
 	$(CC) $(CFLAGS) $(INCLUDES) $^ -o $@ $(LIBS)
 
diff --git a/cgptlib/tests/cgptlib_test.c b/tests/cgptlib_test.c
similarity index 100%
rename from cgptlib/tests/cgptlib_test.c
rename to tests/cgptlib_test.c
diff --git a/cgptlib/tests/cgptlib_test.h b/tests/cgptlib_test.h
similarity index 100%
rename from cgptlib/tests/cgptlib_test.h
rename to tests/cgptlib_test.h
diff --git a/cgptlib/tests/crc32_test.c b/tests/crc32_test.c
similarity index 100%
rename from cgptlib/tests/crc32_test.c
rename to tests/crc32_test.c
diff --git a/cgptlib/tests/crc32_test.h b/tests/crc32_test.h
similarity index 100%
rename from cgptlib/tests/crc32_test.h
rename to tests/crc32_test.h
diff --git a/cgptlib/tests/quick_sort_test.c b/tests/quick_sort_test.c
similarity index 100%
rename from cgptlib/tests/quick_sort_test.c
rename to tests/quick_sort_test.c
diff --git a/cgptlib/tests/quick_sort_test.h b/tests/quick_sort_test.h
similarity index 100%
rename from cgptlib/tests/quick_sort_test.h
rename to tests/quick_sort_test.h
diff --git a/utility/Makefile b/utility/Makefile
index 78b967adf5..adfeea3041 100644
--- a/utility/Makefile
+++ b/utility/Makefile
@@ -6,6 +6,7 @@ TOP ?= ../
 CC ?= gcc
 CXX ?= g++
 INCLUDES += -I./include \
+		-I$(FWDIR)/lib/cgptlib/include \
 		-I$(FWDIR)/lib/cryptolib/include \
 		-I../misclibs/include \
 		-I../vfirmware/include\
diff --git a/utility/cgpt/Makefile b/utility/cgpt/Makefile
index 3c1f0bfd01..70375ccca8 100644
--- a/utility/cgpt/Makefile
+++ b/utility/cgpt/Makefile
@@ -6,7 +6,7 @@ TOP ?= ../../
 CC ?= cc
 INCLUDES += -I$(TOP)/common/include -I$(TOP)/../../../chroot/usr/include/
 CFLAGS += -Wall -Werror -ggdb
-LIBS += $(TOP)/cgptlib/libcgpt.a $(FWLIB)
+LIBS += $(FWLIB)
 
 all: cgpt
 
diff --git a/vboot_firmware/Makefile b/vboot_firmware/Makefile
index 16669f5017..2dbdc57b33 100644
--- a/vboot_firmware/Makefile
+++ b/vboot_firmware/Makefile
@@ -15,6 +15,7 @@ TESTDIR = $(FWTOP)/linktest
 INC = \
 	-I$(FWTOP)/include \
 	-I$(LIBDIR)/include \
+	-I$(LIBDIR)/cgptlib/include \
 	-I$(LIBDIR)/cryptolib/include
 
 
diff --git a/cgptlib/cgptlib.c b/vboot_firmware/lib/cgptlib/cgptlib.c
similarity index 100%
rename from cgptlib/cgptlib.c
rename to vboot_firmware/lib/cgptlib/cgptlib.c
diff --git a/cgptlib/crc32.c b/vboot_firmware/lib/cgptlib/crc32.c
similarity index 100%
rename from cgptlib/crc32.c
rename to vboot_firmware/lib/cgptlib/crc32.c
diff --git a/cgptlib/cgptlib.h b/vboot_firmware/lib/cgptlib/include/cgptlib.h
similarity index 100%
rename from cgptlib/cgptlib.h
rename to vboot_firmware/lib/cgptlib/include/cgptlib.h
diff --git a/cgptlib/cgptlib_internal.h b/vboot_firmware/lib/cgptlib/include/cgptlib_internal.h
similarity index 100%
rename from cgptlib/cgptlib_internal.h
rename to vboot_firmware/lib/cgptlib/include/cgptlib_internal.h
diff --git a/cgptlib/crc32.h b/vboot_firmware/lib/cgptlib/include/crc32.h
similarity index 100%
rename from cgptlib/crc32.h
rename to vboot_firmware/lib/cgptlib/include/crc32.h
diff --git a/cgptlib/gpt.h b/vboot_firmware/lib/cgptlib/include/gpt.h
similarity index 100%
rename from cgptlib/gpt.h
rename to vboot_firmware/lib/cgptlib/include/gpt.h
diff --git a/cgptlib/quick_sort.h b/vboot_firmware/lib/cgptlib/include/quick_sort.h
similarity index 100%
rename from cgptlib/quick_sort.h
rename to vboot_firmware/lib/cgptlib/include/quick_sort.h
diff --git a/cgptlib/quick_sort.c b/vboot_firmware/lib/cgptlib/quick_sort.c
similarity index 100%
rename from cgptlib/quick_sort.c
rename to vboot_firmware/lib/cgptlib/quick_sort.c
diff --git a/vboot_firmware/linktest/main.c b/vboot_firmware/linktest/main.c
index 0897c1ef87..518f763022 100644
--- a/vboot_firmware/linktest/main.c
+++ b/vboot_firmware/linktest/main.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 
+#include "cgptlib.h"
 #include "firmware_image_fw.h"
 #include "kernel_image_fw.h"
 #include "load_kernel_fw.h"
@@ -8,6 +9,10 @@
 
 int main(void)
 {
+  // cgptlib.h
+  GptInit(0);
+  GptNextKernelEntry(0, 0, 0);
+  GptUpdateKernelEntry(0, 0);
 
   // firmware_image_fw.h
   VerifyFirmwareHeader(0, 0, 0, 0);