diff --git a/fs/cifsd/mgmt/share_config.c b/fs/cifsd/mgmt/share_config.c
index 0593702babfe..9bc7f7555ee2 100644
--- a/fs/cifsd/mgmt/share_config.c
+++ b/fs/cifsd/mgmt/share_config.c
@@ -16,7 +16,6 @@
 #include "user_session.h"
 #include "../buffer_pool.h"
 #include "../transport_ipc.h"
-#include "../ksmbd_server.h" /* FIXME */
 
 #define SHARE_HASH_BITS		3
 static DEFINE_HASHTABLE(shares_table, SHARE_HASH_BITS);
diff --git a/fs/cifsd/mgmt/share_config.h b/fs/cifsd/mgmt/share_config.h
index c47b874bd80b..49ca89667991 100644
--- a/fs/cifsd/mgmt/share_config.h
+++ b/fs/cifsd/mgmt/share_config.h
@@ -10,8 +10,6 @@
 #include <linux/hashtable.h>
 #include <linux/path.h>
 
-#include "../glob.h"  /* FIXME */
-
 struct ksmbd_share_config {
 	char			*name;
 	char			*path;
diff --git a/fs/cifsd/mgmt/tree_connect.c b/fs/cifsd/mgmt/tree_connect.c
index 2be7b2e2e3cd..d5670f2596a3 100644
--- a/fs/cifsd/mgmt/tree_connect.c
+++ b/fs/cifsd/mgmt/tree_connect.c
@@ -6,7 +6,6 @@
 #include <linux/list.h>
 #include <linux/slab.h>
 
-#include "../ksmbd_server.h" /* FIXME */
 #include "../buffer_pool.h"
 #include "../transport_ipc.h"
 #include "../connection.h"
diff --git a/fs/cifsd/mgmt/tree_connect.h b/fs/cifsd/mgmt/tree_connect.h
index 46237cd05b9c..4e40ec3f4774 100644
--- a/fs/cifsd/mgmt/tree_connect.h
+++ b/fs/cifsd/mgmt/tree_connect.h
@@ -8,7 +8,7 @@
 
 #include <linux/hashtable.h>
 
-#include "../ksmbd_server.h" /* FIXME */
+#include "../ksmbd_server.h"
 
 struct ksmbd_share_config;
 struct ksmbd_user;
diff --git a/fs/cifsd/mgmt/user_config.c b/fs/cifsd/mgmt/user_config.c
index 1ab68f80f72e..a1a454bfb57b 100644
--- a/fs/cifsd/mgmt/user_config.c
+++ b/fs/cifsd/mgmt/user_config.c
@@ -8,7 +8,6 @@
 #include "user_config.h"
 #include "../buffer_pool.h"
 #include "../transport_ipc.h"
-#include "../ksmbd_server.h" /* FIXME */
 
 struct ksmbd_user *ksmbd_login_user(const char *account)
 {
diff --git a/fs/cifsd/mgmt/user_config.h b/fs/cifsd/mgmt/user_config.h
index 5cda4a5d3e2f..b2bb074a0150 100644
--- a/fs/cifsd/mgmt/user_config.h
+++ b/fs/cifsd/mgmt/user_config.h
@@ -6,8 +6,7 @@
 #ifndef __USER_CONFIG_MANAGEMENT_H__
 #define __USER_CONFIG_MANAGEMENT_H__
 
-#include "../glob.h"  /* FIXME */
-#include "../ksmbd_server.h" /* FIXME */
+#include "../glob.h"
 
 struct ksmbd_user {
 	unsigned short		flags;
diff --git a/fs/cifsd/mgmt/user_session.c b/fs/cifsd/mgmt/user_session.c
index d9f6dbde850a..afcdf76a3851 100644
--- a/fs/cifsd/mgmt/user_session.c
+++ b/fs/cifsd/mgmt/user_session.c
@@ -14,7 +14,6 @@
 #include "../transport_ipc.h"
 #include "../connection.h"
 #include "../buffer_pool.h"
-#include "../ksmbd_server.h" /* FIXME */
 #include "../vfs_cache.h"
 
 static struct ksmbd_ida *session_ida;
diff --git a/fs/cifsd/server.c b/fs/cifsd/server.c
index a70d311a29dc..3670dcc9ba03 100644
--- a/fs/cifsd/server.c
+++ b/fs/cifsd/server.c
@@ -102,8 +102,6 @@ static inline int check_conn_state(struct ksmbd_work *work)
 	return 0;
 }
 
-/* @FIXME what a mess... god help. */
-
 #define TCP_HANDLER_CONTINUE	0
 #define TCP_HANDLER_ABORT	1
 
diff --git a/fs/cifsd/smb_common.c b/fs/cifsd/smb_common.c
index f7560b68b820..7eb6d98656c7 100644
--- a/fs/cifsd/smb_common.c
+++ b/fs/cifsd/smb_common.c
@@ -8,7 +8,6 @@
 #include "server.h"
 #include "misc.h"
 #include "smbstatus.h"
-/* @FIXME */
 #include "connection.h"
 #include "ksmbd_work.h"
 #include "mgmt/user_session.h"
diff --git a/fs/cifsd/transport_ipc.c b/fs/cifsd/transport_ipc.c
index b91fa265f85d..c49e46fda9b1 100644
--- a/fs/cifsd/transport_ipc.c
+++ b/fs/cifsd/transport_ipc.c
@@ -28,9 +28,6 @@
 #include "connection.h"
 #include "transport_tcp.h"
 
-/* @FIXME fix this code */
-extern int get_protocol_idx(char *str);
-
 #define IPC_WAIT_TIMEOUT	(2 * HZ)
 
 #define IPC_MSG_HASH_BITS	3
diff --git a/fs/cifsd/transport_ipc.h b/fs/cifsd/transport_ipc.h
index 68c003027811..6ed7cbea727e 100644
--- a/fs/cifsd/transport_ipc.h
+++ b/fs/cifsd/transport_ipc.h
@@ -7,7 +7,6 @@
 #define __KSMBD_TRANSPORT_IPC_H__
 
 #include <linux/wait.h>
-#include "ksmbd_server.h"  /* FIXME */
 
 #define KSMBD_IPC_MAX_PAYLOAD	4096
 
diff --git a/fs/cifsd/vfs_cache.c b/fs/cifsd/vfs_cache.c
index 8d8c4e373308..af92fab5b7ae 100644
--- a/fs/cifsd/vfs_cache.c
+++ b/fs/cifsd/vfs_cache.c
@@ -8,18 +8,14 @@
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 
-/* @FIXME */
 #include "glob.h"
 #include "vfs_cache.h"
 #include "buffer_pool.h"
-
 #include "oplock.h"
 #include "vfs.h"
 #include "connection.h"
 #include "mgmt/tree_connect.h"
 #include "mgmt/user_session.h"
-
-/* @FIXME */
 #include "smb_common.h"
 
 #define S_DEL_PENDING			1