diff --git a/libuavcan/dsdl_compiler/libuavcan_dsdl_compiler/data_type_template.tmpl b/libuavcan/dsdl_compiler/libuavcan_dsdl_compiler/data_type_template.tmpl
index 305d715dc5..12bd65817e 100644
--- a/libuavcan/dsdl_compiler/libuavcan_dsdl_compiler/data_type_template.tmpl
+++ b/libuavcan/dsdl_compiler/libuavcan_dsdl_compiler/data_type_template.tmpl
@@ -33,19 +33,11 @@ ${line}
 #undef ${a.name}
 % endfor
 
-#ifndef UAVCAN_PACK_STRUCTS
-# error UAVCAN_PACK_STRUCTS
-#endif
-
 % for nsc in t.cpp_namespace_components:
 namespace ${nsc}
 {
 % endfor
 
-#if UAVCAN_PACK_STRUCTS
-UAVCAN_PACKED_BEGIN
-#endif
-
 % if t.kind != t.KIND_SERVICE:
 template <int _tmpl>
 % endif
@@ -178,10 +170,6 @@ private:
 % endif
 };
 
-#if UAVCAN_PACK_STRUCTS
-UAVCAN_PACKED_END
-#endif
-
 /*
  * Out of line struct method definitions
  */
diff --git a/libuavcan/include/uavcan/build_config.hpp b/libuavcan/include/uavcan/build_config.hpp
index 1e67cd8345..578538cf48 100644
--- a/libuavcan/include/uavcan/build_config.hpp
+++ b/libuavcan/include/uavcan/build_config.hpp
@@ -84,12 +84,8 @@
 
 /**
  * Struct layout control.
- * Set UAVCAN_PACK_STRUCTS=1 and define UAVCAN_PACKED_BEGIN and UAVCAN_PACKED_END to reduce memory usage.
  * THIS MAY BREAK THE CODE.
  */
-#ifndef UAVCAN_PACK_STRUCTS
-# define UAVCAN_PACK_STRUCTS    0
-#endif
 #ifndef UAVCAN_PACKED_BEGIN
 # define UAVCAN_PACKED_BEGIN
 #endif