diff --git a/LUFA.pnproj b/LUFA.pnproj
index 478637e8b33..8cddbe45576 100644
--- a/LUFA.pnproj
+++ b/LUFA.pnproj
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/Projects/AVRISP/Lib/ISP/ISPProtocol.h b/Projects/AVRISP/Lib/ISP/ISPProtocol.h
index 85a669a4ecc..caadf412a4c 100644
--- a/Projects/AVRISP/Lib/ISP/ISPProtocol.h
+++ b/Projects/AVRISP/Lib/ISP/ISPProtocol.h
@@ -39,7 +39,9 @@
/* Includes: */
#include
- #include "V2Protocol.h"
+ #include
+
+ #include "../V2Protocol.h"
/* Preprocessor Checks: */
#if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
diff --git a/Projects/AVRISP/Lib/ISP/ISPTarget.h b/Projects/AVRISP/Lib/ISP/ISPTarget.h
index 62d8bbb4bc3..a2641c08980 100644
--- a/Projects/AVRISP/Lib/ISP/ISPTarget.h
+++ b/Projects/AVRISP/Lib/ISP/ISPTarget.h
@@ -43,9 +43,7 @@
#include
#include
- #include "../Descriptors.h"
- #include "V2ProtocolConstants.h"
- #include "V2ProtocolParams.h"
+ #include "../V2ProtocolParams.h"
/* Preprocessor Checks: */
#if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
diff --git a/Projects/AVRISP/Lib/PDI/PDIProtocol.h b/Projects/AVRISP/Lib/PDI/PDIProtocol.h
index c1fbef466a9..c3cafb4ecd6 100644
--- a/Projects/AVRISP/Lib/PDI/PDIProtocol.h
+++ b/Projects/AVRISP/Lib/PDI/PDIProtocol.h
@@ -40,8 +40,10 @@
#include
#include
#include
+
+ #include
- #include "V2Protocol.h"
+ #include "../V2Protocol.h"
#include "PDITarget.h"
#include "XMEGANVM.h"
diff --git a/Projects/AVRISP/Lib/TPI/TPIProtocol.h b/Projects/AVRISP/Lib/TPI/TPIProtocol.h
index 2b6849c1ef4..11894a33330 100644
--- a/Projects/AVRISP/Lib/TPI/TPIProtocol.h
+++ b/Projects/AVRISP/Lib/TPI/TPIProtocol.h
@@ -40,8 +40,9 @@
#include
#include
#include
-
- #include "V2Protocol.h"
+
+ #include
+
#include "TPITarget.h"
#include "TINYNVM.h"
diff --git a/Projects/AVRISP/Lib/V2Protocol.h b/Projects/AVRISP/Lib/V2Protocol.h
index ef4d2eb63a3..c7c1a7350e2 100644
--- a/Projects/AVRISP/Lib/V2Protocol.h
+++ b/Projects/AVRISP/Lib/V2Protocol.h
@@ -43,9 +43,9 @@
#include "../Descriptors.h"
#include "V2ProtocolConstants.h"
#include "V2ProtocolParams.h"
- #include "ISPProtocol.h"
- #include "PDIProtocol.h"
- #include "TPIProtocol.h"
+ #include "ISP/ISPProtocol.h"
+ #include "PDI/PDIProtocol.h"
+ #include "TPI/TPIProtocol.h"
/* Preprocessor Checks: */
#if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
diff --git a/Projects/AVRISP/Lib/V2ProtocolParams.h b/Projects/AVRISP/Lib/V2ProtocolParams.h
index 428c1d46739..14ff56c71a1 100644
--- a/Projects/AVRISP/Lib/V2ProtocolParams.h
+++ b/Projects/AVRISP/Lib/V2ProtocolParams.h
@@ -48,7 +48,7 @@
#include "V2Protocol.h"
#include "V2ProtocolConstants.h"
- #include "ISPTarget.h"
+ #include "ISP/ISPTarget.h"
/* Macros: */
/** Parameter privilege mask to allow the host PC to read the parameter's value */
diff --git a/Projects/AVRISP/makefile b/Projects/AVRISP/makefile
index d0bce5b64d5..6f8ee403113 100644
--- a/Projects/AVRISP/makefile
+++ b/Projects/AVRISP/makefile
@@ -129,14 +129,14 @@ SRC = $(TARGET).c \
Descriptors.c \
Lib/V2Protocol.c \
Lib/V2ProtocolParams.c \
- Lib/ISPProtocol.c \
- Lib/ISPTarget.c \
- Lib/PDIProtocol.c \
- Lib/PDITarget.c \
- Lib/XMEGANVM.c \
- Lib/TPIProtocol.c \
- Lib/TPITarget.c \
- Lib/TINYNVM.c \
+ Lib/ISP/ISPProtocol.c \
+ Lib/ISP/ISPTarget.c \
+ Lib/PDI/PDIProtocol.c \
+ Lib/PDI/PDITarget.c \
+ Lib/PDI/XMEGANVM.c \
+ Lib/TPI/TPIProtocol.c \
+ Lib/TPI/TPITarget.c \
+ Lib/TPI/TINYNVM.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \