--- file_not_specified_in_diff	
+++ file_not_specified_in_diff	
@@ -, +, @@ 
--- a/lib/cfg-lex.l
+++ b/lib/cfg-lex.l
@@ -284,7 +284,7 @@ cfg_lexer_unput_string(CfgLexer *self, c
 void
 cfg_lexer_start_block_state(CfgLexer *self, gchar block_boundary[2])
 {
-  memcpy(&self->block_boundary, block_boundary, sizeof(block_boundary));
+  memcpy(&self->block_boundary, block_boundary, sizeof(*block_boundary));
   yy_push_state(block, self->state);
 }
 
--- a/lib/templates.c
+++ b/lib/templates.c
@@ -1373,7 +1373,7 @@ log_template_options_destroy(LogTemplate
 void
 log_template_options_defaults(LogTemplateOptions *options)
 {
-  memset(options, 0, sizeof(options));
+  memset(options, 0, sizeof(*options));
   options->frac_digits = -1;
   options->ts_format = -1;
 }
--- a/libtest/Makefile.am
+++ b/libtest/Makefile.am
@@ -1,6 +1,6 @@ 
 
 # we need the dotdot version of the include path to find generated headers
-AM_CFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/modules -I../lib -I../modules
+INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/modules -I../lib -I../modules
 
 noinst_LIBRARIES = libsyslog-ng-test.a