diff --git a/dbcc/source/helper/gen_helper.cpp b/dbcc/source/helper/gen_helper.cpp
index 5d96a8e..1992217 100644
--- a/dbcc/source/helper/gen_helper.cpp
+++ b/dbcc/source/helper/gen_helper.cpp
@@ -73,6 +73,11 @@ public:
     {
         ad::dbcc::helper::NameSignalVector sigs;
         std::stringstream ss;
+
+        // Headers
+        ss << "#include <stdint.h> /**< uint8_t uint16_t */\n"
+           << "#include <stddef.h> /**< size_t */\n" << std::endl;
+
         ss << kCPackAndUnpackMacros << std::endl;
 
         for (auto &msg : config_["feedback"].GetObject())
@@ -337,7 +342,7 @@ std::string GenHelper::GenMessageUnpackDef(const ad::dbcc::Message &msg, const a
     {
         if (need_new_line)
         {
-            ss << std::endl << std::endl;
+            ss << std::endl;
         }
 
         ad::dbcc::helper::SignalHelper sig_helper(sig.second);
@@ -392,7 +397,7 @@ std::string GenHelper::GenMessagePackDef(const ad::dbcc::Message &msg, const ad:
     {
         if (need_new_line)
         {
-            ss << std::endl << std::endl;
+            ss << std::endl;
         }
 
         ad::dbcc::helper::SignalHelper sig_helper(sig.second);