diff --git a/reactos/dll/win32/atl/atl_ax.c b/reactos/dll/win32/atl/atl_ax.c
index c98cba7e1f9..da595a4e24b 100644
--- a/reactos/dll/win32/atl/atl_ax.c
+++ b/reactos/dll/win32/atl/atl_ax.c
@@ -126,11 +126,11 @@ static ULONG IOCS_AddRef(IOCS *This)
     return ref;
 }
 
-#define THIS2IOLECLIENTSITE(This) ((IOleClientSite*)&This->lpOleClientSiteVtbl)
-#define THIS2IOLECONTAINER(This) ((IOleContainer*)&This->lpOleContainerVtbl)
-#define THIS2IOLEINPLACESITEWINDOWLESS(This) ((IOleInPlaceSiteWindowless*)&This->lpOleInPlaceSiteWindowlessVtbl)
-#define THIS2IOLEINPLACEFRAME(This) ((IOleInPlaceFrame*)&This->lpOleInPlaceFrameVtbl)
-#define THIS2IOLECONTROLSITE(This) ((IOleControlSite*)&This->lpOleControlSiteVtbl)
+#define THIS2IOLECLIENTSITE(This) ((IOleClientSite*)&(This)->lpOleClientSiteVtbl)
+#define THIS2IOLECONTAINER(This)             (&(This)->lpOleContainerVtbl)
+#define THIS2IOLEINPLACESITEWINDOWLESS(This) (&(This)->lpOleInPlaceSiteWindowlessVtbl)
+#define THIS2IOLEINPLACEFRAME(This)          (&(This)->lpOleInPlaceFrameVtbl)
+#define THIS2IOLECONTROLSITE(This)           (&(This)->lpOleControlSiteVtbl)
 
 static HRESULT IOCS_QueryInterface(IOCS *This, REFIID riid, void **ppv)
 {
diff --git a/reactos/dll/win32/cabinet/cabinet.h b/reactos/dll/win32/cabinet/cabinet.h
index 8b38f9b587c..cd82d14da45 100644
--- a/reactos/dll/win32/cabinet/cabinet.h
+++ b/reactos/dll/win32/cabinet/cabinet.h
@@ -653,8 +653,4 @@ typedef struct {
     struct FILELIST *FilterList;
 } SESSION;
 
-/* from fdi.c */
-void QTMupdatemodel(struct QTMmodel *model, int sym);
-int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits, const cab_UBYTE *length, cab_UWORD *table);
-
 #endif /* __WINE_CABINET_H */
diff --git a/reactos/dll/win32/cabinet/fdi.c b/reactos/dll/win32/cabinet/fdi.c
index e36066df5bc..c7749eb66a3 100644
--- a/reactos/dll/win32/cabinet/fdi.c
+++ b/reactos/dll/win32/cabinet/fdi.c
@@ -151,7 +151,7 @@ typedef struct fdi_cds_fwd {
 /****************************************************************
  * QTMupdatemodel (internal)
  */
-void QTMupdatemodel(struct QTMmodel *model, int sym) {
+static void QTMupdatemodel(struct QTMmodel *model, int sym) {
   struct QTMmodelsym temp;
   int i, j;
 
@@ -220,7 +220,8 @@ void QTMupdatemodel(struct QTMmodel *model, int sym) {
  *   OK:    0
  *   error: 1
  */
-int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits, const cab_UBYTE *length, cab_UWORD *table) {
+static int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits,
+                             const cab_UBYTE *length, cab_UWORD *table) {
   register cab_UWORD sym;
   register cab_ULONG leaf;
   register cab_UBYTE bit_num = 1;