diff --git a/src/tests/kits/support/SupportKitTestAddon.cpp b/src/tests/kits/support/SupportKitTestAddon.cpp
index dd39b38092..781f343542 100644
--- a/src/tests/kits/support/SupportKitTestAddon.cpp
+++ b/src/tests/kits/support/SupportKitTestAddon.cpp
@@ -6,7 +6,7 @@
 #include "bautolock/AutolockTest.h"
 #include "blocker/LockerTest.h"
 #include "bmemoryio/MemoryIOTest.h"
-#include "bmallocio/MallocIOTest.h"
+#include "bmemoryio/MallocIOTest.h"
 
 BTestSuite* getTestSuite() {
 	BTestSuite *suite = new BTestSuite("Support");
diff --git a/src/tests/kits/support/bmemoryio/ConstTest.cpp b/src/tests/kits/support/bmemoryio/ConstTest.cpp
index f1d2eb545e..8d6b04f186 100644
--- a/src/tests/kits/support/bmemoryio/ConstTest.cpp
+++ b/src/tests/kits/support/bmemoryio/ConstTest.cpp
@@ -50,4 +50,4 @@ CppUnit::Test *ConstTest::suite(void)
 		ConstTestCaller;
 		
 	return(new ConstTestCaller("BMemoryIO::Const Test", &ConstTest::PerformTest));
-}
\ No newline at end of file
+}
diff --git a/src/tests/kits/support/bmemoryio/ConstTest.h b/src/tests/kits/support/bmemoryio/ConstTest.h
index 0affae9888..17595673e8 100644
--- a/src/tests/kits/support/bmemoryio/ConstTest.h
+++ b/src/tests/kits/support/bmemoryio/ConstTest.h
@@ -19,4 +19,4 @@ public:
 	virtual ~ConstTest();
 	};
 	
-#endif
\ No newline at end of file
+#endif
diff --git a/src/tests/kits/support/bmemoryio/MallocBufferLengthTest.cpp b/src/tests/kits/support/bmemoryio/MallocBufferLengthTest.cpp
index 1923e0c259..29760b7b21 100644
--- a/src/tests/kits/support/bmemoryio/MallocBufferLengthTest.cpp
+++ b/src/tests/kits/support/bmemoryio/MallocBufferLengthTest.cpp
@@ -48,4 +48,4 @@ CppUnit::Test *MallocBufferLengthTest::suite(void)
 		MallocBufferLengthTestCaller;
 		
 	return(new MallocBufferLengthTestCaller("BMallocIO::BufferLength Test", &MallocBufferLengthTest::PerformTest));
-}
\ No newline at end of file
+}
diff --git a/src/tests/kits/support/bmemoryio/MallocBufferLengthTest.h b/src/tests/kits/support/bmemoryio/MallocBufferLengthTest.h
index 5937d78de3..d4e022c341 100644
--- a/src/tests/kits/support/bmemoryio/MallocBufferLengthTest.h
+++ b/src/tests/kits/support/bmemoryio/MallocBufferLengthTest.h
@@ -19,4 +19,4 @@ public:
 	virtual ~MallocBufferLengthTest();
 	};
 	
-#endif
\ No newline at end of file
+#endif
diff --git a/src/tests/kits/support/bmemoryio/MallocSeekTest.cpp b/src/tests/kits/support/bmemoryio/MallocSeekTest.cpp
index 26268d04ad..15fb5bfd9c 100644
--- a/src/tests/kits/support/bmemoryio/MallocSeekTest.cpp
+++ b/src/tests/kits/support/bmemoryio/MallocSeekTest.cpp
@@ -53,4 +53,4 @@ CppUnit::Test *MallocSeekTest::suite(void)
 		MallocSeekTestCaller;
 		
 	return(new MallocSeekTestCaller("BMallocIO::Seek Test", &MallocSeekTest::PerformTest));
-}
\ No newline at end of file
+}
diff --git a/src/tests/kits/support/bmemoryio/MallocSeekTest.h b/src/tests/kits/support/bmemoryio/MallocSeekTest.h
index 518834b0e9..1d67b3819f 100644
--- a/src/tests/kits/support/bmemoryio/MallocSeekTest.h
+++ b/src/tests/kits/support/bmemoryio/MallocSeekTest.h
@@ -19,4 +19,4 @@ public:
 	virtual ~MallocSeekTest();
 	};
 	
-#endif
\ No newline at end of file
+#endif
diff --git a/src/tests/kits/support/bmemoryio/MallocWriteTest.cpp b/src/tests/kits/support/bmemoryio/MallocWriteTest.cpp
index 7a333ce376..d4182418f1 100644
--- a/src/tests/kits/support/bmemoryio/MallocWriteTest.cpp
+++ b/src/tests/kits/support/bmemoryio/MallocWriteTest.cpp
@@ -45,4 +45,4 @@ CppUnit::Test *MallocWriteTest::suite(void)
 		MallocWriteTestCaller;
 		
 	return(new MallocWriteTestCaller("BMallocIO::Write Test", &MallocWriteTest::PerformTest));
-}
\ No newline at end of file
+}
diff --git a/src/tests/kits/support/bmemoryio/MallocWriteTest.h b/src/tests/kits/support/bmemoryio/MallocWriteTest.h
index de6b964a2e..83d27dc348 100644
--- a/src/tests/kits/support/bmemoryio/MallocWriteTest.h
+++ b/src/tests/kits/support/bmemoryio/MallocWriteTest.h
@@ -19,4 +19,4 @@ public:
 	virtual ~MallocWriteTest();
 	};
 	
-#endif
\ No newline at end of file
+#endif
diff --git a/src/tests/kits/support/bmemoryio/ReadTest.cpp b/src/tests/kits/support/bmemoryio/ReadTest.cpp
index dfed7d7559..0dd05c4a7f 100644
--- a/src/tests/kits/support/bmemoryio/ReadTest.cpp
+++ b/src/tests/kits/support/bmemoryio/ReadTest.cpp
@@ -56,4 +56,4 @@ CppUnit::Test *ReadTest::suite(void)
 		ReadTestCaller;
 		
 	return(new ReadTestCaller("BMemoryIO::Read Test", &ReadTest::PerformTest));
-}
\ No newline at end of file
+}
diff --git a/src/tests/kits/support/bmemoryio/ReadTest.h b/src/tests/kits/support/bmemoryio/ReadTest.h
index 8d5d0a6c37..d538f84174 100644
--- a/src/tests/kits/support/bmemoryio/ReadTest.h
+++ b/src/tests/kits/support/bmemoryio/ReadTest.h
@@ -19,4 +19,4 @@ public:
 	virtual ~ReadTest();
 	};
 	
-#endif
\ No newline at end of file
+#endif
diff --git a/src/tests/kits/support/bmemoryio/SeekTest.cpp b/src/tests/kits/support/bmemoryio/SeekTest.cpp
index 8b9f798015..1f6ede3e89 100644
--- a/src/tests/kits/support/bmemoryio/SeekTest.cpp
+++ b/src/tests/kits/support/bmemoryio/SeekTest.cpp
@@ -50,4 +50,4 @@ CppUnit::Test *SeekTest::suite(void)
 		SeekTestCaller;
 		
 	return(new SeekTestCaller("BMemoryIO::Seek Test", &SeekTest::PerformTest));
-}
\ No newline at end of file
+}
diff --git a/src/tests/kits/support/bmemoryio/SeekTest.h b/src/tests/kits/support/bmemoryio/SeekTest.h
index f664cce569..cf03fd9aea 100644
--- a/src/tests/kits/support/bmemoryio/SeekTest.h
+++ b/src/tests/kits/support/bmemoryio/SeekTest.h
@@ -19,4 +19,4 @@ public:
 	virtual ~SeekTest();
 	};
 	
-#endif
\ No newline at end of file
+#endif
diff --git a/src/tests/kits/support/bmemoryio/SetSizeTest.cpp b/src/tests/kits/support/bmemoryio/SetSizeTest.cpp
index 7350376ed3..97d4f17cc3 100644
--- a/src/tests/kits/support/bmemoryio/SetSizeTest.cpp
+++ b/src/tests/kits/support/bmemoryio/SetSizeTest.cpp
@@ -57,4 +57,4 @@ CppUnit::Test *SetSizeTest::suite(void)
 		SetSizeTestCaller;
 		
 	return(new SetSizeTestCaller("BMemoryIO::SetSize Test", &SetSizeTest::PerformTest));
-}
\ No newline at end of file
+}
diff --git a/src/tests/kits/support/bmemoryio/SetSizeTest.h b/src/tests/kits/support/bmemoryio/SetSizeTest.h
index 887f71394d..3d4bd5ff29 100644
--- a/src/tests/kits/support/bmemoryio/SetSizeTest.h
+++ b/src/tests/kits/support/bmemoryio/SetSizeTest.h
@@ -19,4 +19,4 @@ public:
 	virtual ~SetSizeTest();
 	};
 	
-#endif
\ No newline at end of file
+#endif
diff --git a/src/tests/kits/support/bmemoryio/WriteTest.cpp b/src/tests/kits/support/bmemoryio/WriteTest.cpp
index 95461da79e..6c30692b67 100644
--- a/src/tests/kits/support/bmemoryio/WriteTest.cpp
+++ b/src/tests/kits/support/bmemoryio/WriteTest.cpp
@@ -64,4 +64,4 @@ CppUnit::Test *WriteTest::suite(void)
 		WriteTestCaller;
 		
 	return(new WriteTestCaller("BMemoryIO::Write Test", &WriteTest::PerformTest));
-}
\ No newline at end of file
+}
diff --git a/src/tests/kits/support/bmemoryio/WriteTest.h b/src/tests/kits/support/bmemoryio/WriteTest.h
index a7229f8d0a..52669620ec 100644
--- a/src/tests/kits/support/bmemoryio/WriteTest.h
+++ b/src/tests/kits/support/bmemoryio/WriteTest.h
@@ -19,4 +19,4 @@ public:
 	virtual ~WriteTest();
 	};
 	
-#endif
\ No newline at end of file
+#endif