diff --git a/reactos/base/shell/explorer/desktop.cpp b/reactos/base/shell/explorer/desktop.cpp
index 766a069ad90..e15a632cba2 100644
--- a/reactos/base/shell/explorer/desktop.cpp
+++ b/reactos/base/shell/explorer/desktop.cpp
@@ -20,9 +20,6 @@
 
 #include "precomp.h"
 
-HANDLE WINAPI _SHCreateDesktop(IShellDesktopTray *ShellDesk);
-BOOL WINAPI _SHDesktopMessageLoop(HANDLE hDesktop);
-
 class CDesktopThread
 {
     HANDLE hEvent;
diff --git a/reactos/base/shell/explorer/explorer.cpp b/reactos/base/shell/explorer/explorer.cpp
index d33e1bde466..0751e75e1d5 100644
--- a/reactos/base/shell/explorer/explorer.cpp
+++ b/reactos/base/shell/explorer/explorer.cpp
@@ -21,9 +21,6 @@
 #include "precomp.h"
 #include <browseui_undoc.h>
 
-DWORD WINAPI _WinList_Init(void);
-void WINAPI _ShellDDEInit(BOOL bInit);
-
 HINSTANCE hExplorerInstance;
 HMODULE hUser32;
 HANDLE hProcessHeap;
diff --git a/reactos/base/shell/explorer/precomp.h b/reactos/base/shell/explorer/precomp.h
index 5045ac93562..16454f80074 100644
--- a/reactos/base/shell/explorer/precomp.h
+++ b/reactos/base/shell/explorer/precomp.h
@@ -148,8 +148,11 @@ IN LPCTSTR lpValue);
  *  rshell.c
  */
 
-HRESULT WINAPI
-_CStartMenu_Constructor(REFIID riid, void **ppv);
+HRESULT WINAPI _CStartMenu_Constructor(REFIID riid, void **ppv);
+HANDLE WINAPI _SHCreateDesktop(IShellDesktopTray *ShellDesk);
+BOOL WINAPI _SHDesktopMessageLoop(HANDLE hDesktop);
+DWORD WINAPI _WinList_Init(void);
+void WINAPI _ShellDDEInit(BOOL bInit);
 
 /*
  * traywnd.c
@@ -231,6 +234,12 @@ SaveSettingDword(IN PCTSTR pszKeyName,
 IN PCTSTR pszValueName,
 IN DWORD dwValue);
 
+/*
+ * shellservice.cpp
+ */
+HRESULT InitShellServices(HDPA * phdpa);
+HRESULT ShutdownShellServices(HDPA hdpa);
+
 /*
  * startup.cpp
  */
diff --git a/reactos/base/shell/explorer/shellservice.cpp b/reactos/base/shell/explorer/shellservice.cpp
index 39a83cb91b0..de1e30fe639 100644
--- a/reactos/base/shell/explorer/shellservice.cpp
+++ b/reactos/base/shell/explorer/shellservice.cpp
@@ -20,9 +20,6 @@
 
 #include "precomp.h"
 
-extern HRESULT InitShellServices(HDPA * phdpa);
-extern HRESULT ShutdownShellServices(HDPA hdpa);
-
 static int CALLBACK InitializeAllCallback(void* pItem, void* pData)
 {
     IOleCommandTarget * pOct = reinterpret_cast<IOleCommandTarget *>(pItem);
diff --git a/reactos/base/shell/explorer/startup.cpp b/reactos/base/shell/explorer/startup.cpp
index d1ae7ee39cc..0448ef2d9cc 100644
--- a/reactos/base/shell/explorer/startup.cpp
+++ b/reactos/base/shell/explorer/startup.cpp
@@ -40,8 +40,6 @@
 
 #include "precomp.h"
 
-EXTERN_C HRESULT WINAPI SHCreateSessionKey(REGSAM samDesired, PHKEY phKey);
-
 #define INVALID_RUNCMD_RETURN -1
 /**
  * This function runs the specified command in the specified dir.
diff --git a/reactos/base/shell/explorer/traywnd.cpp b/reactos/base/shell/explorer/traywnd.cpp
index 84304f66c68..49d91878fa2 100644
--- a/reactos/base/shell/explorer/traywnd.cpp
+++ b/reactos/base/shell/explorer/traywnd.cpp
@@ -21,9 +21,6 @@
 #include "precomp.h"
 #include <commoncontrols.h>
 
-extern HRESULT InitShellServices(HDPA * phdpa);
-extern HRESULT ShutdownShellServices(HDPA hdpa);
-
 HRESULT TrayWindowCtxMenuCreator(ITrayWindow * TrayWnd, IN HWND hWndOwner, IContextMenu ** ppCtxMenu);
 
 #define WM_APP_TRAYDESTROY  (WM_APP + 0x100)
diff --git a/reactos/include/reactos/undocshell.h b/reactos/include/reactos/undocshell.h
index d47ba52ba2a..6d8a102fecd 100644
--- a/reactos/include/reactos/undocshell.h
+++ b/reactos/include/reactos/undocshell.h
@@ -649,6 +649,8 @@ DWORD WINAPI WinList_Init(void);
 
 IStream* WINAPI SHGetViewStream(LPCITEMIDLIST, DWORD, LPCTSTR, LPCTSTR, LPCTSTR);
 
+EXTERN_C HRESULT WINAPI SHCreateSessionKey(REGSAM samDesired, PHKEY phKey);
+
 /*****************************************************************************
  * Shell Link
  */