diff --git a/Makefile b/Makefile
index 7739298..1e90bca 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 .PHONY: all clean test
 
-LDFLAGS=-O2 -Wall -fPIC
-CFLAGS=-O2 -Wall -fPIC -I. -Wno-unused-function
+LDFLAGS=-O2 -Wall -fPIC 
+CFLAGS=-O2 -Wall -fPIC --std=gnu11 -I. -Wno-unused-function
 OBJS=capn-malloc.o capn-stream.o capn.o
 prefix = /usr
 
@@ -26,10 +26,10 @@ test: capn-test
 	./capn-test
 
 %-test.o: %-test.cpp *.h *.c *.inc
-	$(CXX) -std=c++11 -g -I. -Igtest/include -o $@ -c $<
+	$(CXX) --std=c++11 -g -I. -Igtest/include -o $@ -c $<
 	
 gtest-all.o: gtest/src/*.cc
-	$(CXX) -std=c++11 -g -I. -Igtest/include -Igtest -o $@ -c $<
+	$(CXX) --std=c++11 -g -I. -Igtest/include -Igtest -o $@ -c $<
 
 capn-test: capn-test.o capn-stream-test.o compiler/test.capnp.o compiler/schema-test.o compiler/schema.capnp.o capn.a gtest-all.o -lpthread
 	$(CXX) -std=c++11 -g -I. -o $@ $^
diff --git a/capn.h b/capn.h
index ca8ee17..e24aca2 100644
--- a/capn.h
+++ b/capn.h
@@ -89,7 +89,6 @@ struct capn_tree *capn_tree_insert(struct capn_tree *root, struct capn_tree *n);
  */
 struct capn_segment {
 	struct capn_tree hdr;
-	void *pad1;
 	struct capn_segment *next;
 	struct capn *capn;
 	uint32_t id;
diff --git a/compiler/test.capnp.c b/compiler/test.capnp.c
index 50d9705..acc5db8 100644
--- a/compiler/test.capnp.c
+++ b/compiler/test.capnp.c
@@ -14,7 +14,7 @@ static const uint8_t capn_buf[8168] = {
 	77,0,0,0,34,0,0,0,
 	77,0,0,0,26,0,0,0,
 	76,0,0,0,6,0,20,0,
-	205,207,62,235,24,0,0,0,
+	13,229,209,254,24,0,0,0,
 	33,1,0,0,41,0,0,0,
 	33,1,0,0,34,0,0,0,
 	33,1,0,0,35,0,0,0,
@@ -390,7 +390,7 @@ static const uint8_t capn_buf[8168] = {
 	77,0,0,0,34,0,0,0,
 	77,0,0,0,26,0,0,0,
 	76,0,0,0,6,0,20,0,
-	237,201,62,235,24,0,0,0,
+	45,223,209,254,24,0,0,0,
 	33,1,0,0,41,0,0,0,
 	33,1,0,0,34,0,0,0,
 	33,1,0,0,35,0,0,0,
@@ -685,7 +685,7 @@ static const uint8_t capn_buf[8168] = {
 	77,0,0,0,34,0,0,0,
 	77,0,0,0,26,0,0,0,
 	76,0,0,0,6,0,20,0,
-	81,197,62,235,24,0,0,0,
+	145,218,209,254,24,0,0,0,
 	33,1,0,0,41,0,0,0,
 	33,1,0,0,34,0,0,0,
 	33,1,0,0,35,0,0,0,