diff --git a/.styleguide b/.styleguide
index 5084d7dd25..e09a1fac49 100644
--- a/.styleguide
+++ b/.styleguide
@@ -1,8 +1,6 @@
-cExtensions {
-}
-
 cppHeaderExtensions {
   h
+  hpp
   inc
 }
 
@@ -14,54 +12,27 @@ otherExtensions {
   java
 }
 
-genFolderExclude {
-  FRC_FPGA_ChipObject
-  NetworkCommunication
-  ctre
-  frccansae
-  gmock
-  gtest
-  i2clib
-  msgs
-  ni-libraries
-  ni/vision
-  spilib
-  wpilibj/src/athena/cpp/nivision
-  visa
-}
-
 genFileExclude {
-  NIIMAQdx\.h$
-  can_proto\.h$
-  nivision\.h$
+  gmock/
+  ni-libraries/
+  hal/src/main/native/athena/ctre/
+  hal/src/main/native/athena/frccansae/
+  hal/src/main/native/athena/visa/
+  hal/src/main/native/include/ctre/
+  simulation/JavaGazebo/build/classes/main/gazebo/msgs/
+  wpilibj/src/athena/cpp/nivision/
   UsageReporting\.h$
 }
 
-modifiableFolderExclude {
-  \.git
-  wpilibj/src/arm-linux-jni
-  wpilibj/src/main/native/cpp
-}
-
 modifiableFileExclude {
+  wpilibj/src/arm-linux-jni/
+  wpilibj/src/main/native/cpp/
   \.patch$
   \.png$
   \.py$
   \.so$
 }
 
-includeRelated {
-}
-
-includeCSys {
-}
-
-includeCppSys {
-}
-
-includeOtherLibs {
-}
-
 includeProject {
   ^ctre/
 }
diff --git a/myRobot/build.gradle b/myRobot/build.gradle
index e87e6cc52e..3538072c38 100644
--- a/myRobot/build.gradle
+++ b/myRobot/build.gradle
@@ -99,4 +99,4 @@ model {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/wpilibc/src/main/native/cpp/CameraServer.cpp b/wpilibc/src/main/native/cpp/CameraServer.cpp
index a313cc6a7a..017100c649 100644
--- a/wpilibc/src/main/native/cpp/CameraServer.cpp
+++ b/wpilibc/src/main/native/cpp/CameraServer.cpp
@@ -710,4 +710,4 @@ void CameraServer::SetSize(int size) {
     it->second.SetResolution(320, 240);
   else if (size == kSize640x480)
     it->second.SetResolution(640, 480);
-}
\ No newline at end of file
+}
diff --git a/wpilibc/src/main/native/cpp/vision/VisionRunner.cpp b/wpilibc/src/main/native/cpp/vision/VisionRunner.cpp
index 2068195ef5..493c29e36d 100644
--- a/wpilibc/src/main/native/cpp/vision/VisionRunner.cpp
+++ b/wpilibc/src/main/native/cpp/vision/VisionRunner.cpp
@@ -73,4 +73,4 @@ void VisionRunnerBase::RunForever() {
   while (true) {
     RunOnce();
   }
-}
\ No newline at end of file
+}
diff --git a/wpilibc/src/main/native/include/CameraServer.h b/wpilibc/src/main/native/include/CameraServer.h
index 3c11abce09..6de0d9f345 100644
--- a/wpilibc/src/main/native/include/CameraServer.h
+++ b/wpilibc/src/main/native/include/CameraServer.h
@@ -41,7 +41,7 @@ class CameraServer : public ErrorBase {
   static CameraServer* GetInstance();
 
 #ifdef __linux__
-// USBCamera does not work on anything except linux
+  // USBCamera does not work on anything except linux
   /**
    * Start automatically capturing images to send to the dashboard.
    *
diff --git a/wpilibj/src/dev/java/edu/wpi/first/wpilibj/DevMain.java b/wpilibj/src/dev/java/edu/wpi/first/wpilibj/DevMain.java
index 8a579077d1..5a56d38302 100644
--- a/wpilibj/src/dev/java/edu/wpi/first/wpilibj/DevMain.java
+++ b/wpilibj/src/dev/java/edu/wpi/first/wpilibj/DevMain.java
@@ -1,17 +1,24 @@
-package edu.wpi.first.wpilibj;
-
-import edu.wpi.first.wpiutil.RuntimeDetector;
-import edu.wpi.first.wpilibj.hal.HALUtil;
-import edu.wpi.first.wpilibj.networktables.NetworkTablesJNI;
-
-public class DevMain {
-  /**
-   * Main entry point.
-   */
-  public static void main(String[] args) {
-    System.out.println("Hello World!");
-    System.out.println(RuntimeDetector.getPlatformPath());
-    System.out.println(NetworkTablesJNI.now());
-    System.out.println(HALUtil.getHALRuntimeType());
-  }
-}
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) FIRST 2017. All Rights Reserved.                             */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+package edu.wpi.first.wpilibj;
+
+import edu.wpi.first.wpiutil.RuntimeDetector;
+import edu.wpi.first.wpilibj.hal.HALUtil;
+import edu.wpi.first.wpilibj.networktables.NetworkTablesJNI;
+
+public class DevMain {
+  /**
+   * Main entry point.
+   */
+  public static void main(String[] args) {
+    System.out.println("Hello World!");
+    System.out.println(RuntimeDetector.getPlatformPath());
+    System.out.println(NetworkTablesJNI.now());
+    System.out.println(HALUtil.getHALRuntimeType());
+  }
+}