diff --git a/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/IgnoredWhenDetached.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/IgnoredWhenDetached.java
index de5ec27359..19d7a48774 100644
--- a/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/IgnoredWhenDetached.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/annotations/IgnoredWhenDetached.java
@@ -71,4 +71,4 @@
 @Target(ElementType.METHOD)
 public @interface IgnoredWhenDetached {
 
-}
\ No newline at end of file
+}
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/ViewServer.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/ViewServer.java
index a74ea8381a..9feb8cb983 100644
--- a/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/ViewServer.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/ViewServer.java
@@ -861,4 +861,4 @@ private boolean windowManagerAutolistLoop() {
 			return true;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/view/OnViewChangedNotifier.java b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/view/OnViewChangedNotifier.java
index 9873a0e02b..a35114fe8e 100644
--- a/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/view/OnViewChangedNotifier.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-api/src/main/java/org/androidannotations/api/view/OnViewChangedNotifier.java
@@ -42,4 +42,4 @@ public void notifyViewChanged(HasViews hasViews) {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/GenericFragmentArguments.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/GenericFragmentArguments.java
index 7f5dd54ca6..649955b054 100644
--- a/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/GenericFragmentArguments.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/GenericFragmentArguments.java
@@ -38,4 +38,4 @@ public class GenericFragmentArguments<S extends Serializable, P extends Account>
 	@FragmentArg
 	P parcelable;
 
-}
\ No newline at end of file
+}
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/HierarchyViewerActivity.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/HierarchyViewerActivity.java
index 24b784d5fc..e7a84f7c72 100644
--- a/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/HierarchyViewerActivity.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/HierarchyViewerActivity.java
@@ -22,4 +22,4 @@
 @EActivity(R.layout.clickable_widgets)
 public class HierarchyViewerActivity extends AbstractActivity {
 
-}
\ No newline at end of file
+}
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SubtypedGenericBean.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SubtypedGenericBean.java
index 49a7424a26..f646e9264d 100644
--- a/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SubtypedGenericBean.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/SubtypedGenericBean.java
@@ -38,4 +38,4 @@ <S extends List<T>> void uiMethod(S method) {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/receiver/ActivityWithReceiverTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/receiver/ActivityWithReceiverTest.java
index a6d51dd82d..5526a14f8f 100644
--- a/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/receiver/ActivityWithReceiverTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/receiver/ActivityWithReceiverTest.java
@@ -91,4 +91,4 @@ public void onBroadcastWithTwoActionsTest() {
 		assertTrue(activity.action2Fired);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/handler/HasParameterHandlers.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/handler/HasParameterHandlers.java
index 78a09a69e8..19223807a9 100644
--- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/handler/HasParameterHandlers.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/handler/HasParameterHandlers.java
@@ -20,4 +20,4 @@
 public interface HasParameterHandlers<T extends GeneratedClassHolder> extends AnnotationHandler<T> {
 
 	Iterable<AnnotationHandler> getParameterHandlers();
-}
\ No newline at end of file
+}
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/ValidatorParameterHelper.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/ValidatorParameterHelper.java
index cc117ddb33..145cb8e3a8 100644
--- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/ValidatorParameterHelper.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/ValidatorParameterHelper.java
@@ -493,4 +493,4 @@ public AnyOrderParamValidator anyOrder() {
 	public ValidatorParameterHelper(TargetAnnotationHelper targetAnnotationHelper) {
 		annotationHelper = targetAnnotationHelper;
 	}
-}
\ No newline at end of file
+}
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/HasInstanceState.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/HasInstanceState.java
index 45c03be882..2468eb79a7 100644
--- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/HasInstanceState.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/HasInstanceState.java
@@ -27,4 +27,4 @@ public interface HasInstanceState extends GeneratedClassHolder {
 	JMethod getRestoreStateMethod();
 
 	JVar getRestoreStateBundleParam();
-}
\ No newline at end of file
+}
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractListenerHandler.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractListenerHandler.java
index 42ed3ee971..f35f04ecc7 100644
--- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractListenerHandler.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/AbstractListenerHandler.java
@@ -134,4 +134,4 @@ protected final T getHolder() {
 	}
 
 	protected abstract IRClass.Res getResourceType();
-}
\ No newline at end of file
+}
diff --git a/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/test/java/org/androidannotations/rest/spring/test/RequestTestBuilder.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/test/java/org/androidannotations/rest/spring/test/RequestTestBuilder.java
index f10f653f4c..306ffb15fe 100644
--- a/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/test/java/org/androidannotations/rest/spring/test/RequestTestBuilder.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/test/java/org/androidannotations/rest/spring/test/RequestTestBuilder.java
@@ -166,4 +166,4 @@ public interface RequestTestBuilderExecutor {
 		void execute(MyService myService);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithWrongEnhancedMethod.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithWrongEnhancedMethod.java
index ee1ba0069d..8d01ab9f2c 100644
--- a/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithWrongEnhancedMethod.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/ClientWithWrongEnhancedMethod.java
@@ -36,4 +36,4 @@ public interface ClientWithWrongEnhancedMethod {
 	String getRootURL(String param);
 
 	boolean setRootURL();
-}
\ No newline at end of file
+}
diff --git a/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/WrongConstructorInterceptor.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/WrongConstructorInterceptor.java
index a2eff24efe..9092073803 100644
--- a/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/WrongConstructorInterceptor.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/WrongConstructorInterceptor.java
@@ -37,4 +37,4 @@ public ClientHttpResponse intercept(HttpRequest arg0, byte[] arg1, ClientHttpReq
 		return null;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/WrongConstructorResponseErrorHandler.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/WrongConstructorResponseErrorHandler.java
index b88a49e18b..108ccc4e38 100644
--- a/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/WrongConstructorResponseErrorHandler.java
+++ b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/test/java/org/androidannotations/rest/spring/WrongConstructorResponseErrorHandler.java
@@ -39,4 +39,4 @@ public boolean hasError(ClientHttpResponse clientHttpResponse) throws IOExceptio
 	public void handleError(ClientHttpResponse clientHttpResponse) throws IOException {
 
 	}
-}
\ No newline at end of file
+}
diff --git a/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/test/java/org/androidannotations/roboguice/test/TestSampleRoboApplication_.java b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/test/java/org/androidannotations/roboguice/test/TestSampleRoboApplication_.java
index 4dfd4a7b9c..e526ab9895 100644
--- a/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/test/java/org/androidannotations/roboguice/test/TestSampleRoboApplication_.java
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/test/java/org/androidannotations/roboguice/test/TestSampleRoboApplication_.java
@@ -35,4 +35,4 @@ public void prepareTest(Object test) {
 	@Override
 	public void afterTest(Method method) {
 	}
-}
\ No newline at end of file
+}
diff --git a/AndroidAnnotations/androidannotations-roboguice/roboguice/src/main/java/org/androidannotations/roboguice/RoboGuicePlugin.java b/AndroidAnnotations/androidannotations-roboguice/roboguice/src/main/java/org/androidannotations/roboguice/RoboGuicePlugin.java
index 442dc73cb7..674e2cb3e3 100644
--- a/AndroidAnnotations/androidannotations-roboguice/roboguice/src/main/java/org/androidannotations/roboguice/RoboGuicePlugin.java
+++ b/AndroidAnnotations/androidannotations-roboguice/roboguice/src/main/java/org/androidannotations/roboguice/RoboGuicePlugin.java
@@ -38,4 +38,4 @@ public List<AnnotationHandler<?>> getHandlers(AndroidAnnotationsEnvironment andr
 		annotationHandlers.add(new RoboGuiceHandler(androidAnnotationEnv));
 		return annotationHandlers;
 	}
-}
\ No newline at end of file
+}
diff --git a/AndroidAnnotations/checkstyle-checks-ci.xml b/AndroidAnnotations/checkstyle-checks-ci.xml
index bd657c6040..d3dda1b9c3 100644
--- a/AndroidAnnotations/checkstyle-checks-ci.xml
+++ b/AndroidAnnotations/checkstyle-checks-ci.xml
@@ -162,4 +162,5 @@
 	<module name="SuppressionFilter">
         <property name="file" value="${checkstyle.suppressions.file}"/>
     </module>
+	<module name="NewlineAtEndOfFile"/>
 </module>
diff --git a/AndroidAnnotations/checkstyle-checks.xml b/AndroidAnnotations/checkstyle-checks.xml
index 8afe47cb67..30d742fb99 100644
--- a/AndroidAnnotations/checkstyle-checks.xml
+++ b/AndroidAnnotations/checkstyle-checks.xml
@@ -163,4 +163,5 @@
 	<module name="SuppressionFilter">
         <property name="file" value="${checkstyle.suppressions.file}"/>
     </module>
+	<module name="NewlineAtEndOfFile"/>
 </module>