From e3187f62c3192e53ffbb91ddc832d772a633db0f Mon Sep 17 00:00:00 2001
From: Brady McDermott <freedom7341@hotmail.com>
Date: Tue, 30 Jul 2024 22:08:30 -0600
Subject: [PATCH] reorganize and move things out of headers

---
 progmgr/desktop.c  |  6 +++---
 progmgr/desktop2.c |  2 +-
 progmgr/dialog.c   | 14 ++++++++------
 progmgr/group.c    | 11 ++++++-----
 progmgr/group.h    |  3 ---
 progmgr/progmgr.c  |  6 +++---
 progmgr/progmgr.h  |  4 +---
 progmgr/registry.c |  8 ++++----
 progmgr/registry.h |  3 ---
 progmgr/sysint.c   |  2 +-
 progmgr/wndproc.c  | 13 +++++++------
 11 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/progmgr/desktop.c b/progmgr/desktop.c
index afb2d02..f3dce4b 100644
--- a/progmgr/desktop.c
+++ b/progmgr/desktop.c
@@ -9,11 +9,11 @@
 \* * * * * * * */
 
 /* Headers */
-#include "progmgr.h"
-#include "resource.h"
-// #define WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 #include <CommCtrl.h>
+#include "progmgr.h"
+#include "resource.h"
 
 /* Structures */
 typedef struct _mrp
diff --git a/progmgr/desktop2.c b/progmgr/desktop2.c
index a807ef3..4095cc3 100644
--- a/progmgr/desktop2.c
+++ b/progmgr/desktop2.c
@@ -9,8 +9,8 @@
 \* * * * * * * */
 
 /* Headers */
-#include "progmgr.h"
 #include <Windows.h>
+#include "progmgr.h"
 
 /* Structures */
 typedef struct _DPI
diff --git a/progmgr/dialog.c b/progmgr/dialog.c
index a253f23..4517205 100644
--- a/progmgr/dialog.c
+++ b/progmgr/dialog.c
@@ -9,16 +9,18 @@
 \* * * * * * * */
 
 /* Headers */
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+#include <Commctrl.h>
+#include <Commdlg.h>
+#include <Shlobj.h>
+#include <shlwapi.h>
+#include <shellapi.h>
+#include <strsafe.h>
 #include "progmgr.h"
 #include "dialog.h"
 #include "group.h"
 #include "resource.h"
-// #define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-#include <Commctrl.h>
-#include <Shlobj.h>
-#include <shlwapi.h>
-#include <strsafe.h>
 
 /* Variables */
 WCHAR		szDlgTitle[64];
diff --git a/progmgr/group.c b/progmgr/group.c
index be1ded8..57174cf 100644
--- a/progmgr/group.c
+++ b/progmgr/group.c
@@ -8,17 +8,18 @@
 \* * * * * * * */
 
 /* Headers */
-#include "progmgr.h"
-#include "group.h"
-#include "resource.h"
-#include "registry.h"
-// #define WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 #include <windowsx.h>
 #include <CommCtrl.h>
 #include <shlwapi.h>
+#include <shellapi.h>
 #include <strsafe.h>
 #include <uxtheme.h>
+#include "progmgr.h"
+#include "group.h"
+#include "resource.h"
+#include "registry.h"
 
 /* Variables */
 WNDCLASSEX wcGrp;
diff --git a/progmgr/group.h b/progmgr/group.h
index ecd155b..fa24c86 100644
--- a/progmgr/group.h
+++ b/progmgr/group.h
@@ -10,9 +10,6 @@
 /* Pragmas */
 #pragma once
 
-/* Includes */
-#include <CommCtrl.h>
-
 /* Definitions */
 #define MAX_GROUPS 512
 #define MAX_ITEMS 512
diff --git a/progmgr/progmgr.c b/progmgr/progmgr.c
index 41a15e8..191144f 100644
--- a/progmgr/progmgr.c
+++ b/progmgr/progmgr.c
@@ -8,13 +8,13 @@
 \* * * * * * * */
 
 /* Headers */
+#define WIN32_LEAN_AND_MEAN
+#define SECURITY_WIN32
+#include <Windows.h>
 #include "progmgr.h"
 #include "group.h"
 #include "resource.h"
 #include "registry.h"
-// #define WIN32_LEAN_AND_MEAN
-#define SECURITY_WIN32
-#include <Windows.h>
 
 /* Variables */
 // Global
diff --git a/progmgr/progmgr.h b/progmgr/progmgr.h
index 819f821..16c6265 100644
--- a/progmgr/progmgr.h
+++ b/progmgr/progmgr.h
@@ -11,13 +11,11 @@
 #pragma once
 #pragma comment(lib, "ComCtl32.lib")
 #pragma comment(lib, "Shlwapi.lib")
+#pragma comment(lib, "Shell32.lib")
 #pragma comment(lib, "Secur32.lib")
 #pragma comment(lib, "UxTheme.lib")
 #pragma comment(lib, "Version.lib")
 
-/* Includes */
-#include <wtypes.h>
-
 /* Macros and Defines */
 #define GET_WM_COMMAND_ID(wParam, lParam) LOWORD(wParam)
 // RunFileDlg flags
diff --git a/progmgr/registry.c b/progmgr/registry.c
index 00724b5..5e96411 100644
--- a/progmgr/registry.c
+++ b/progmgr/registry.c
@@ -8,13 +8,13 @@
 \* * * * * * * */
 
 /* Headers */
-#include "progmgr.h"
-#include "group.h"
-#include "registry.h"
-// #define WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 #include <shlwapi.h>
 #include <strsafe.h>
+#include "progmgr.h"
+#include "group.h"
+#include "registry.h"
 
 /* Variables */
 // Global HKEYs
diff --git a/progmgr/registry.h b/progmgr/registry.h
index 969a9ef..5af71c0 100644
--- a/progmgr/registry.h
+++ b/progmgr/registry.h
@@ -10,9 +10,6 @@
 /* Pragmas */
 #pragma once
 
-/* Includes */
-#include <wtypes.h>
-
 /* Defines */
 #define HKEYMAXLEN 261
 // Key Paths
diff --git a/progmgr/sysint.c b/progmgr/sysint.c
index dfc76d9..090d8c1 100644
--- a/progmgr/sysint.c
+++ b/progmgr/sysint.c
@@ -8,9 +8,9 @@
 \* * * * * * * */
 
 /* Headers */
-#include "progmgr.h"
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
+#include "progmgr.h"
 
 /* Functions */
 
diff --git a/progmgr/wndproc.c b/progmgr/wndproc.c
index b53f514..70e16eb 100644
--- a/progmgr/wndproc.c
+++ b/progmgr/wndproc.c
@@ -8,17 +8,18 @@
 \* * * * * * * */
 
 /* Headers */
+#define WIN32_LEAN_AND_MEAN
+#define SECURITY_WIN32
+#include <Windows.h>
+#include <strsafe.h>
+#include <shellapi.h>
+#include <Lmcons.h>
+#include <security.h>
 #include "progmgr.h"
 #include "dialog.h"
 #include "group.h"
 #include "resource.h"
 #include "registry.h"
-// #define WIN32_LEAN_AND_MEAN
-#define SECURITY_WIN32
-#include <Windows.h>
-#include <strsafe.h>
-#include <Lmcons.h>
-#include <security.h>
 
 /* Functions */