diff --git a/core/include/DatabaseStorage.h b/core/include/DatabaseStorage.h
index 943217d..73875d3 100644
--- a/core/include/DatabaseStorage.h
+++ b/core/include/DatabaseStorage.h
@@ -1,3 +1,19 @@
+/*
+* Copyright 2018 Coati Software KG
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 #ifndef SOURCETRAIL_DATABASE_STORAGE_H
 #define SOURCETRAIL_DATABASE_STORAGE_H
 
diff --git a/core/include/DefinitionKind.h b/core/include/DefinitionKind.h
index 40a3f00..37bc142 100644
--- a/core/include/DefinitionKind.h
+++ b/core/include/DefinitionKind.h
@@ -1,3 +1,19 @@
+/*
+* Copyright 2018 Coati Software KG
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 #ifndef SOURCETRAIL_DEFINITION_KIND_H
 #define SOURCETRAIL_DEFINITION_KIND_H
 
diff --git a/core/include/EdgeKind.h b/core/include/EdgeKind.h
index d74d86d..457b947 100644
--- a/core/include/EdgeKind.h
+++ b/core/include/EdgeKind.h
@@ -1,3 +1,19 @@
+/*
+* Copyright 2018 Coati Software KG
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 #ifndef SOURCETRAIL_EDGE_KIND_H
 #define SOURCETRAIL_EDGE_KIND_H
 
diff --git a/core/include/LocationKind.h b/core/include/LocationKind.h
index 5a569b7..4219dd4 100644
--- a/core/include/LocationKind.h
+++ b/core/include/LocationKind.h
@@ -1,3 +1,19 @@
+/*
+* Copyright 2018 Coati Software KG
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 #ifndef SOURCETRAIL_LOCATION_KIND_H
 #define SOURCETRAIL_LOCATION_KIND_H
 
diff --git a/core/include/NameElement.h b/core/include/NameElement.h
index dd8a534..26c81a0 100644
--- a/core/include/NameElement.h
+++ b/core/include/NameElement.h
@@ -1,3 +1,19 @@
+/*
+* Copyright 2018 Coati Software KG
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 #ifndef SOURCETRAIL_NAME_ELEMENT_H
 #define SOURCETRAIL_NAME_ELEMENT_H
 
diff --git a/core/include/NameHierarchy.h b/core/include/NameHierarchy.h
index a036d2a..4a8f2ae 100644
--- a/core/include/NameHierarchy.h
+++ b/core/include/NameHierarchy.h
@@ -1,3 +1,19 @@
+/*
+* Copyright 2018 Coati Software KG
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 #ifndef SOURCETRAIL_NAME_HIERARCHY_H
 #define SOURCETRAIL_NAME_HIERARCHY_H
 
diff --git a/core/include/NodeKind.h b/core/include/NodeKind.h
index 08860c9..94bf7c8 100644
--- a/core/include/NodeKind.h
+++ b/core/include/NodeKind.h
@@ -1,3 +1,19 @@
+/*
+* Copyright 2018 Coati Software KG
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 #ifndef SOURCETRAIL_NODE_KIND_H
 #define SOURCETRAIL_NODE_KIND_H
 
diff --git a/core/include/ReferenceKind.h b/core/include/ReferenceKind.h
index 81e7c3e..8022d7a 100644
--- a/core/include/ReferenceKind.h
+++ b/core/include/ReferenceKind.h
@@ -1,3 +1,19 @@
+/*
+* Copyright 2018 Coati Software KG
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 #ifndef SOURCETRAIL_REFERENCE_KIND_H
 #define SOURCETRAIL_REFERENCE_KIND_H
 
diff --git a/core/include/SourceLocation.h b/core/include/SourceLocation.h
index 405d319..86d417f 100644
--- a/core/include/SourceLocation.h
+++ b/core/include/SourceLocation.h
@@ -1,3 +1,19 @@
+/*
+* Copyright 2018 Coati Software KG
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 #ifndef SOURCETRAIL_SOURCE_LOCATION_H
 #define SOURCETRAIL_SOURCE_LOCATION_H
 
diff --git a/core/include/SourceRange.h b/core/include/SourceRange.h
index e4bf28d..f1bed4b 100644
--- a/core/include/SourceRange.h
+++ b/core/include/SourceRange.h
@@ -1,3 +1,19 @@
+/*
+* Copyright 2018 Coati Software KG
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 #ifndef SOURCETRAIL_SOURCE_RANGE_H
 #define SOURCETRAIL_SOURCE_RANGE_H
 
diff --git a/core/include/SourcetrailDBWriter.h b/core/include/SourcetrailDBWriter.h
index 4038c6a..fdf2f8c 100644
--- a/core/include/SourcetrailDBWriter.h
+++ b/core/include/SourcetrailDBWriter.h
@@ -1,3 +1,19 @@
+/*
+* Copyright 2018 Coati Software KG
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 #ifndef SOURCETRAIL_SRCTRLDB_WRITER_H
 #define SOURCETRAIL_SRCTRLDB_WRITER_H
 
diff --git a/core/include/SourcetrailException.h b/core/include/SourcetrailException.h
index e884f11..f99426b 100644
--- a/core/include/SourcetrailException.h
+++ b/core/include/SourcetrailException.h
@@ -1,3 +1,19 @@
+/*
+* Copyright 2018 Coati Software KG
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 #ifndef SOURCETRAIL_SOURCETRAIL_EXCEPTION_H
 #define SOURCETRAIL_SOURCETRAIL_EXCEPTION_H
 
diff --git a/core/include/SymbolKind.h b/core/include/SymbolKind.h
index b416d66..6fd22db 100644
--- a/core/include/SymbolKind.h
+++ b/core/include/SymbolKind.h
@@ -1,3 +1,19 @@
+/*
+* Copyright 2018 Coati Software KG
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 #ifndef SOURCETRAIL_SYMBOL_KIND_H
 #define SOURCETRAIL_SYMBOL_KIND_H
 
diff --git a/core/include/utility.h b/core/include/utility.h
index 9a52896..bd931e5 100644
--- a/core/include/utility.h
+++ b/core/include/utility.h
@@ -1,3 +1,19 @@
+/*
+* Copyright 2018 Coati Software KG
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 #ifndef SOURCETRAIL_UTILITY_H
 #define SOURCETRAIL_UTILITY_H
 
diff --git a/core/src/DatabaseStorage.cpp b/core/src/DatabaseStorage.cpp
index 5bbdbc2..5b796e0 100644
--- a/core/src/DatabaseStorage.cpp
+++ b/core/src/DatabaseStorage.cpp
@@ -1,3 +1,19 @@
+/*
+* Copyright 2018 Coati Software KG
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 #include "DatabaseStorage.h"
 
 #include <vector>
@@ -7,13 +23,6 @@
 #include "utility.h"
 #include "version.h"
 
-
-
-
-
-
-
-
 namespace sourcetrail
 {
 	// --- Public Interface ---
diff --git a/core/src/DefinitionKind.cpp b/core/src/DefinitionKind.cpp
index d783fc1..957d2e6 100644
--- a/core/src/DefinitionKind.cpp
+++ b/core/src/DefinitionKind.cpp
@@ -1,3 +1,19 @@
+/*
+* Copyright 2018 Coati Software KG
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 #include "DefinitionKind.h"
 
 namespace sourcetrail
diff --git a/core/src/EdgeKind.cpp b/core/src/EdgeKind.cpp
index 108ef3e..97b8995 100644
--- a/core/src/EdgeKind.cpp
+++ b/core/src/EdgeKind.cpp
@@ -1,3 +1,19 @@
+/*
+* Copyright 2018 Coati Software KG
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 #include "EdgeKind.h"
 
 #include "ReferenceKind.h"
diff --git a/core/src/LocationKind.cpp b/core/src/LocationKind.cpp
index d9db849..d288a29 100644
--- a/core/src/LocationKind.cpp
+++ b/core/src/LocationKind.cpp
@@ -1,3 +1,19 @@
+/*
+* Copyright 2018 Coati Software KG
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 #include "LocationKind.h"
 
 #include "SourcetrailException.h"
diff --git a/core/src/NameHierarchy.cpp b/core/src/NameHierarchy.cpp
index 96de00d..3fa96b2 100644
--- a/core/src/NameHierarchy.cpp
+++ b/core/src/NameHierarchy.cpp
@@ -1,3 +1,19 @@
+/*
+* Copyright 2018 Coati Software KG
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 #include "NameHierarchy.h"
 
 #include "json/json.hpp"
diff --git a/core/src/NodeKind.cpp b/core/src/NodeKind.cpp
index c176e53..c658a2a 100644
--- a/core/src/NodeKind.cpp
+++ b/core/src/NodeKind.cpp
@@ -1,3 +1,19 @@
+/*
+* Copyright 2018 Coati Software KG
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 #include "NodeKind.h"
 
 namespace sourcetrail
diff --git a/core/src/ReferenceKind.cpp b/core/src/ReferenceKind.cpp
index 1c696aa..5a0873b 100644
--- a/core/src/ReferenceKind.cpp
+++ b/core/src/ReferenceKind.cpp
@@ -1,3 +1,19 @@
+/*
+* Copyright 2018 Coati Software KG
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 #include "ReferenceKind.h"
 
 #include "EdgeKind.h"
diff --git a/core/src/SourcetrailDBWriter.cpp b/core/src/SourcetrailDBWriter.cpp
index c436fbc..1671c9d 100644
--- a/core/src/SourcetrailDBWriter.cpp
+++ b/core/src/SourcetrailDBWriter.cpp
@@ -1,3 +1,19 @@
+/*
+* Copyright 2018 Coati Software KG
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 #include "SourcetrailDBWriter.h"
 
 #include <fstream>
diff --git a/core/src/SymbolKind.cpp b/core/src/SymbolKind.cpp
index f9674a3..5af5f26 100644
--- a/core/src/SymbolKind.cpp
+++ b/core/src/SymbolKind.cpp
@@ -1,3 +1,19 @@
+/*
+* Copyright 2018 Coati Software KG
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 #include "SymbolKind.h"
 
 #include "NodeKind.h"
diff --git a/core/src/utility.cpp b/core/src/utility.cpp
index 7b04b55..9b47364 100644
--- a/core/src/utility.cpp
+++ b/core/src/utility.cpp
@@ -1,3 +1,19 @@
+/*
+* Copyright 2018 Coati Software KG
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 #include "utility.h"
 
 #include <fstream>