Remove unnecessary #include
Reverse unintended hunks of previous commit
Migrate to MPLAB Harmony