diff --git a/cpp/Makefile.am b/cpp/Makefile.am
index d1fa826e..08ea21f4 100644
--- a/cpp/Makefile.am
+++ b/cpp/Makefile.am
@@ -17,6 +17,12 @@ noinst_HEADERS = \
 		unpack_context.hpp \
 		msgpack/zone.hpp.erb
 
+# FIXME
+object.lo: msgpack/zone.hpp
+unpack.lo: msgpack/zone.hpp
+unpack_context.lo: msgpack/zone.hpp
+zone.lo: msgpack/zone.hpp
+
 msgpack/zone.hpp: msgpack/zone.hpp.erb
 	erb $< > $@
 
diff --git a/cpp/object.cpp b/cpp/object.cpp
index 4068007a..7bb98419 100644
--- a/cpp/object.cpp
+++ b/cpp/object.cpp
@@ -258,7 +258,7 @@ INTEGER_OBJECT(i16)
 INTEGER_OBJECT(i32)
 INTEGER_OBJECT(i64)
 
-#undef INTEGER_OBJECT(NAME)
+#undef INTEGER_OBJECT
 
 
 #define FLOAT_OBJECT(NAME) \
@@ -313,7 +313,7 @@ const object_class* object_##NAME::inspect(std::ostream& s) const				\
 FLOAT_OBJECT(float)
 FLOAT_OBJECT(double)
 
-#undef FLOAT_OBJECT(NAME)
+#undef FLOAT_OBJECT
 
 
 #define RAW_OBJECT(NAME, EXTRA) \
@@ -345,7 +345,7 @@ RAW_OBJECT(mutable_raw_ref,
 RAW_OBJECT(raw_ref,
 	raw object_raw_ref::xraw() const { return raw(ptr, len); } )
 
-#undef RAW_OBJECT(NAME, EXTRA)
+#undef RAW_OBJECT
 
 
       array& object_array::xarray()       { return val; }