diff --git a/Makefile.mk b/Makefile.mk
index ffe474d0e..bf29155e2 100644
--- a/Makefile.mk
+++ b/Makefile.mk
@@ -250,6 +250,18 @@ SOURCES_JERRY_C = \
  $(wildcard ./src/liboptimizer/*.c) ) \
  $(wildcard src/libruntime/target/$(TARGET_SYSTEM)/*.c)
 
+SOURCES_JERRY_H = \
+ $(sort \
+ $(wildcard ./src/libruntime/*.h) \
+ $(wildcard ./src/libperipherals/*.h) \
+ $(wildcard ./src/libjsparser/*.h) \
+ $(wildcard ./src/libecmaobjects/*.h) \
+ $(wildcard ./src/libecmaoperations/*.h) \
+ $(wildcard ./src/liballocator/*.h) \
+ $(wildcard ./src/libcoreint/*.h) \
+ $(wildcard ./src/liboptimizer/*.h) ) \
+ $(wildcard src/libruntime/target/$(TARGET_SYSTEM)/*.h)
+
 SOURCES_JERRY_ASM = \
  $(wildcard src/libruntime/target/$(TARGET_SYSTEM)/*.S)
 
@@ -353,6 +365,7 @@ $(JERRY_TARGETS):
 	@rm -rf $(TARGET_DIR)
 	@cppcheck $(DEFINES_JERRY) $(SOURCES_JERRY_C) $(INCLUDES_JERRY) $(INCLUDES_THIRDPARTY) \
           --error-exitcode=1 --std=c99 --enable=all --suppress=missingIncludeSystem --suppress=unusedFunction 1>/dev/null
+	@vera++ -r ./tools/vera++ -p jerry $(SOURCES_JERRY_C) $(SOURCES_JERRY_H) #-e 
 	@mkdir -p $(TARGET_DIR)
 	@mkdir -p $(TARGET_DIR)/obj
 	@source_index=0; \
diff --git a/src/liboptimizer/deserializer.h b/src/liboptimizer/deserializer.h
index 984da5436..d3253f43c 100644
--- a/src/liboptimizer/deserializer.h
+++ b/src/liboptimizer/deserializer.h
@@ -24,4 +24,4 @@ int deserialize_num_by_id (uint8_t);
 const void *deserialize_bytecode (void);
 uint8_t deserialize_min_temp (void);
 
-#endif //DESERIALIZER_H
\ No newline at end of file
+#endif //DESERIALIZER_H
diff --git a/src/liboptimizer/optimizer-passes.h b/src/liboptimizer/optimizer-passes.h
index fc839dc86..b1c869735 100644
--- a/src/liboptimizer/optimizer-passes.h
+++ b/src/liboptimizer/optimizer-passes.h
@@ -24,4 +24,4 @@ void optimizer_adjust_jumps (OPCODE *, OPCODE *, int16_t);
 void optimizer_reorder_scope (uint16_t, uint16_t);
 void optimizer_run_passes (OPCODE *);
 
-#endif // OPTIMIZER_PASSES_H
\ No newline at end of file
+#endif // OPTIMIZER_PASSES_H
diff --git a/src/liboptimizer/pretty-printer.h b/src/liboptimizer/pretty-printer.h
index 89782224d..608b482d5 100644
--- a/src/liboptimizer/pretty-printer.h
+++ b/src/liboptimizer/pretty-printer.h
@@ -22,4 +22,4 @@ void pp_opcode (opcode_counter_t, OPCODE, bool);
 void pp_strings (const char **, uint8_t);
 void pp_nums (const int32_t *, uint8_t, uint8_t);
 
-#endif // PRETTY_PRINTER
\ No newline at end of file
+#endif // PRETTY_PRINTER