diff --git a/src/baseexpression.h b/src/baseexpression.h
index 0a5efa9..51cc8fc 100644
--- a/src/baseexpression.h
+++ b/src/baseexpression.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_baseexpression
-#define headerfile_morm_baseexpression
+#ifndef headerfile_morm_src_baseexpression
+#define headerfile_morm_src_baseexpression
 
 #include <list>
 #include <set>
diff --git a/src/baseobjectwrapper.h b/src/baseobjectwrapper.h
index 669a7b0..35a9f24 100644
--- a/src/baseobjectwrapper.h
+++ b/src/baseobjectwrapper.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_baseobjectwrapper
-#define headerfile_morm_baseobjectwrapper
+#ifndef headerfile_morm_src_baseobjectwrapper
+#define headerfile_morm_src_baseobjectwrapper
 
 
 
diff --git a/src/clearer.h b/src/clearer.h
index d907a05..893d1bb 100644
--- a/src/clearer.h
+++ b/src/clearer.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_clearer
-#define headerfile_morm_clearer
+#ifndef headerfile_morm_src_clearer
+#define headerfile_morm_src_clearer
 
 #include <string>
 #include "date/date.h"
diff --git a/src/cursor.h b/src/cursor.h
index 54ad872..69b4780 100644
--- a/src/cursor.h
+++ b/src/cursor.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_cursor
-#define headerfile_morm_cursor
+#ifndef headerfile_morm_src_cursor
+#define headerfile_morm_src_cursor
 
 #include "queryresult.h"
 #include "modelconnector.h"
diff --git a/src/cursorhelper.h b/src/cursorhelper.h
index 5a7165e..900bc5b 100644
--- a/src/cursorhelper.h
+++ b/src/cursorhelper.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_cursorhelper
-#define headerfile_morm_cursorhelper
+#ifndef headerfile_morm_src_cursorhelper
+#define headerfile_morm_src_cursorhelper
 
 #include "queryresult.h"
 
diff --git a/src/dbconnector.h b/src/dbconnector.h
index 7e2c395..dd2a667 100644
--- a/src/dbconnector.h
+++ b/src/dbconnector.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_dbconnector
-#define headerfile_morm_dbconnector
+#ifndef headerfile_morm_src_dbconnector
+#define headerfile_morm_src_dbconnector
 
 #include "textstream/textstream.h"
 #include "log/log.h"
diff --git a/src/dbexpression.h b/src/dbexpression.h
index 0de03ab..713fea6 100644
--- a/src/dbexpression.h
+++ b/src/dbexpression.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_dbexpression
-#define headerfile_morm_dbexpression
+#ifndef headerfile_morm_src_dbexpression
+#define headerfile_morm_src_dbexpression
 
 #include <vector>
 #include "baseexpression.h"
diff --git a/src/fieldvaluehelper.h b/src/fieldvaluehelper.h
index 9f5ee81..41c589d 100644
--- a/src/fieldvaluehelper.h
+++ b/src/fieldvaluehelper.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_fieldvaluehelper
-#define headerfile_morm_fieldvaluehelper
+#ifndef headerfile_morm_src_fieldvaluehelper
+#define headerfile_morm_src_fieldvaluehelper
 
 #include <vector>
 #include <typeinfo>
diff --git a/src/finder.h b/src/finder.h
index af6fdc3..6ba3e17 100644
--- a/src/finder.h
+++ b/src/finder.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_finder
-#define headerfile_morm_finder
+#ifndef headerfile_morm_src_finder
+#define headerfile_morm_src_finder
 
 #include <vector>
 #include <list>
diff --git a/src/finderhelper.h b/src/finderhelper.h
index e90a59c..3a668f2 100644
--- a/src/finderhelper.h
+++ b/src/finderhelper.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_finderhelper
-#define headerfile_morm_finderhelper
+#ifndef headerfile_morm_src_finderhelper
+#define headerfile_morm_src_finderhelper
 
 #include "queryresult.h"
 
diff --git a/src/flatconnector.h b/src/flatconnector.h
index cf0587c..fdacf13 100644
--- a/src/flatconnector.h
+++ b/src/flatconnector.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_flatconnector
-#define headerfile_morm_flatconnector
+#ifndef headerfile_morm_src_flatconnector
+#define headerfile_morm_src_flatconnector
 
 #include "textstream/textstream.h"
 
diff --git a/src/flatexpression.h b/src/flatexpression.h
index 075a14e..7c97fed 100644
--- a/src/flatexpression.h
+++ b/src/flatexpression.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_flatexpression
-#define headerfile_morm_flatexpression
+#ifndef headerfile_morm_src_flatexpression
+#define headerfile_morm_src_flatexpression
 
 #include "baseexpression.h"
 
diff --git a/src/ft.h b/src/ft.h
index f1d5309..6249009 100644
--- a/src/ft.h
+++ b/src/ft.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_ft
-#define headerfile_morm_ft
+#ifndef headerfile_morm_src_ft
+#define headerfile_morm_src_ft
 
 namespace morm
 {
diff --git a/src/jsonconnector.h b/src/jsonconnector.h
index 116efc4..0ddde5b 100644
--- a/src/jsonconnector.h
+++ b/src/jsonconnector.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_jsonconnector
-#define headerfile_morm_jsonconnector
+#ifndef headerfile_morm_src_jsonconnector
+#define headerfile_morm_src_jsonconnector
 
 #include "flatconnector.h"
 
diff --git a/src/jsonexpression.h b/src/jsonexpression.h
index 88407b0..61e4886 100644
--- a/src/jsonexpression.h
+++ b/src/jsonexpression.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_jsonexpression
-#define headerfile_morm_jsonexpression
+#ifndef headerfile_morm_src_jsonexpression
+#define headerfile_morm_src_jsonexpression
 
 #include "flatexpression.h"
 
diff --git a/src/model.h b/src/model.h
index bef780e..d80900c 100644
--- a/src/model.h
+++ b/src/model.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_model
-#define headerfile_morm_model
+#ifndef headerfile_morm_src_model
+#define headerfile_morm_src_model
 
 #include <string>
 #include <list>
diff --git a/src/modelconnector.h b/src/modelconnector.h
index 9e20547..768560a 100644
--- a/src/modelconnector.h
+++ b/src/modelconnector.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_modelconnector
-#define headerfile_morm_modelconnector
+#ifndef headerfile_morm_src_modelconnector
+#define headerfile_morm_src_modelconnector
 
 #include "clearer.h"
 #include "dbconnector.h"
diff --git a/src/modelcontainerwrapper.h b/src/modelcontainerwrapper.h
index 5069cd3..3fe48fd 100644
--- a/src/modelcontainerwrapper.h
+++ b/src/modelcontainerwrapper.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_modelcontainerwrapper
-#define headerfile_morm_modelcontainerwrapper
+#ifndef headerfile_morm_src_modelcontainerwrapper
+#define headerfile_morm_src_modelcontainerwrapper
 
 #include <vector>
 #include <list>
diff --git a/src/modeldata.h b/src/modeldata.h
index 472bf69..d9ee431 100644
--- a/src/modeldata.h
+++ b/src/modeldata.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_modeldata
-#define headerfile_morm_modeldata
+#ifndef headerfile_morm_src_modeldata
+#define headerfile_morm_src_modeldata
 
 
 
diff --git a/src/modelenv.h b/src/modelenv.h
index 3361e04..c5a4e34 100644
--- a/src/modelenv.h
+++ b/src/modelenv.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_modelenv
-#define headerfile_morm_modelenv
+#ifndef headerfile_morm_src_modelenv
+#define headerfile_morm_src_modelenv
 
 #include "modeldata.h"
 #include "cursorhelper.h"
diff --git a/src/morm.h b/src/morm.h
index 29f8d8c..7097593 100644
--- a/src/morm.h
+++ b/src/morm.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_morm
-#define headerfile_morm_morm
+#ifndef headerfile_morm_src_morm
+#define headerfile_morm_src_morm
 
 
 #include "version.h"
diff --git a/src/morm_types.h b/src/morm_types.h
index 78d385d..a374a5a 100644
--- a/src/morm_types.h
+++ b/src/morm_types.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_morm_types
-#define headerfile_morm_morm_types
+#ifndef headerfile_morm_src_morm_types
+#define headerfile_morm_src_morm_types
 
 #define MORM_MODEL_WORK_MODE_NONE 0
 #define MORM_MODEL_WORK_MODE_GENERATING_DB_SQL 1
diff --git a/src/postgresqlconnector.h b/src/postgresqlconnector.h
index 2b47232..11eda2b 100644
--- a/src/postgresqlconnector.h
+++ b/src/postgresqlconnector.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_postgresqlconnector
-#define headerfile_morm_postgresqlconnector
+#ifndef headerfile_morm_src_postgresqlconnector
+#define headerfile_morm_src_postgresqlconnector
 
 #include <libpq-fe.h>
 #include <string>
diff --git a/src/postgresqlexpression.h b/src/postgresqlexpression.h
index 568a14b..34830b2 100644
--- a/src/postgresqlexpression.h
+++ b/src/postgresqlexpression.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_postgresqlexpression
-#define headerfile_morm_postgresqlexpression
+#ifndef headerfile_morm_src_postgresqlexpression
+#define headerfile_morm_src_postgresqlexpression
 
 #include "dbexpression.h"
 
diff --git a/src/postgresqlqueryresult.h b/src/postgresqlqueryresult.h
index fcc5758..ca645a3 100644
--- a/src/postgresqlqueryresult.h
+++ b/src/postgresqlqueryresult.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_postgresqlqueryresult
-#define headerfile_morm_postgresqlqueryresult
+#ifndef headerfile_morm_src_postgresqlqueryresult
+#define headerfile_morm_src_postgresqlqueryresult
 
 #include "queryresult.h"
 #include <libpq-fe.h>
diff --git a/src/queryresult.h b/src/queryresult.h
index fdabfb5..3e47916 100644
--- a/src/queryresult.h
+++ b/src/queryresult.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_queryresult
-#define headerfile_morm_queryresult
+#ifndef headerfile_morm_src_queryresult
+#define headerfile_morm_src_queryresult
 
 #include <log/log.h>
 #include <string>
diff --git a/src/spacewrapper.h b/src/spacewrapper.h
index a55d95e..d81fd41 100644
--- a/src/spacewrapper.h
+++ b/src/spacewrapper.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_spacewrapper
-#define headerfile_morm_spacewrapper
+#ifndef headerfile_morm_src_spacewrapper
+#define headerfile_morm_src_spacewrapper
 
 #include <vector>
 #include <limits>
diff --git a/src/transaction.h b/src/transaction.h
index f665e0c..9a73fb2 100644
--- a/src/transaction.h
+++ b/src/transaction.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_transaction
-#define headerfile_morm_transaction
+#ifndef headerfile_morm_src_transaction
+#define headerfile_morm_src_transaction
 
 #include "log/log.h"
 #include "modelconnector.h"
diff --git a/src/version.h b/src/version.h
index 73d382d..fa2f03c 100644
--- a/src/version.h
+++ b/src/version.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_version
-#define headerfile_morm_version
+#ifndef headerfile_morm_src_version
+#define headerfile_morm_src_version
 
 
 #define MORM_VERSION_MAJOR 0
diff --git a/src/wrapper.h b/src/wrapper.h
index 5697526..598d04c 100644
--- a/src/wrapper.h
+++ b/src/wrapper.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef headerfile_morm_wrapper
-#define headerfile_morm_wrapper
+#ifndef headerfile_morm_src_wrapper
+#define headerfile_morm_src_wrapper
 
 #include "spacewrapper.h"
 #include "date/date.h"