diff --git a/Source/Project64/N64 System/C Core/Logging.cpp b/Source/Project64/Logging.cpp
similarity index 100%
rename from Source/Project64/N64 System/C Core/Logging.cpp
rename to Source/Project64/Logging.cpp
diff --git a/Source/Project64/N64 System/C Core/Logging.h b/Source/Project64/Logging.h
similarity index 100%
rename from Source/Project64/N64 System/C Core/Logging.h
rename to Source/Project64/Logging.h
diff --git a/Source/Project64/N64 System.h b/Source/Project64/N64 System.h
index db180e08f..613213a57 100644
--- a/Source/Project64/N64 System.h	
+++ b/Source/Project64/N64 System.h	
@@ -45,7 +45,6 @@ class CNotification;
 
 //C Core - to be upgrdaded and removed
 #include "N64 System/C Core/r4300i Commands.h"
-#include "N64 System/C Core/Logging.h"
 
 //Interpter
 #include "N64 System/Interpreter/Interpreter Ops.h"
@@ -77,4 +76,3 @@ class CNotification;
 //Main Files
 #include "N64 System/N64 Class.h"
 #include "N64 System/System Globals.h"
-
diff --git a/Source/Project64/N64 System/Interpreter/Interpreter Ops.cpp b/Source/Project64/N64 System/Interpreter/Interpreter Ops.cpp
index cbdce8121..e7cc0d817 100644
--- a/Source/Project64/N64 System/Interpreter/Interpreter Ops.cpp	
+++ b/Source/Project64/N64 System/Interpreter/Interpreter Ops.cpp	
@@ -9,7 +9,6 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
-#include "../C Core/Logging.h"
 
 void InPermLoop();
 void TestInterpreterJump(DWORD PC, DWORD TargetPC, int Reg1, int Reg2);
diff --git a/Source/Project64/Project64.vcproj b/Source/Project64/Project64.vcproj
index 018e4541d..7be04938f 100644
--- a/Source/Project64/Project64.vcproj
+++ b/Source/Project64/Project64.vcproj
@@ -145,6 +145,10 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
+			<File
+				RelativePath=".\Logging.cpp"
+				>
+			</File>
 			<File
 				RelativePath="main.cpp"
 				>
@@ -511,10 +515,6 @@
 				<Filter
 					Name="C Core Source"
 					>
-					<File
-						RelativePath="N64 System\C Core\Logging.cpp"
-						>
-					</File>
 					<File
 						RelativePath="N64 System\C Core\r4300i Commands.cpp"
 						>
@@ -789,6 +789,10 @@
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl"
 			>
+			<File
+				RelativePath=".\Logging.h"
+				>
+			</File>
 			<File
 				RelativePath="Multilanguage.h"
 				>
@@ -1183,10 +1187,6 @@
 				<Filter
 					Name="C Core Headers"
 					>
-					<File
-						RelativePath="N64 System\C Core\Logging.h"
-						>
-					</File>
 					<File
 						RelativePath="N64 System\C Core\r4300i Commands.h"
 						>
diff --git a/Source/Project64/User Interface/Gui Class.cpp b/Source/Project64/User Interface/Gui Class.cpp
index 53671c945..e60f3754c 100644
--- a/Source/Project64/User Interface/Gui Class.cpp	
+++ b/Source/Project64/User Interface/Gui Class.cpp	
@@ -13,10 +13,7 @@
 #include <commctrl.h>
 #include "Settings/SettingType/SettingsType-Application.h"
 
-extern "C"
-{
-	void EnterLogOptions(HWND hwndOwner);
-}
+void EnterLogOptions(HWND hwndOwner);
 
 #pragma comment(lib, "Comctl32.lib")
 
diff --git a/Source/Project64/stdafx.h b/Source/Project64/stdafx.h
index 2c0f1950b..85725f863 100644
--- a/Source/Project64/stdafx.h
+++ b/Source/Project64/stdafx.h
@@ -20,6 +20,7 @@
 #include <shellapi.h>
 #include "Multilanguage.h"
 #include "User Interface.h"
+#include "Logging.h"
 #include "N64 System.h"
 #include "Plugin.h"
 #include "Support.h"