Revert "Renamed service source files"

This reverts commit 5f122df914.

src/common/key_map.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "hid_u.h"
+#include "core/hle/service/hid.h"
 
 namespace KeyMap {
 

src/core/CMakeLists.txt

@@ -30,11 +30,11 @@ set(SRCS
             hle/kernel/mutex.cpp
             hle/kernel/shared_memory.cpp
             hle/kernel/thread.cpp
-            hle/service/apt_u.cpp
+            hle/service/apt.cpp
-            hle/service/fs_user.cpp
+            hle/service/fs.cpp
-            hle/service/gsp_gpu.cpp
+            hle/service/gsp.cpp
-            hle/service/hid_user.cpp
+            hle/service/hid.cpp
-            hle/service/ndm_u.cpp
+            hle/service/ndm.cpp
             hle/service/service.cpp
             hle/service/srv.cpp
             hle/config_mem.cpp
@@ -91,11 +91,11 @@ set(HEADERS
             hle/kernel/mutex.h
             hle/kernel/shared_memory.h
             hle/kernel/thread.h
-            hle/service/apt_u.h
+            hle/service/apt.h
-            hle/service/fs_user.h
+            hle/service/fs.h
-            hle/service/gsp_gpu.h
+            hle/service/gsp.h
-            hle/service/hid_user.h
+            hle/service/hid.h
-            hle/service/ndm_u.h
+            hle/service/ndm.h
             hle/service/service.h
             hle/service/srv.h
             hle/config_mem.h

src/core/hle/service/apt.cpp

@@ -8,7 +8,7 @@
 #include "core/hle/hle.h"
 #include "core/hle/kernel/event.h"
 #include "core/hle/kernel/mutex.h"
-#include "apt_u.h"
+#include "core/hle/service/apt.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Namespace APT_U

src/core/hle/service/fs.cpp

@@ -4,7 +4,7 @@
 
 #include "common/common.h"
 
-#include "fs_user.h"
+#include "core/hle/service/fs.h"
 #include "core/hle/kernel/archive.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////

src/core/hle/service/gsp.cpp

@@ -9,7 +9,7 @@
 #include "core/mem_map.h"
 #include "core/hle/kernel/event.h"
 #include "core/hle/kernel/shared_memory.h"
-#include "gsp_gpu.h"
+#include "core/hle/service/gsp.h"
 #include "core/hw/gpu.h"
 
 #include "video_core/gpu_debugger.h"

src/core/hle/service/hid.cpp

@@ -7,7 +7,7 @@
 #include "core/hle/hle.h"
 #include "core/hle/kernel/event.h"
 #include "core/hle/kernel/shared_memory.h"
-#include "hid_user.h"
+#include "core/hle/service/hid.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Namespace HID_User

src/core/hle/service/ndm.cpp

@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 
 #include "core/hle/hle.h"
-#include "ndm_u.h"
+#include "core/hle/service/ndm.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Namespace NDM_U

src/core/hle/service/service.cpp

@@ -6,11 +6,11 @@
 #include "common/string_util.h"
 
 #include "core/hle/service/service.h"
-#include "apt_u.h"
+#include "core/hle/service/apt.h"
-#include "fs_user.h"
+#include "core/hle/service/fs.h"
-#include "gsp_gpu.h"
+#include "core/hle/service/gsp.h"
-#include "hid_user.h"
+#include "core/hle/service/hid.h"
-#include "ndm_u.h"
+#include "core/hle/service/ndm.h"
 #include "core/hle/service/srv.h"
 
 namespace Service {

src/core/hw/gpu.cpp

@@ -9,7 +9,7 @@
 #include "core/mem_map.h"
 
 #include "core/hle/hle.h"
-#include "gsp_gpu.h"
+#include "core/hle/service/gsp.h"
 
 #include "core/hw/gpu.h"
 

src/video_core/gpu_debugger.h

@@ -10,7 +10,7 @@
 
 #include "common/log.h"
 
-#include "gsp_gpu.h"
+#include "core/hle/service/gsp.h"
 
 #include "command_processor.h"
 #include "pica.h"