diff --git a/src/org/microg/gms/common/ForwardConnectionCallbacks.java b/src/org/microg/gms/common/ForwardConnectionCallbacks.java
index de4d920..e38972f 100644
--- a/src/org/microg/gms/common/ForwardConnectionCallbacks.java
+++ b/src/org/microg/gms/common/ForwardConnectionCallbacks.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014-2015 µg Project Team
+ *
+ * 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.
+ */
+
 package org.microg.gms.common;
 
 import android.os.Bundle;
diff --git a/src/org/microg/gms/common/ForwardConnectionFailedListener.java b/src/org/microg/gms/common/ForwardConnectionFailedListener.java
index 273383f..823a199 100644
--- a/src/org/microg/gms/common/ForwardConnectionFailedListener.java
+++ b/src/org/microg/gms/common/ForwardConnectionFailedListener.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014-2015 µg Project Team
+ *
+ * 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.
+ */
+
 package org.microg.gms.common;
 
 import com.google.android.gms.common.ConnectionResult;
diff --git a/src/org/microg/gms/common/GmsClient.java b/src/org/microg/gms/common/GmsClient.java
index e8cd12a..800b8df 100644
--- a/src/org/microg/gms/common/GmsClient.java
+++ b/src/org/microg/gms/common/GmsClient.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014-2015 µg Project Team
+ *
+ * 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.
+ */
+
 package org.microg.gms.common;
 
 import android.content.ComponentName;
diff --git a/src/org/microg/gms/common/GmsConnector.java b/src/org/microg/gms/common/GmsConnector.java
index fbd4e01..cd23afc 100644
--- a/src/org/microg/gms/common/GmsConnector.java
+++ b/src/org/microg/gms/common/GmsConnector.java
@@ -67,7 +67,8 @@ public class GmsConnector<C extends ApiConnection, R extends Result, O extends A
             Log.d(TAG, "Handler : onClientAvailable");
             AbstractPendingResult<R> result = (AbstractPendingResult<R>) msg.obj;
             try {
-                result.deliverResult(callback.onClientAvailable((C) apiClient.getApiConnection(api)));
+                result.deliverResult(callback.onClientAvailable((C) apiClient.getApiConnection
+                        (api)));
             } catch (RemoteException ignored) {
 
             }
diff --git a/src/org/microg/gms/common/MultiConnectionKeeper.java b/src/org/microg/gms/common/MultiConnectionKeeper.java
index 2d4fe83..bb454e5 100644
--- a/src/org/microg/gms/common/MultiConnectionKeeper.java
+++ b/src/org/microg/gms/common/MultiConnectionKeeper.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014-2015 µg Project Team
+ *
+ * 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.
+ */
+
 package org.microg.gms.common;
 
 import android.content.ComponentName;
diff --git a/src/org/microg/gms/common/api/AbstractPendingResult.java b/src/org/microg/gms/common/api/AbstractPendingResult.java
index 7e42142..7986adf 100644
--- a/src/org/microg/gms/common/api/AbstractPendingResult.java
+++ b/src/org/microg/gms/common/api/AbstractPendingResult.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014-2015 µg Project Team
+ *
+ * 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.
+ */
+
 package org.microg.gms.common.api;
 
 import android.os.Looper;
diff --git a/src/org/microg/gms/common/api/GoogleApiClientImpl.java b/src/org/microg/gms/common/api/GoogleApiClientImpl.java
index 1884b2f..ff2fa9c 100644
--- a/src/org/microg/gms/common/api/GoogleApiClientImpl.java
+++ b/src/org/microg/gms/common/api/GoogleApiClientImpl.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014-2015 µg Project Team
+ *
+ * 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.
+ */
+
 package org.microg.gms.common.api;
 
 import android.content.Context;
diff --git a/src/org/microg/gms/common/api/ResultCallbackHandler.java b/src/org/microg/gms/common/api/ResultCallbackHandler.java
index 0d5dbe9..0c03a57 100644
--- a/src/org/microg/gms/common/api/ResultCallbackHandler.java
+++ b/src/org/microg/gms/common/api/ResultCallbackHandler.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014-2015 µg Project Team
+ *
+ * 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.
+ */
+
 package org.microg.gms.common.api;
 
 import android.os.Handler;
diff --git a/src/org/microg/gms/location/FusedLocationProviderApiImpl.java b/src/org/microg/gms/location/FusedLocationProviderApiImpl.java
index ee2bcd2..be46f44 100644
--- a/src/org/microg/gms/location/FusedLocationProviderApiImpl.java
+++ b/src/org/microg/gms/location/FusedLocationProviderApiImpl.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014-2015 µg Project Team
+ *
+ * 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.
+ */
+
 package org.microg.gms.location;
 
 import android.app.PendingIntent;
diff --git a/src/org/microg/gms/location/GeofencingApiImpl.java b/src/org/microg/gms/location/GeofencingApiImpl.java
index 27cef98..81fcfdc 100644
--- a/src/org/microg/gms/location/GeofencingApiImpl.java
+++ b/src/org/microg/gms/location/GeofencingApiImpl.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014-2015 µg Project Team
+ *
+ * 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.
+ */
+
 package org.microg.gms.location;
 
 import com.google.android.gms.location.GeofencingApi;
diff --git a/src/org/microg/gms/location/GoogleLocationManagerClient.java b/src/org/microg/gms/location/GoogleLocationManagerClient.java
index 63ed578..cbc24b2 100644
--- a/src/org/microg/gms/location/GoogleLocationManagerClient.java
+++ b/src/org/microg/gms/location/GoogleLocationManagerClient.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014-2015 µg Project Team
+ *
+ * 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.
+ */
+
 package org.microg.gms.location;
 
 import android.content.Context;
diff --git a/src/org/microg/gms/location/LocationClientImpl.java b/src/org/microg/gms/location/LocationClientImpl.java
index 57c9c60..a79e0c6 100644
--- a/src/org/microg/gms/location/LocationClientImpl.java
+++ b/src/org/microg/gms/location/LocationClientImpl.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014-2015 µg Project Team
+ *
+ * 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.
+ */
+
 package org.microg.gms.location;
 
 import android.app.PendingIntent;